restructured plug-ins for clearer separation of concerns.

common: contains utilities and staticTypesystem, needed by frontend and backend
frntend: contains parser frontend AST and node 2 frontend AST trafo
xpand3: should contain the middleend.

342 files changed, 32865 insertions, 3183 deletions

diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/DeclaredParameter.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/DeclaredParameter.java
new file mode 100644
index 00000000..b5d12d0e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/DeclaredParameter.java
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclaredParameter.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Declared Parameter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.DeclaredParameter#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.DeclaredParameter#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.Xpand3Package#getDeclaredParameter()
+ * @model
+ * @generated
+ */
+public interface DeclaredParameter extends SyntaxElement {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Name</em>' containment reference.
+	 * @see #setName(Identifier)
+	 * @see org.eclipse.xpand3.Xpand3Package#getDeclaredParameter_Name()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.DeclaredParameter#getName <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' containment reference.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(Identifier value);
+
+	/**
+	 * 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(Identifier)
+	 * @see org.eclipse.xpand3.Xpand3Package#getDeclaredParameter_Type()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.DeclaredParameter#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(Identifier value);
+
+} // DeclaredParameter
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/File.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/File.java
new file mode 100644
index 00000000..ffa3a497
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/File.java
@@ -0,0 +1,63 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: File.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>File</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.File#getImports <em>Imports</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.File#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.Xpand3Package#getFile()
+ * @model
+ * @generated
+ */
+public interface File extends SyntaxElement {
+	/**
+	 * Returns the value of the '<em><b>Imports</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.ImportStatement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Imports</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>Imports</em>' containment reference list.
+	 * @see org.eclipse.xpand3.Xpand3Package#getFile_Imports()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<ImportStatement> getImports();
+
+	/**
+	 * Returns the value of the '<em><b>Declarations</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.declaration.AbstractDeclaration}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Declarations</em>' containment reference list.
+	 * @see org.eclipse.xpand3.Xpand3Package#getFile_Declarations()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractDeclaration> getDeclarations();
+
+} // File
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Identifier.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Identifier.java
new file mode 100644
index 00000000..31749aed
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Identifier.java
@@ -0,0 +1,53 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Identifier.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Identifier</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.Xpand3Package#getIdentifier()
+ * @model
+ * @generated
+ */
+public interface Identifier extends SyntaxElement {
+	/**
+	 * 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.xpand3.Xpand3Package#getIdentifier_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.Identifier#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);
+
+} // Identifier
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/ImportStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/ImportStatement.java
new file mode 100644
index 00000000..6620420e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/ImportStatement.java
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ImportStatement.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Import Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.Xpand3Package#getImportStatement()
+ * @model
+ * @generated
+ */
+public interface ImportStatement extends SyntaxElement {
+	/**
+	 * Returns the value of the '<em><b>Imported Id</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Imported Id</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>Imported Id</em>' containment reference.
+	 * @see #setImportedId(Identifier)
+	 * @see org.eclipse.xpand3.Xpand3Package#getImportStatement_ImportedId()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getImportedId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Imported Id</em>' containment reference.
+	 * @see #getImportedId()
+	 * @generated
+	 */
+	void setImportedId(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Exported</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Exported</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Exported</em>' attribute.
+	 * @see #setExported(boolean)
+	 * @see org.eclipse.xpand3.Xpand3Package#getImportStatement_Exported()
+	 * @model
+	 * @generated
+	 */
+	boolean isExported();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Exported</em>' attribute.
+	 * @see #isExported()
+	 * @generated
+	 */
+	void setExported(boolean value);
+
+} // ImportStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/SyntaxElement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/SyntaxElement.java
new file mode 100644
index 00000000..dcf02f7b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/SyntaxElement.java
@@ -0,0 +1,135 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SyntaxElement.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Syntax Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.SyntaxElement#getLine <em>Line</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.SyntaxElement#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.SyntaxElement#getEnd <em>End</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.SyntaxElement#getFileName <em>File Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.Xpand3Package#getSyntaxElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface SyntaxElement extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Line</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Line</em>' attribute.
+	 * @see #setLine(int)
+	 * @see org.eclipse.xpand3.Xpand3Package#getSyntaxElement_Line()
+	 * @model
+	 * @generated
+	 */
+	int getLine();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.SyntaxElement#getLine <em>Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Line</em>' attribute.
+	 * @see #getLine()
+	 * @generated
+	 */
+	void setLine(int value);
+
+	/**
+	 * Returns the value of the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Start</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Start</em>' attribute.
+	 * @see #setStart(int)
+	 * @see org.eclipse.xpand3.Xpand3Package#getSyntaxElement_Start()
+	 * @model
+	 * @generated
+	 */
+	int getStart();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.SyntaxElement#getStart <em>Start</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Start</em>' attribute.
+	 * @see #getStart()
+	 * @generated
+	 */
+	void setStart(int value);
+
+	/**
+	 * Returns the value of the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>End</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>End</em>' attribute.
+	 * @see #setEnd(int)
+	 * @see org.eclipse.xpand3.Xpand3Package#getSyntaxElement_End()
+	 * @model
+	 * @generated
+	 */
+	int getEnd();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.SyntaxElement#getEnd <em>End</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>End</em>' attribute.
+	 * @see #getEnd()
+	 * @generated
+	 */
+	void setEnd(int value);
+
+	/**
+	 * Returns the value of the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>File 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>File Name</em>' attribute.
+	 * @see #setFileName(String)
+	 * @see org.eclipse.xpand3.Xpand3Package#getSyntaxElement_FileName()
+	 * @model
+	 * @generated
+	 */
+	String getFileName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.SyntaxElement#getFileName <em>File Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>File Name</em>' attribute.
+	 * @see #getFileName()
+	 * @generated
+	 */
+	void setFileName(String value);
+
+} // SyntaxElement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Factory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
new file mode 100644
index 00000000..1e414266
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
@@ -0,0 +1,73 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3Factory.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+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.xpand3.Xpand3Package
+ * @generated
+ */
+public interface Xpand3Factory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	Xpand3Factory eINSTANCE = org.eclipse.xpand3.impl.Xpand3FactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>File</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>File</em>'.
+	 * @generated
+	 */
+	File createFile();
+
+	/**
+	 * Returns a new object of class '<em>Import Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Import Statement</em>'.
+	 * @generated
+	 */
+	ImportStatement createImportStatement();
+
+	/**
+	 * Returns a new object of class '<em>Identifier</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Identifier</em>'.
+	 * @generated
+	 */
+	Identifier createIdentifier();
+
+	/**
+	 * Returns a new object of class '<em>Declared Parameter</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Declared Parameter</em>'.
+	 * @generated
+	 */
+	DeclaredParameter createDeclaredParameter();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	Xpand3Package getXpand3Package();
+
+} //Xpand3Factory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Package.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Package.java
new file mode 100644
index 00000000..893553ab
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/Xpand3Package.java
@@ -0,0 +1,734 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3Package.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3;
+
+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.xpand3.Xpand3Factory
+ * @model kind="package"
+ * @generated
+ */
+public interface Xpand3Package extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "xpand3";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "xpand3";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	Xpand3Package eINSTANCE = org.eclipse.xpand3.impl.Xpand3PackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.impl.SyntaxElementImpl <em>Syntax Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.impl.SyntaxElementImpl
+	 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSyntaxElement()
+	 * @generated
+	 */
+	int SYNTAX_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SYNTAX_ELEMENT__LINE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SYNTAX_ELEMENT__START = 1;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SYNTAX_ELEMENT__END = 2;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SYNTAX_ELEMENT__FILE_NAME = 3;
+
+	/**
+	 * The number of structural features of the '<em>Syntax Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SYNTAX_ELEMENT_FEATURE_COUNT = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.impl.FileImpl <em>File</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.impl.FileImpl
+	 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getFile()
+	 * @generated
+	 */
+	int FILE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__LINE = SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__START = SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__END = SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Imports</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__IMPORTS = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Declarations</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE__DECLARATIONS = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>File</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.impl.ImportStatementImpl <em>Import Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.impl.ImportStatementImpl
+	 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getImportStatement()
+	 * @generated
+	 */
+	int IMPORT_STATEMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__LINE = SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__START = SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__END = SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Imported Id</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__IMPORTED_ID = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Exported</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT__EXPORTED = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Import Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMPORT_STATEMENT_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.impl.IdentifierImpl <em>Identifier</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.impl.IdentifierImpl
+	 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getIdentifier()
+	 * @generated
+	 */
+	int IDENTIFIER = 3;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER__LINE = SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER__START = SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER__END = SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER__VALUE = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Identifier</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.impl.DeclaredParameterImpl
+	 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getDeclaredParameter()
+	 * @generated
+	 */
+	int DECLARED_PARAMETER = 4;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__LINE = SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__START = SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__END = SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__NAME = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER__TYPE = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Declared Parameter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DECLARED_PARAMETER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 2;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.SyntaxElement <em>Syntax Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Syntax Element</em>'.
+	 * @see org.eclipse.xpand3.SyntaxElement
+	 * @generated
+	 */
+	EClass getSyntaxElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SyntaxElement#getLine <em>Line</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Line</em>'.
+	 * @see org.eclipse.xpand3.SyntaxElement#getLine()
+	 * @see #getSyntaxElement()
+	 * @generated
+	 */
+	EAttribute getSyntaxElement_Line();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SyntaxElement#getStart <em>Start</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Start</em>'.
+	 * @see org.eclipse.xpand3.SyntaxElement#getStart()
+	 * @see #getSyntaxElement()
+	 * @generated
+	 */
+	EAttribute getSyntaxElement_Start();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SyntaxElement#getEnd <em>End</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>End</em>'.
+	 * @see org.eclipse.xpand3.SyntaxElement#getEnd()
+	 * @see #getSyntaxElement()
+	 * @generated
+	 */
+	EAttribute getSyntaxElement_End();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SyntaxElement#getFileName <em>File Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>File Name</em>'.
+	 * @see org.eclipse.xpand3.SyntaxElement#getFileName()
+	 * @see #getSyntaxElement()
+	 * @generated
+	 */
+	EAttribute getSyntaxElement_FileName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.File <em>File</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>File</em>'.
+	 * @see org.eclipse.xpand3.File
+	 * @generated
+	 */
+	EClass getFile();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.File#getImports <em>Imports</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Imports</em>'.
+	 * @see org.eclipse.xpand3.File#getImports()
+	 * @see #getFile()
+	 * @generated
+	 */
+	EReference getFile_Imports();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.File#getDeclarations <em>Declarations</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Declarations</em>'.
+	 * @see org.eclipse.xpand3.File#getDeclarations()
+	 * @see #getFile()
+	 * @generated
+	 */
+	EReference getFile_Declarations();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.ImportStatement <em>Import Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Import Statement</em>'.
+	 * @see org.eclipse.xpand3.ImportStatement
+	 * @generated
+	 */
+	EClass getImportStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Imported Id</em>'.
+	 * @see org.eclipse.xpand3.ImportStatement#getImportedId()
+	 * @see #getImportStatement()
+	 * @generated
+	 */
+	EReference getImportStatement_ImportedId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Exported</em>'.
+	 * @see org.eclipse.xpand3.ImportStatement#isExported()
+	 * @see #getImportStatement()
+	 * @generated
+	 */
+	EAttribute getImportStatement_Exported();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.Identifier <em>Identifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Identifier</em>'.
+	 * @see org.eclipse.xpand3.Identifier
+	 * @generated
+	 */
+	EClass getIdentifier();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.xpand3.Identifier#getValue()
+	 * @see #getIdentifier()
+	 * @generated
+	 */
+	EAttribute getIdentifier_Value();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Declared Parameter</em>'.
+	 * @see org.eclipse.xpand3.DeclaredParameter
+	 * @generated
+	 */
+	EClass getDeclaredParameter();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.DeclaredParameter#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Name</em>'.
+	 * @see org.eclipse.xpand3.DeclaredParameter#getName()
+	 * @see #getDeclaredParameter()
+	 * @generated
+	 */
+	EReference getDeclaredParameter_Name();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.DeclaredParameter#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Type</em>'.
+	 * @see org.eclipse.xpand3.DeclaredParameter#getType()
+	 * @see #getDeclaredParameter()
+	 * @generated
+	 */
+	EReference getDeclaredParameter_Type();
+
+	/**
+	 * 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
+	 */
+	Xpand3Factory getXpand3Factory();
+
+	/**
+	 * <!-- 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.xpand3.impl.SyntaxElementImpl <em>Syntax Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.impl.SyntaxElementImpl
+		 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSyntaxElement()
+		 * @generated
+		 */
+		EClass SYNTAX_ELEMENT = eINSTANCE.getSyntaxElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Line</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SYNTAX_ELEMENT__LINE = eINSTANCE.getSyntaxElement_Line();
+
+		/**
+		 * The meta object literal for the '<em><b>Start</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SYNTAX_ELEMENT__START = eINSTANCE.getSyntaxElement_Start();
+
+		/**
+		 * The meta object literal for the '<em><b>End</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SYNTAX_ELEMENT__END = eINSTANCE.getSyntaxElement_End();
+
+		/**
+		 * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute SYNTAX_ELEMENT__FILE_NAME = eINSTANCE.getSyntaxElement_FileName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.impl.FileImpl <em>File</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.impl.FileImpl
+		 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getFile()
+		 * @generated
+		 */
+		EClass FILE = eINSTANCE.getFile();
+
+		/**
+		 * The meta object literal for the '<em><b>Imports</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FILE__IMPORTS = eINSTANCE.getFile_Imports();
+
+		/**
+		 * The meta object literal for the '<em><b>Declarations</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FILE__DECLARATIONS = eINSTANCE.getFile_Declarations();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.impl.ImportStatementImpl <em>Import Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.impl.ImportStatementImpl
+		 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getImportStatement()
+		 * @generated
+		 */
+		EClass IMPORT_STATEMENT = eINSTANCE.getImportStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Imported Id</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IMPORT_STATEMENT__IMPORTED_ID = eINSTANCE.getImportStatement_ImportedId();
+
+		/**
+		 * The meta object literal for the '<em><b>Exported</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IMPORT_STATEMENT__EXPORTED = eINSTANCE.getImportStatement_Exported();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.impl.IdentifierImpl <em>Identifier</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.impl.IdentifierImpl
+		 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getIdentifier()
+		 * @generated
+		 */
+		EClass IDENTIFIER = eINSTANCE.getIdentifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute IDENTIFIER__VALUE = eINSTANCE.getIdentifier_Value();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.impl.DeclaredParameterImpl
+		 * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getDeclaredParameter()
+		 * @generated
+		 */
+		EClass DECLARED_PARAMETER = eINSTANCE.getDeclaredParameter();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DECLARED_PARAMETER__NAME = eINSTANCE.getDeclaredParameter_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DECLARED_PARAMETER__TYPE = eINSTANCE.getDeclaredParameter_Type();
+
+	}
+
+} //Xpand3Package
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java
new file mode 100644
index 00000000..8046dad5
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractAspect.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractAspect.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractAspect#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractAspect#isWildparams <em>Wildparams</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractAspect()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractAspect extends AbstractDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Pointcut</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pointcut</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>Pointcut</em>' containment reference.
+	 * @see #setPointcut(Identifier)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractAspect_Pointcut()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getPointcut();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractAspect#getPointcut <em>Pointcut</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Pointcut</em>' containment reference.
+	 * @see #getPointcut()
+	 * @generated
+	 */
+	void setPointcut(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Wildparams</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Wildparams</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Wildparams</em>' attribute.
+	 * @see #setWildparams(boolean)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractAspect_Wildparams()
+	 * @model
+	 * @generated
+	 */
+	boolean isWildparams();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractAspect#isWildparams <em>Wildparams</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Wildparams</em>' attribute.
+	 * @see #isWildparams()
+	 * @generated
+	 */
+	void setWildparams(boolean value);
+
+} // AbstractAspect
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractDeclaration.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractDeclaration.java
new file mode 100644
index 00000000..c0c85a98
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractDeclaration.java
@@ -0,0 +1,131 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractDeclaration.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.File;
+import org.eclipse.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractDeclaration#isIsPrivate <em>Is Private</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getGuard <em>Guard</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractDeclaration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractDeclaration extends SyntaxElement {
+	/**
+	 * Returns the value of the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Owner</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>Owner</em>' containment reference.
+	 * @see #setOwner(File)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractDeclaration_Owner()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	File getOwner();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getOwner <em>Owner</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owner</em>' containment reference.
+	 * @see #getOwner()
+	 * @generated
+	 */
+	void setOwner(File value);
+
+	/**
+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.DeclaredParameter}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Params</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>Params</em>' containment reference list.
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractDeclaration_Params()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<DeclaredParameter> getParams();
+
+	/**
+	 * Returns the value of the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Is Private</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 Private</em>' attribute.
+	 * @see #setIsPrivate(boolean)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractDeclaration_IsPrivate()
+	 * @model
+	 * @generated
+	 */
+	boolean isIsPrivate();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#isIsPrivate <em>Is Private</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Is Private</em>' attribute.
+	 * @see #isIsPrivate()
+	 * @generated
+	 */
+	void setIsPrivate(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Guard</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>Guard</em>' containment reference.
+	 * @see #setGuard(AbstractExpression)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractDeclaration_Guard()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getGuard();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getGuard <em>Guard</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Guard</em>' containment reference.
+	 * @see #getGuard()
+	 * @generated
+	 */
+	void setGuard(AbstractExpression value);
+
+} // AbstractDeclaration
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractNamedDeclaration.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractNamedDeclaration.java
new file mode 100644
index 00000000..e878ee6d
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/AbstractNamedDeclaration.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractNamedDeclaration.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Named Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractNamedDeclaration()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractNamedDeclaration extends AbstractDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Name</em>' containment reference.
+	 * @see #setName(Identifier)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getAbstractNamedDeclaration_Name()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration#getName <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' containment reference.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(Identifier value);
+
+} // AbstractNamedDeclaration
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Check.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Check.java
new file mode 100644
index 00000000..ec87d219
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Check.java
@@ -0,0 +1,135 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Check.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Check</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.Check#isErrorSeverity <em>Error Severity</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.Check#getMsg <em>Msg</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.Check#getConstraint <em>Constraint</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.Check#getFeature <em>Feature</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCheck()
+ * @model
+ * @generated
+ */
+public interface Check extends AbstractDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Error Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Error Severity</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Error Severity</em>' attribute.
+	 * @see #setErrorSeverity(boolean)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCheck_ErrorSeverity()
+	 * @model
+	 * @generated
+	 */
+	boolean isErrorSeverity();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Check#isErrorSeverity <em>Error Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Error Severity</em>' attribute.
+	 * @see #isErrorSeverity()
+	 * @generated
+	 */
+	void setErrorSeverity(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Msg</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Msg</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>Msg</em>' containment reference.
+	 * @see #setMsg(AbstractExpression)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCheck_Msg()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getMsg();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Check#getMsg <em>Msg</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Msg</em>' containment reference.
+	 * @see #getMsg()
+	 * @generated
+	 */
+	void setMsg(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Constraint</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>Constraint</em>' containment reference.
+	 * @see #setConstraint(AbstractExpression)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCheck_Constraint()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getConstraint();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Check#getConstraint <em>Constraint</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Constraint</em>' containment reference.
+	 * @see #getConstraint()
+	 * @generated
+	 */
+	void setConstraint(AbstractExpression 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.xpand3.declaration.DeclarationPackage#getCheck_Feature()
+	 * @model
+	 * @generated
+	 */
+	String getFeature();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Check#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);
+
+} // Check
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/CreateExtension.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/CreateExtension.java
new file mode 100644
index 00000000..9139f7dc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/CreateExtension.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CreateExtension.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.DeclaredParameter;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create Extension</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.CreateExtension#getToBeCreated <em>To Be Created</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCreateExtension()
+ * @model
+ * @generated
+ */
+public interface CreateExtension extends Extension {
+	/**
+	 * Returns the value of the '<em><b>To Be Created</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>To Be Created</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>To Be Created</em>' reference.
+	 * @see #setToBeCreated(DeclaredParameter)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getCreateExtension_ToBeCreated()
+	 * @model
+	 * @generated
+	 */
+	DeclaredParameter getToBeCreated();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.CreateExtension#getToBeCreated <em>To Be Created</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>To Be Created</em>' reference.
+	 * @see #getToBeCreated()
+	 * @generated
+	 */
+	void setToBeCreated(DeclaredParameter value);
+
+} // CreateExtension
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationFactory.java
new file mode 100644
index 00000000..43d5a121
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationFactory.java
@@ -0,0 +1,100 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationFactory.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+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.xpand3.declaration.DeclarationPackage
+ * @generated
+ */
+public interface DeclarationFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	DeclarationFactory eINSTANCE = org.eclipse.xpand3.declaration.impl.DeclarationFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Definition</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Definition</em>'.
+	 * @generated
+	 */
+	Definition createDefinition();
+
+	/**
+	 * Returns a new object of class '<em>Extension</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Extension</em>'.
+	 * @generated
+	 */
+	Extension createExtension();
+
+	/**
+	 * Returns a new object of class '<em>Extension Aspect</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Extension Aspect</em>'.
+	 * @generated
+	 */
+	ExtensionAspect createExtensionAspect();
+
+	/**
+	 * Returns a new object of class '<em>Definition Aspect</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Definition Aspect</em>'.
+	 * @generated
+	 */
+	DefinitionAspect createDefinitionAspect();
+
+	/**
+	 * Returns a new object of class '<em>Check</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Check</em>'.
+	 * @generated
+	 */
+	Check createCheck();
+
+	/**
+	 * Returns a new object of class '<em>Create Extension</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Create Extension</em>'.
+	 * @generated
+	 */
+	CreateExtension createCreateExtension();
+
+	/**
+	 * Returns a new object of class '<em>Java Extension</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Java Extension</em>'.
+	 * @generated
+	 */
+	JavaExtension createJavaExtension();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	DeclarationPackage getDeclarationPackage();
+
+} //DeclarationFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java
new file mode 100644
index 00000000..e3ae62e8
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java
@@ -0,0 +1,1850 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationPackage.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+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.xpand3.Xpand3Package;
+
+/**
+ * <!-- 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.xpand3.declaration.DeclarationFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface DeclarationPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "declaration";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/declararation";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "declaration";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	DeclarationPackage eINSTANCE = org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl <em>Abstract Declaration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractDeclaration()
+	 * @generated
+	 */
+	int ABSTRACT_DECLARATION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__LINE = Xpand3Package.SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__START = Xpand3Package.SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__END = Xpand3Package.SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__FILE_NAME = Xpand3Package.SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__OWNER = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__PARAMS = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__IS_PRIVATE = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION__GUARD = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Declaration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_DECLARATION_FEATURE_COUNT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.AbstractNamedDeclarationImpl <em>Abstract Named Declaration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.AbstractNamedDeclarationImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractNamedDeclaration()
+	 * @generated
+	 */
+	int ABSTRACT_NAMED_DECLARATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__LINE = ABSTRACT_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__START = ABSTRACT_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__END = ABSTRACT_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__FILE_NAME = ABSTRACT_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__OWNER = ABSTRACT_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__PARAMS = ABSTRACT_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__IS_PRIVATE = ABSTRACT_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__GUARD = ABSTRACT_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION__NAME = ABSTRACT_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Named Declaration</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT = ABSTRACT_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.DefinitionImpl <em>Definition</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.DefinitionImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getDefinition()
+	 * @generated
+	 */
+	int DEFINITION = 2;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__LINE = ABSTRACT_NAMED_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__START = ABSTRACT_NAMED_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__END = ABSTRACT_NAMED_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__FILE_NAME = ABSTRACT_NAMED_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__OWNER = ABSTRACT_NAMED_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__PARAMS = ABSTRACT_NAMED_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__IS_PRIVATE = ABSTRACT_NAMED_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__GUARD = ABSTRACT_NAMED_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__NAME = ABSTRACT_NAMED_DECLARATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION__BODY = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Definition</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_FEATURE_COUNT = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.ExtensionImpl <em>Extension</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.ExtensionImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getExtension()
+	 * @generated
+	 */
+	int EXTENSION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__LINE = ABSTRACT_NAMED_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__START = ABSTRACT_NAMED_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__END = ABSTRACT_NAMED_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__FILE_NAME = ABSTRACT_NAMED_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__OWNER = ABSTRACT_NAMED_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__PARAMS = ABSTRACT_NAMED_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__IS_PRIVATE = ABSTRACT_NAMED_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__GUARD = ABSTRACT_NAMED_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__NAME = ABSTRACT_NAMED_DECLARATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Cached</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__CACHED = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__BODY = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Return Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION__RETURN_TYPE = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Extension</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_FEATURE_COUNT = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl <em>Abstract Aspect</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.AbstractAspectImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractAspect()
+	 * @generated
+	 */
+	int ABSTRACT_ASPECT = 4;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__LINE = ABSTRACT_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__START = ABSTRACT_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__END = ABSTRACT_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__FILE_NAME = ABSTRACT_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__OWNER = ABSTRACT_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__PARAMS = ABSTRACT_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__IS_PRIVATE = ABSTRACT_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__GUARD = ABSTRACT_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Pointcut</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__POINTCUT = ABSTRACT_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Wildparams</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT__WILDPARAMS = ABSTRACT_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Aspect</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_ASPECT_FEATURE_COUNT = ABSTRACT_DECLARATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl <em>Extension Aspect</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getExtensionAspect()
+	 * @generated
+	 */
+	int EXTENSION_ASPECT = 5;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__LINE = ABSTRACT_ASPECT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__START = ABSTRACT_ASPECT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__END = ABSTRACT_ASPECT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__FILE_NAME = ABSTRACT_ASPECT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__OWNER = ABSTRACT_ASPECT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__PARAMS = ABSTRACT_ASPECT__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__IS_PRIVATE = ABSTRACT_ASPECT__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__GUARD = ABSTRACT_ASPECT__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Pointcut</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT;
+
+	/**
+	 * The feature id for the '<em><b>Wildparams</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__WILDPARAMS = ABSTRACT_ASPECT__WILDPARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT__EXPRESSION = ABSTRACT_ASPECT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Extension Aspect</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXTENSION_ASPECT_FEATURE_COUNT = ABSTRACT_ASPECT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.DefinitionAspectImpl <em>Definition Aspect</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.DefinitionAspectImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getDefinitionAspect()
+	 * @generated
+	 */
+	int DEFINITION_ASPECT = 6;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__LINE = ABSTRACT_ASPECT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__START = ABSTRACT_ASPECT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__END = ABSTRACT_ASPECT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__FILE_NAME = ABSTRACT_ASPECT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__OWNER = ABSTRACT_ASPECT__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__PARAMS = ABSTRACT_ASPECT__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__IS_PRIVATE = ABSTRACT_ASPECT__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__GUARD = ABSTRACT_ASPECT__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Pointcut</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__POINTCUT = ABSTRACT_ASPECT__POINTCUT;
+
+	/**
+	 * The feature id for the '<em><b>Wildparams</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__WILDPARAMS = ABSTRACT_ASPECT__WILDPARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT__BODY = ABSTRACT_ASPECT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Definition Aspect</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DEFINITION_ASPECT_FEATURE_COUNT = ABSTRACT_ASPECT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.CheckImpl <em>Check</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.CheckImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getCheck()
+	 * @generated
+	 */
+	int CHECK = 7;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__LINE = ABSTRACT_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__START = ABSTRACT_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__END = ABSTRACT_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__FILE_NAME = ABSTRACT_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__OWNER = ABSTRACT_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__PARAMS = ABSTRACT_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__IS_PRIVATE = ABSTRACT_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__GUARD = ABSTRACT_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Error Severity</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__ERROR_SEVERITY = ABSTRACT_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Msg</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__MSG = ABSTRACT_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Constraint</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__CONSTRAINT = ABSTRACT_DECLARATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Feature</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK__FEATURE = ABSTRACT_DECLARATION_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Check</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHECK_FEATURE_COUNT = ABSTRACT_DECLARATION_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.CreateExtensionImpl <em>Create Extension</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.CreateExtensionImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getCreateExtension()
+	 * @generated
+	 */
+	int CREATE_EXTENSION = 8;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__LINE = EXTENSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__START = EXTENSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__END = EXTENSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__FILE_NAME = EXTENSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__OWNER = EXTENSION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__PARAMS = EXTENSION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__IS_PRIVATE = EXTENSION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__GUARD = EXTENSION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__NAME = EXTENSION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Cached</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__CACHED = EXTENSION__CACHED;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__BODY = EXTENSION__BODY;
+
+	/**
+	 * The feature id for the '<em><b>Return Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__RETURN_TYPE = EXTENSION__RETURN_TYPE;
+
+	/**
+	 * The feature id for the '<em><b>To Be Created</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION__TO_BE_CREATED = EXTENSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Create Extension</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CREATE_EXTENSION_FEATURE_COUNT = EXTENSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.declaration.impl.JavaExtensionImpl <em>Java Extension</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.declaration.impl.JavaExtensionImpl
+	 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getJavaExtension()
+	 * @generated
+	 */
+	int JAVA_EXTENSION = 9;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__LINE = ABSTRACT_NAMED_DECLARATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__START = ABSTRACT_NAMED_DECLARATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__END = ABSTRACT_NAMED_DECLARATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__FILE_NAME = ABSTRACT_NAMED_DECLARATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Owner</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__OWNER = ABSTRACT_NAMED_DECLARATION__OWNER;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__PARAMS = ABSTRACT_NAMED_DECLARATION__PARAMS;
+
+	/**
+	 * The feature id for the '<em><b>Is Private</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__IS_PRIVATE = ABSTRACT_NAMED_DECLARATION__IS_PRIVATE;
+
+	/**
+	 * The feature id for the '<em><b>Guard</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__GUARD = ABSTRACT_NAMED_DECLARATION__GUARD;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__NAME = ABSTRACT_NAMED_DECLARATION__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Java Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__JAVA_TYPE = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Java Method</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__JAVA_METHOD = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Java Param Types</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION__JAVA_PARAM_TYPES = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Java Extension</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_EXTENSION_FEATURE_COUNT = ABSTRACT_NAMED_DECLARATION_FEATURE_COUNT + 3;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.AbstractDeclaration <em>Abstract Declaration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Declaration</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractDeclaration
+	 * @generated
+	 */
+	EClass getAbstractDeclaration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getOwner <em>Owner</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Owner</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractDeclaration#getOwner()
+	 * @see #getAbstractDeclaration()
+	 * @generated
+	 */
+	EReference getAbstractDeclaration_Owner();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getParams <em>Params</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Params</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractDeclaration#getParams()
+	 * @see #getAbstractDeclaration()
+	 * @generated
+	 */
+	EReference getAbstractDeclaration_Params();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#isIsPrivate <em>Is Private</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Is Private</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractDeclaration#isIsPrivate()
+	 * @see #getAbstractDeclaration()
+	 * @generated
+	 */
+	EAttribute getAbstractDeclaration_IsPrivate();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.AbstractDeclaration#getGuard <em>Guard</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Guard</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractDeclaration#getGuard()
+	 * @see #getAbstractDeclaration()
+	 * @generated
+	 */
+	EReference getAbstractDeclaration_Guard();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration <em>Abstract Named Declaration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Named Declaration</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractNamedDeclaration
+	 * @generated
+	 */
+	EClass getAbstractNamedDeclaration();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Name</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractNamedDeclaration#getName()
+	 * @see #getAbstractNamedDeclaration()
+	 * @generated
+	 */
+	EReference getAbstractNamedDeclaration_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.Definition <em>Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Definition</em>'.
+	 * @see org.eclipse.xpand3.declaration.Definition
+	 * @generated
+	 */
+	EClass getDefinition();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.declaration.Definition#getBody <em>Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Body</em>'.
+	 * @see org.eclipse.xpand3.declaration.Definition#getBody()
+	 * @see #getDefinition()
+	 * @generated
+	 */
+	EReference getDefinition_Body();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.Extension <em>Extension</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Extension</em>'.
+	 * @see org.eclipse.xpand3.declaration.Extension
+	 * @generated
+	 */
+	EClass getExtension();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.Extension#isCached <em>Cached</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Cached</em>'.
+	 * @see org.eclipse.xpand3.declaration.Extension#isCached()
+	 * @see #getExtension()
+	 * @generated
+	 */
+	EAttribute getExtension_Cached();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.Extension#getBody <em>Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Body</em>'.
+	 * @see org.eclipse.xpand3.declaration.Extension#getBody()
+	 * @see #getExtension()
+	 * @generated
+	 */
+	EReference getExtension_Body();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.Extension#getReturnType <em>Return Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Return Type</em>'.
+	 * @see org.eclipse.xpand3.declaration.Extension#getReturnType()
+	 * @see #getExtension()
+	 * @generated
+	 */
+	EReference getExtension_ReturnType();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.AbstractAspect <em>Abstract Aspect</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Aspect</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractAspect
+	 * @generated
+	 */
+	EClass getAbstractAspect();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.AbstractAspect#getPointcut <em>Pointcut</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Pointcut</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractAspect#getPointcut()
+	 * @see #getAbstractAspect()
+	 * @generated
+	 */
+	EReference getAbstractAspect_Pointcut();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.AbstractAspect#isWildparams <em>Wildparams</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Wildparams</em>'.
+	 * @see org.eclipse.xpand3.declaration.AbstractAspect#isWildparams()
+	 * @see #getAbstractAspect()
+	 * @generated
+	 */
+	EAttribute getAbstractAspect_Wildparams();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.ExtensionAspect <em>Extension Aspect</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Extension Aspect</em>'.
+	 * @see org.eclipse.xpand3.declaration.ExtensionAspect
+	 * @generated
+	 */
+	EClass getExtensionAspect();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.ExtensionAspect#getExpression <em>Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Expression</em>'.
+	 * @see org.eclipse.xpand3.declaration.ExtensionAspect#getExpression()
+	 * @see #getExtensionAspect()
+	 * @generated
+	 */
+	EReference getExtensionAspect_Expression();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.DefinitionAspect <em>Definition Aspect</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Definition Aspect</em>'.
+	 * @see org.eclipse.xpand3.declaration.DefinitionAspect
+	 * @generated
+	 */
+	EClass getDefinitionAspect();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.declaration.DefinitionAspect#getBody <em>Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Body</em>'.
+	 * @see org.eclipse.xpand3.declaration.DefinitionAspect#getBody()
+	 * @see #getDefinitionAspect()
+	 * @generated
+	 */
+	EReference getDefinitionAspect_Body();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.Check <em>Check</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Check</em>'.
+	 * @see org.eclipse.xpand3.declaration.Check
+	 * @generated
+	 */
+	EClass getCheck();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.Check#isErrorSeverity <em>Error Severity</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Error Severity</em>'.
+	 * @see org.eclipse.xpand3.declaration.Check#isErrorSeverity()
+	 * @see #getCheck()
+	 * @generated
+	 */
+	EAttribute getCheck_ErrorSeverity();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.Check#getMsg <em>Msg</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Msg</em>'.
+	 * @see org.eclipse.xpand3.declaration.Check#getMsg()
+	 * @see #getCheck()
+	 * @generated
+	 */
+	EReference getCheck_Msg();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.Check#getConstraint <em>Constraint</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Constraint</em>'.
+	 * @see org.eclipse.xpand3.declaration.Check#getConstraint()
+	 * @see #getCheck()
+	 * @generated
+	 */
+	EReference getCheck_Constraint();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.declaration.Check#getFeature <em>Feature</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Feature</em>'.
+	 * @see org.eclipse.xpand3.declaration.Check#getFeature()
+	 * @see #getCheck()
+	 * @generated
+	 */
+	EAttribute getCheck_Feature();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.CreateExtension <em>Create Extension</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Create Extension</em>'.
+	 * @see org.eclipse.xpand3.declaration.CreateExtension
+	 * @generated
+	 */
+	EClass getCreateExtension();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.declaration.CreateExtension#getToBeCreated <em>To Be Created</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>To Be Created</em>'.
+	 * @see org.eclipse.xpand3.declaration.CreateExtension#getToBeCreated()
+	 * @see #getCreateExtension()
+	 * @generated
+	 */
+	EReference getCreateExtension_ToBeCreated();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.declaration.JavaExtension <em>Java Extension</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Java Extension</em>'.
+	 * @see org.eclipse.xpand3.declaration.JavaExtension
+	 * @generated
+	 */
+	EClass getJavaExtension();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaType <em>Java Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Java Type</em>'.
+	 * @see org.eclipse.xpand3.declaration.JavaExtension#getJavaType()
+	 * @see #getJavaExtension()
+	 * @generated
+	 */
+	EReference getJavaExtension_JavaType();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaMethod <em>Java Method</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Java Method</em>'.
+	 * @see org.eclipse.xpand3.declaration.JavaExtension#getJavaMethod()
+	 * @see #getJavaExtension()
+	 * @generated
+	 */
+	EReference getJavaExtension_JavaMethod();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaParamTypes <em>Java Param Types</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Java Param Types</em>'.
+	 * @see org.eclipse.xpand3.declaration.JavaExtension#getJavaParamTypes()
+	 * @see #getJavaExtension()
+	 * @generated
+	 */
+	EReference getJavaExtension_JavaParamTypes();
+
+	/**
+	 * 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
+	 */
+	DeclarationFactory getDeclarationFactory();
+
+	/**
+	 * <!-- 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.xpand3.declaration.impl.AbstractDeclarationImpl <em>Abstract Declaration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractDeclaration()
+		 * @generated
+		 */
+		EClass ABSTRACT_DECLARATION = eINSTANCE.getAbstractDeclaration();
+
+		/**
+		 * The meta object literal for the '<em><b>Owner</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_DECLARATION__OWNER = eINSTANCE.getAbstractDeclaration_Owner();
+
+		/**
+		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_DECLARATION__PARAMS = eINSTANCE.getAbstractDeclaration_Params();
+
+		/**
+		 * The meta object literal for the '<em><b>Is Private</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ABSTRACT_DECLARATION__IS_PRIVATE = eINSTANCE.getAbstractDeclaration_IsPrivate();
+
+		/**
+		 * The meta object literal for the '<em><b>Guard</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_DECLARATION__GUARD = eINSTANCE.getAbstractDeclaration_Guard();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.AbstractNamedDeclarationImpl <em>Abstract Named Declaration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.AbstractNamedDeclarationImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractNamedDeclaration()
+		 * @generated
+		 */
+		EClass ABSTRACT_NAMED_DECLARATION = eINSTANCE.getAbstractNamedDeclaration();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_NAMED_DECLARATION__NAME = eINSTANCE.getAbstractNamedDeclaration_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.DefinitionImpl <em>Definition</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.DefinitionImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getDefinition()
+		 * @generated
+		 */
+		EClass DEFINITION = eINSTANCE.getDefinition();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEFINITION__BODY = eINSTANCE.getDefinition_Body();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.ExtensionImpl <em>Extension</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.ExtensionImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getExtension()
+		 * @generated
+		 */
+		EClass EXTENSION = eINSTANCE.getExtension();
+
+		/**
+		 * The meta object literal for the '<em><b>Cached</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXTENSION__CACHED = eINSTANCE.getExtension_Cached();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTENSION__BODY = eINSTANCE.getExtension_Body();
+
+		/**
+		 * The meta object literal for the '<em><b>Return Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTENSION__RETURN_TYPE = eINSTANCE.getExtension_ReturnType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl <em>Abstract Aspect</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.AbstractAspectImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getAbstractAspect()
+		 * @generated
+		 */
+		EClass ABSTRACT_ASPECT = eINSTANCE.getAbstractAspect();
+
+		/**
+		 * The meta object literal for the '<em><b>Pointcut</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_ASPECT__POINTCUT = eINSTANCE.getAbstractAspect_Pointcut();
+
+		/**
+		 * The meta object literal for the '<em><b>Wildparams</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ABSTRACT_ASPECT__WILDPARAMS = eINSTANCE.getAbstractAspect_Wildparams();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl <em>Extension Aspect</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getExtensionAspect()
+		 * @generated
+		 */
+		EClass EXTENSION_ASPECT = eINSTANCE.getExtensionAspect();
+
+		/**
+		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXTENSION_ASPECT__EXPRESSION = eINSTANCE.getExtensionAspect_Expression();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.DefinitionAspectImpl <em>Definition Aspect</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.DefinitionAspectImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getDefinitionAspect()
+		 * @generated
+		 */
+		EClass DEFINITION_ASPECT = eINSTANCE.getDefinitionAspect();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DEFINITION_ASPECT__BODY = eINSTANCE.getDefinitionAspect_Body();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.CheckImpl <em>Check</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.CheckImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getCheck()
+		 * @generated
+		 */
+		EClass CHECK = eINSTANCE.getCheck();
+
+		/**
+		 * The meta object literal for the '<em><b>Error Severity</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CHECK__ERROR_SEVERITY = eINSTANCE.getCheck_ErrorSeverity();
+
+		/**
+		 * The meta object literal for the '<em><b>Msg</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHECK__MSG = eINSTANCE.getCheck_Msg();
+
+		/**
+		 * The meta object literal for the '<em><b>Constraint</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHECK__CONSTRAINT = eINSTANCE.getCheck_Constraint();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CHECK__FEATURE = eINSTANCE.getCheck_Feature();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.CreateExtensionImpl <em>Create Extension</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.CreateExtensionImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getCreateExtension()
+		 * @generated
+		 */
+		EClass CREATE_EXTENSION = eINSTANCE.getCreateExtension();
+
+		/**
+		 * The meta object literal for the '<em><b>To Be Created</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CREATE_EXTENSION__TO_BE_CREATED = eINSTANCE.getCreateExtension_ToBeCreated();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.declaration.impl.JavaExtensionImpl <em>Java Extension</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.declaration.impl.JavaExtensionImpl
+		 * @see org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl#getJavaExtension()
+		 * @generated
+		 */
+		EClass JAVA_EXTENSION = eINSTANCE.getJavaExtension();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference JAVA_EXTENSION__JAVA_TYPE = eINSTANCE.getJavaExtension_JavaType();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Method</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference JAVA_EXTENSION__JAVA_METHOD = eINSTANCE.getJavaExtension_JavaMethod();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Param Types</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference JAVA_EXTENSION__JAVA_PARAM_TYPES = eINSTANCE.getJavaExtension_JavaParamTypes();
+
+	}
+
+} //DeclarationPackage
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Definition.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Definition.java
new file mode 100644
index 00000000..1151ad82
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Definition.java
@@ -0,0 +1,46 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Definition.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.Definition#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getDefinition()
+ * @model
+ * @generated
+ */
+public interface Definition extends AbstractNamedDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.statement.AbstractStatement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Body</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>Body</em>' containment reference list.
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getDefinition_Body()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AbstractStatement> getBody();
+
+} // Definition
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DefinitionAspect.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DefinitionAspect.java
new file mode 100644
index 00000000..11f63109
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DefinitionAspect.java
@@ -0,0 +1,46 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DefinitionAspect.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Definition Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.DefinitionAspect#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getDefinitionAspect()
+ * @model
+ * @generated
+ */
+public interface DefinitionAspect extends AbstractAspect {
+	/**
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.statement.AbstractStatement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Body</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>Body</em>' containment reference list.
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getDefinitionAspect_Body()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AbstractStatement> getBody();
+
+} // DefinitionAspect
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Extension.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Extension.java
new file mode 100644
index 00000000..a6e52332
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/Extension.java
@@ -0,0 +1,110 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Extension.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extension</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.Extension#isCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.Extension#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.Extension#getReturnType <em>Return Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtension()
+ * @model
+ * @generated
+ */
+public interface Extension extends AbstractNamedDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Cached</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cached</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cached</em>' attribute.
+	 * @see #setCached(boolean)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtension_Cached()
+	 * @model
+	 * @generated
+	 */
+	boolean isCached();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Extension#isCached <em>Cached</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Cached</em>' attribute.
+	 * @see #isCached()
+	 * @generated
+	 */
+	void setCached(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Body</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>Body</em>' containment reference.
+	 * @see #setBody(AbstractExpression)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtension_Body()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	AbstractExpression getBody();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Extension#getBody <em>Body</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Body</em>' containment reference.
+	 * @see #getBody()
+	 * @generated
+	 */
+	void setBody(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Return Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Return 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>Return Type</em>' containment reference.
+	 * @see #setReturnType(Identifier)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtension_ReturnType()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getReturnType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.Extension#getReturnType <em>Return Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Return Type</em>' containment reference.
+	 * @see #getReturnType()
+	 * @generated
+	 */
+	void setReturnType(Identifier value);
+
+} // Extension
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/ExtensionAspect.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/ExtensionAspect.java
new file mode 100644
index 00000000..adef3833
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/ExtensionAspect.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExtensionAspect.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extension Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.ExtensionAspect#getExpression <em>Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtensionAspect()
+ * @model
+ * @generated
+ */
+public interface ExtensionAspect extends AbstractAspect {
+	/**
+	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Expression</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>Expression</em>' containment reference.
+	 * @see #setExpression(AbstractExpression)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getExtensionAspect_Expression()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.ExtensionAspect#getExpression <em>Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expression</em>' containment reference.
+	 * @see #getExpression()
+	 * @generated
+	 */
+	void setExpression(AbstractExpression value);
+
+} // ExtensionAspect
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/JavaExtension.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/JavaExtension.java
new file mode 100644
index 00000000..81538904
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/JavaExtension.java
@@ -0,0 +1,100 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaExtension.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Java Extension</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaType <em>Java Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaMethod <em>Java Method</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaParamTypes <em>Java Param Types</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.declaration.DeclarationPackage#getJavaExtension()
+ * @model
+ * @generated
+ */
+public interface JavaExtension extends AbstractNamedDeclaration {
+	/**
+	 * Returns the value of the '<em><b>Java Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Java 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>Java Type</em>' containment reference.
+	 * @see #setJavaType(Identifier)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getJavaExtension_JavaType()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getJavaType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaType <em>Java Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Java Type</em>' containment reference.
+	 * @see #getJavaType()
+	 * @generated
+	 */
+	void setJavaType(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Java Method</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Java Method</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>Java Method</em>' containment reference.
+	 * @see #setJavaMethod(Identifier)
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getJavaExtension_JavaMethod()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getJavaMethod();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.declaration.JavaExtension#getJavaMethod <em>Java Method</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Java Method</em>' containment reference.
+	 * @see #getJavaMethod()
+	 * @generated
+	 */
+	void setJavaMethod(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Java Param Types</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.Identifier}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Java Param Types</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>Java Param Types</em>' containment reference list.
+	 * @see org.eclipse.xpand3.declaration.DeclarationPackage#getJavaExtension_JavaParamTypes()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Identifier> getJavaParamTypes();
+
+} // JavaExtension
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java
new file mode 100644
index 00000000..2f3af172
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractAspectImpl.java
@@ -0,0 +1,248 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractAspectImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.declaration.AbstractAspect;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractAspectImpl#isWildparams <em>Wildparams</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractAspectImpl extends AbstractDeclarationImpl implements AbstractAspect {
+	/**
+	 * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPointcut()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier pointcut;
+
+	/**
+	 * The default value of the '{@link #isWildparams() <em>Wildparams</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isWildparams()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean WILDPARAMS_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isWildparams() <em>Wildparams</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isWildparams()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean wildparams = WILDPARAMS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractAspectImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.ABSTRACT_ASPECT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getPointcut() {
+		return pointcut;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetPointcut(Identifier newPointcut, NotificationChain msgs) {
+		Identifier oldPointcut = pointcut;
+		pointcut = newPointcut;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_ASPECT__POINTCUT, oldPointcut, newPointcut);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPointcut(Identifier newPointcut) {
+		if (newPointcut != pointcut) {
+			NotificationChain msgs = null;
+			if (pointcut != null)
+				msgs = ((InternalEObject)pointcut).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_ASPECT__POINTCUT, null, msgs);
+			if (newPointcut != null)
+				msgs = ((InternalEObject)newPointcut).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_ASPECT__POINTCUT, null, msgs);
+			msgs = basicSetPointcut(newPointcut, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_ASPECT__POINTCUT, newPointcut, newPointcut));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isWildparams() {
+		return wildparams;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setWildparams(boolean newWildparams) {
+		boolean oldWildparams = wildparams;
+		wildparams = newWildparams;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS, oldWildparams, wildparams));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT:
+				return basicSetPointcut(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 DeclarationPackage.ABSTRACT_ASPECT__POINTCUT:
+				return getPointcut();
+			case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS:
+				return isWildparams() ? 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 DeclarationPackage.ABSTRACT_ASPECT__POINTCUT:
+				setPointcut((Identifier)newValue);
+				return;
+			case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS:
+				setWildparams(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT:
+				setPointcut((Identifier)null);
+				return;
+			case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS:
+				setWildparams(WILDPARAMS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_ASPECT__POINTCUT:
+				return pointcut != null;
+			case DeclarationPackage.ABSTRACT_ASPECT__WILDPARAMS:
+				return wildparams != WILDPARAMS_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(" (wildparams: ");
+		result.append(wildparams);
+		result.append(')');
+		return result.toString();
+	}
+
+} //AbstractAspectImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractDeclarationImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractDeclarationImpl.java
new file mode 100644
index 00000000..bcc004be
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractDeclarationImpl.java
@@ -0,0 +1,363 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractDeclarationImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.File;
+
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.impl.SyntaxElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl#getOwner <em>Owner</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl#isIsPrivate <em>Is Private</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractDeclarationImpl#getGuard <em>Guard</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractDeclarationImpl extends SyntaxElementImpl implements AbstractDeclaration {
+	/**
+	 * The cached value of the '{@link #getOwner() <em>Owner</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwner()
+	 * @generated
+	 * @ordered
+	 */
+	protected File owner;
+
+	/**
+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<DeclaredParameter> params;
+
+	/**
+	 * The default value of the '{@link #isIsPrivate() <em>Is Private</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsPrivate()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean IS_PRIVATE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isIsPrivate() <em>Is Private</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isIsPrivate()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean isPrivate = IS_PRIVATE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getGuard() <em>Guard</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGuard()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression guard;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractDeclarationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.ABSTRACT_DECLARATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public File getOwner() {
+		return owner;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwner(File newOwner, NotificationChain msgs) {
+		File oldOwner = owner;
+		owner = newOwner;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_DECLARATION__OWNER, oldOwner, newOwner);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwner(File newOwner) {
+		if (newOwner != owner) {
+			NotificationChain msgs = null;
+			if (owner != null)
+				msgs = ((InternalEObject)owner).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_DECLARATION__OWNER, null, msgs);
+			if (newOwner != null)
+				msgs = ((InternalEObject)newOwner).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_DECLARATION__OWNER, null, msgs);
+			msgs = basicSetOwner(newOwner, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_DECLARATION__OWNER, newOwner, newOwner));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<DeclaredParameter> getParams() {
+		if (params == null) {
+			params = new EObjectContainmentEList<DeclaredParameter>(DeclaredParameter.class, this, DeclarationPackage.ABSTRACT_DECLARATION__PARAMS);
+		}
+		return params;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isIsPrivate() {
+		return isPrivate;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setIsPrivate(boolean newIsPrivate) {
+		boolean oldIsPrivate = isPrivate;
+		isPrivate = newIsPrivate;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_DECLARATION__IS_PRIVATE, oldIsPrivate, isPrivate));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getGuard() {
+		return guard;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetGuard(AbstractExpression newGuard, NotificationChain msgs) {
+		AbstractExpression oldGuard = guard;
+		guard = newGuard;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_DECLARATION__GUARD, oldGuard, newGuard);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setGuard(AbstractExpression newGuard) {
+		if (newGuard != guard) {
+			NotificationChain msgs = null;
+			if (guard != null)
+				msgs = ((InternalEObject)guard).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_DECLARATION__GUARD, null, msgs);
+			if (newGuard != null)
+				msgs = ((InternalEObject)newGuard).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_DECLARATION__GUARD, null, msgs);
+			msgs = basicSetGuard(newGuard, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_DECLARATION__GUARD, newGuard, newGuard));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_DECLARATION__OWNER:
+				return basicSetOwner(null, msgs);
+			case DeclarationPackage.ABSTRACT_DECLARATION__PARAMS:
+				return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
+			case DeclarationPackage.ABSTRACT_DECLARATION__GUARD:
+				return basicSetGuard(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 DeclarationPackage.ABSTRACT_DECLARATION__OWNER:
+				return getOwner();
+			case DeclarationPackage.ABSTRACT_DECLARATION__PARAMS:
+				return getParams();
+			case DeclarationPackage.ABSTRACT_DECLARATION__IS_PRIVATE:
+				return isIsPrivate() ? Boolean.TRUE : Boolean.FALSE;
+			case DeclarationPackage.ABSTRACT_DECLARATION__GUARD:
+				return getGuard();
+		}
+		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 DeclarationPackage.ABSTRACT_DECLARATION__OWNER:
+				setOwner((File)newValue);
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__PARAMS:
+				getParams().clear();
+				getParams().addAll((Collection<? extends DeclaredParameter>)newValue);
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__IS_PRIVATE:
+				setIsPrivate(((Boolean)newValue).booleanValue());
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__GUARD:
+				setGuard((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_DECLARATION__OWNER:
+				setOwner((File)null);
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__PARAMS:
+				getParams().clear();
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__IS_PRIVATE:
+				setIsPrivate(IS_PRIVATE_EDEFAULT);
+				return;
+			case DeclarationPackage.ABSTRACT_DECLARATION__GUARD:
+				setGuard((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_DECLARATION__OWNER:
+				return owner != null;
+			case DeclarationPackage.ABSTRACT_DECLARATION__PARAMS:
+				return params != null && !params.isEmpty();
+			case DeclarationPackage.ABSTRACT_DECLARATION__IS_PRIVATE:
+				return isPrivate != IS_PRIVATE_EDEFAULT;
+			case DeclarationPackage.ABSTRACT_DECLARATION__GUARD:
+				return guard != 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(" (isPrivate: ");
+		result.append(isPrivate);
+		result.append(')');
+		return result.toString();
+	}
+
+} //AbstractDeclarationImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractNamedDeclarationImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractNamedDeclarationImpl.java
new file mode 100644
index 00000000..5b159aa2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/AbstractNamedDeclarationImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractNamedDeclarationImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.declaration.AbstractNamedDeclaration;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Named Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.AbstractNamedDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractNamedDeclarationImpl extends AbstractDeclarationImpl implements AbstractNamedDeclaration {
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractNamedDeclarationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.ABSTRACT_NAMED_DECLARATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetName(Identifier newName, NotificationChain msgs) {
+		Identifier oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME, oldName, newName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(Identifier newName) {
+		if (newName != name) {
+			NotificationChain msgs = null;
+			if (name != null)
+				msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME, null, msgs);
+			if (newName != null)
+				msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME, null, msgs);
+			msgs = basicSetName(newName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME, newName, newName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME:
+				return basicSetName(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 DeclarationPackage.ABSTRACT_NAMED_DECLARATION__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 DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME:
+				setName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME:
+				setName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.ABSTRACT_NAMED_DECLARATION__NAME:
+				return name != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //AbstractNamedDeclarationImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CheckImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CheckImpl.java
new file mode 100644
index 00000000..5181c2d8
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CheckImpl.java
@@ -0,0 +1,368 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CheckImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.declaration.Check;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Check</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.CheckImpl#isErrorSeverity <em>Error Severity</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.CheckImpl#getMsg <em>Msg</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.CheckImpl#getConstraint <em>Constraint</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.CheckImpl#getFeature <em>Feature</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CheckImpl extends AbstractDeclarationImpl implements Check {
+	/**
+	 * The default value of the '{@link #isErrorSeverity() <em>Error Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isErrorSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ERROR_SEVERITY_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isErrorSeverity() <em>Error Severity</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isErrorSeverity()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean errorSeverity = ERROR_SEVERITY_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getMsg() <em>Msg</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMsg()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression msg;
+
+	/**
+	 * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConstraint()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression constraint;
+
+	/**
+	 * 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;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CheckImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.CHECK;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isErrorSeverity() {
+		return errorSeverity;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setErrorSeverity(boolean newErrorSeverity) {
+		boolean oldErrorSeverity = errorSeverity;
+		errorSeverity = newErrorSeverity;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.CHECK__ERROR_SEVERITY, oldErrorSeverity, errorSeverity));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getMsg() {
+		return msg;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetMsg(AbstractExpression newMsg, NotificationChain msgs) {
+		AbstractExpression oldMsg = msg;
+		msg = newMsg;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.CHECK__MSG, oldMsg, newMsg);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMsg(AbstractExpression newMsg) {
+		if (newMsg != msg) {
+			NotificationChain msgs = null;
+			if (msg != null)
+				msgs = ((InternalEObject)msg).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.CHECK__MSG, null, msgs);
+			if (newMsg != null)
+				msgs = ((InternalEObject)newMsg).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.CHECK__MSG, null, msgs);
+			msgs = basicSetMsg(newMsg, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.CHECK__MSG, newMsg, newMsg));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getConstraint() {
+		return constraint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetConstraint(AbstractExpression newConstraint, NotificationChain msgs) {
+		AbstractExpression oldConstraint = constraint;
+		constraint = newConstraint;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.CHECK__CONSTRAINT, oldConstraint, newConstraint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConstraint(AbstractExpression newConstraint) {
+		if (newConstraint != constraint) {
+			NotificationChain msgs = null;
+			if (constraint != null)
+				msgs = ((InternalEObject)constraint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.CHECK__CONSTRAINT, null, msgs);
+			if (newConstraint != null)
+				msgs = ((InternalEObject)newConstraint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.CHECK__CONSTRAINT, null, msgs);
+			msgs = basicSetConstraint(newConstraint, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.CHECK__CONSTRAINT, newConstraint, newConstraint));
+	}
+
+	/**
+	 * <!-- 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, DeclarationPackage.CHECK__FEATURE, oldFeature, feature));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.CHECK__MSG:
+				return basicSetMsg(null, msgs);
+			case DeclarationPackage.CHECK__CONSTRAINT:
+				return basicSetConstraint(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 DeclarationPackage.CHECK__ERROR_SEVERITY:
+				return isErrorSeverity() ? Boolean.TRUE : Boolean.FALSE;
+			case DeclarationPackage.CHECK__MSG:
+				return getMsg();
+			case DeclarationPackage.CHECK__CONSTRAINT:
+				return getConstraint();
+			case DeclarationPackage.CHECK__FEATURE:
+				return getFeature();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case DeclarationPackage.CHECK__ERROR_SEVERITY:
+				setErrorSeverity(((Boolean)newValue).booleanValue());
+				return;
+			case DeclarationPackage.CHECK__MSG:
+				setMsg((AbstractExpression)newValue);
+				return;
+			case DeclarationPackage.CHECK__CONSTRAINT:
+				setConstraint((AbstractExpression)newValue);
+				return;
+			case DeclarationPackage.CHECK__FEATURE:
+				setFeature((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.CHECK__ERROR_SEVERITY:
+				setErrorSeverity(ERROR_SEVERITY_EDEFAULT);
+				return;
+			case DeclarationPackage.CHECK__MSG:
+				setMsg((AbstractExpression)null);
+				return;
+			case DeclarationPackage.CHECK__CONSTRAINT:
+				setConstraint((AbstractExpression)null);
+				return;
+			case DeclarationPackage.CHECK__FEATURE:
+				setFeature(FEATURE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.CHECK__ERROR_SEVERITY:
+				return errorSeverity != ERROR_SEVERITY_EDEFAULT;
+			case DeclarationPackage.CHECK__MSG:
+				return msg != null;
+			case DeclarationPackage.CHECK__CONSTRAINT:
+				return constraint != null;
+			case DeclarationPackage.CHECK__FEATURE:
+				return FEATURE_EDEFAULT == null ? feature != null : !FEATURE_EDEFAULT.equals(feature);
+		}
+		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(" (errorSeverity: ");
+		result.append(errorSeverity);
+		result.append(", feature: ");
+		result.append(feature);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CheckImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CreateExtensionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CreateExtensionImpl.java
new file mode 100644
index 00000000..74b94897
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/CreateExtensionImpl.java
@@ -0,0 +1,161 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CreateExtensionImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.DeclaredParameter;
+
+import org.eclipse.xpand3.declaration.CreateExtension;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Create Extension</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.CreateExtensionImpl#getToBeCreated <em>To Be Created</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CreateExtensionImpl extends ExtensionImpl implements CreateExtension {
+	/**
+	 * The cached value of the '{@link #getToBeCreated() <em>To Be Created</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getToBeCreated()
+	 * @generated
+	 * @ordered
+	 */
+	protected DeclaredParameter toBeCreated;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CreateExtensionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.CREATE_EXTENSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclaredParameter getToBeCreated() {
+		if (toBeCreated != null && toBeCreated.eIsProxy()) {
+			InternalEObject oldToBeCreated = (InternalEObject)toBeCreated;
+			toBeCreated = (DeclaredParameter)eResolveProxy(oldToBeCreated);
+			if (toBeCreated != oldToBeCreated) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED, oldToBeCreated, toBeCreated));
+			}
+		}
+		return toBeCreated;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclaredParameter basicGetToBeCreated() {
+		return toBeCreated;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setToBeCreated(DeclaredParameter newToBeCreated) {
+		DeclaredParameter oldToBeCreated = toBeCreated;
+		toBeCreated = newToBeCreated;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED, oldToBeCreated, toBeCreated));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED:
+				if (resolve) return getToBeCreated();
+				return basicGetToBeCreated();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED:
+				setToBeCreated((DeclaredParameter)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED:
+				setToBeCreated((DeclaredParameter)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.CREATE_EXTENSION__TO_BE_CREATED:
+				return toBeCreated != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CreateExtensionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java
new file mode 100644
index 00000000..13bc6199
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java
@@ -0,0 +1,165 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationFactoryImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.declaration.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DeclarationFactoryImpl extends EFactoryImpl implements DeclarationFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static DeclarationFactory init() {
+		try {
+			DeclarationFactory theDeclarationFactory = (DeclarationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/declararation"); 
+			if (theDeclarationFactory != null) {
+				return theDeclarationFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new DeclarationFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclarationFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case DeclarationPackage.DEFINITION: return createDefinition();
+			case DeclarationPackage.EXTENSION: return createExtension();
+			case DeclarationPackage.EXTENSION_ASPECT: return createExtensionAspect();
+			case DeclarationPackage.DEFINITION_ASPECT: return createDefinitionAspect();
+			case DeclarationPackage.CHECK: return createCheck();
+			case DeclarationPackage.CREATE_EXTENSION: return createCreateExtension();
+			case DeclarationPackage.JAVA_EXTENSION: return createJavaExtension();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Definition createDefinition() {
+		DefinitionImpl definition = new DefinitionImpl();
+		return definition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Extension createExtension() {
+		ExtensionImpl extension = new ExtensionImpl();
+		return extension;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExtensionAspect createExtensionAspect() {
+		ExtensionAspectImpl extensionAspect = new ExtensionAspectImpl();
+		return extensionAspect;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DefinitionAspect createDefinitionAspect() {
+		DefinitionAspectImpl definitionAspect = new DefinitionAspectImpl();
+		return definitionAspect;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Check createCheck() {
+		CheckImpl check = new CheckImpl();
+		return check;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CreateExtension createCreateExtension() {
+		CreateExtensionImpl createExtension = new CreateExtensionImpl();
+		return createExtension;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public JavaExtension createJavaExtension() {
+		JavaExtensionImpl javaExtension = new JavaExtensionImpl();
+		return javaExtension;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclarationPackage getDeclarationPackage() {
+		return (DeclarationPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static DeclarationPackage getPackage() {
+		return DeclarationPackage.eINSTANCE;
+	}
+
+} //DeclarationFactoryImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java
new file mode 100644
index 00000000..e29da10c
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java
@@ -0,0 +1,633 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationPackageImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.Xpand3Package;
+
+import org.eclipse.xpand3.declaration.AbstractAspect;
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+import org.eclipse.xpand3.declaration.AbstractNamedDeclaration;
+import org.eclipse.xpand3.declaration.Check;
+import org.eclipse.xpand3.declaration.CreateExtension;
+import org.eclipse.xpand3.declaration.DeclarationFactory;
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.Definition;
+import org.eclipse.xpand3.declaration.DefinitionAspect;
+import org.eclipse.xpand3.declaration.Extension;
+import org.eclipse.xpand3.declaration.ExtensionAspect;
+import org.eclipse.xpand3.declaration.JavaExtension;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+import org.eclipse.xpand3.expression.impl.ExpressionPackageImpl;
+
+import org.eclipse.xpand3.impl.Xpand3PackageImpl;
+
+import org.eclipse.xpand3.statement.StatementPackage;
+
+import org.eclipse.xpand3.statement.impl.StatementPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DeclarationPackageImpl extends EPackageImpl implements DeclarationPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractDeclarationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractNamedDeclarationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass definitionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass extensionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractAspectEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass extensionAspectEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass definitionAspectEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass checkEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass createExtensionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass javaExtensionEClass = 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.xpand3.declaration.DeclarationPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private DeclarationPackageImpl() {
+		super(eNS_URI, DeclarationFactory.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 DeclarationPackage init() {
+		if (isInited) return (DeclarationPackage)EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI);
+
+		// Obtain or create and register package
+		DeclarationPackageImpl theDeclarationPackage = (DeclarationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DeclarationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DeclarationPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		Xpand3PackageImpl theXpand3Package = (Xpand3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) instanceof Xpand3PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) : Xpand3Package.eINSTANCE);
+		ExpressionPackageImpl theExpressionPackage = (ExpressionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) instanceof ExpressionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) : ExpressionPackage.eINSTANCE);
+		StatementPackageImpl theStatementPackage = (StatementPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) instanceof StatementPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) : StatementPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theDeclarationPackage.createPackageContents();
+		theXpand3Package.createPackageContents();
+		theExpressionPackage.createPackageContents();
+		theStatementPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theDeclarationPackage.initializePackageContents();
+		theXpand3Package.initializePackageContents();
+		theExpressionPackage.initializePackageContents();
+		theStatementPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theDeclarationPackage.freeze();
+
+		return theDeclarationPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractDeclaration() {
+		return abstractDeclarationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractDeclaration_Owner() {
+		return (EReference)abstractDeclarationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractDeclaration_Params() {
+		return (EReference)abstractDeclarationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAbstractDeclaration_IsPrivate() {
+		return (EAttribute)abstractDeclarationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractDeclaration_Guard() {
+		return (EReference)abstractDeclarationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractNamedDeclaration() {
+		return abstractNamedDeclarationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractNamedDeclaration_Name() {
+		return (EReference)abstractNamedDeclarationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDefinition() {
+		return definitionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDefinition_Body() {
+		return (EReference)definitionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getExtension() {
+		return extensionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getExtension_Cached() {
+		return (EAttribute)extensionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExtension_Body() {
+		return (EReference)extensionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExtension_ReturnType() {
+		return (EReference)extensionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractAspect() {
+		return abstractAspectEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractAspect_Pointcut() {
+		return (EReference)abstractAspectEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAbstractAspect_Wildparams() {
+		return (EAttribute)abstractAspectEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getExtensionAspect() {
+		return extensionAspectEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExtensionAspect_Expression() {
+		return (EReference)extensionAspectEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDefinitionAspect() {
+		return definitionAspectEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDefinitionAspect_Body() {
+		return (EReference)definitionAspectEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCheck() {
+		return checkEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCheck_ErrorSeverity() {
+		return (EAttribute)checkEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCheck_Msg() {
+		return (EReference)checkEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCheck_Constraint() {
+		return (EReference)checkEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCheck_Feature() {
+		return (EAttribute)checkEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCreateExtension() {
+		return createExtensionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCreateExtension_ToBeCreated() {
+		return (EReference)createExtensionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getJavaExtension() {
+		return javaExtensionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getJavaExtension_JavaType() {
+		return (EReference)javaExtensionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getJavaExtension_JavaMethod() {
+		return (EReference)javaExtensionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getJavaExtension_JavaParamTypes() {
+		return (EReference)javaExtensionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclarationFactory getDeclarationFactory() {
+		return (DeclarationFactory)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
+		abstractDeclarationEClass = createEClass(ABSTRACT_DECLARATION);
+		createEReference(abstractDeclarationEClass, ABSTRACT_DECLARATION__OWNER);
+		createEReference(abstractDeclarationEClass, ABSTRACT_DECLARATION__PARAMS);
+		createEAttribute(abstractDeclarationEClass, ABSTRACT_DECLARATION__IS_PRIVATE);
+		createEReference(abstractDeclarationEClass, ABSTRACT_DECLARATION__GUARD);
+
+		abstractNamedDeclarationEClass = createEClass(ABSTRACT_NAMED_DECLARATION);
+		createEReference(abstractNamedDeclarationEClass, ABSTRACT_NAMED_DECLARATION__NAME);
+
+		definitionEClass = createEClass(DEFINITION);
+		createEReference(definitionEClass, DEFINITION__BODY);
+
+		extensionEClass = createEClass(EXTENSION);
+		createEAttribute(extensionEClass, EXTENSION__CACHED);
+		createEReference(extensionEClass, EXTENSION__BODY);
+		createEReference(extensionEClass, EXTENSION__RETURN_TYPE);
+
+		abstractAspectEClass = createEClass(ABSTRACT_ASPECT);
+		createEReference(abstractAspectEClass, ABSTRACT_ASPECT__POINTCUT);
+		createEAttribute(abstractAspectEClass, ABSTRACT_ASPECT__WILDPARAMS);
+
+		extensionAspectEClass = createEClass(EXTENSION_ASPECT);
+		createEReference(extensionAspectEClass, EXTENSION_ASPECT__EXPRESSION);
+
+		definitionAspectEClass = createEClass(DEFINITION_ASPECT);
+		createEReference(definitionAspectEClass, DEFINITION_ASPECT__BODY);
+
+		checkEClass = createEClass(CHECK);
+		createEAttribute(checkEClass, CHECK__ERROR_SEVERITY);
+		createEReference(checkEClass, CHECK__MSG);
+		createEReference(checkEClass, CHECK__CONSTRAINT);
+		createEAttribute(checkEClass, CHECK__FEATURE);
+
+		createExtensionEClass = createEClass(CREATE_EXTENSION);
+		createEReference(createExtensionEClass, CREATE_EXTENSION__TO_BE_CREATED);
+
+		javaExtensionEClass = createEClass(JAVA_EXTENSION);
+		createEReference(javaExtensionEClass, JAVA_EXTENSION__JAVA_TYPE);
+		createEReference(javaExtensionEClass, JAVA_EXTENSION__JAVA_METHOD);
+		createEReference(javaExtensionEClass, JAVA_EXTENSION__JAVA_PARAM_TYPES);
+	}
+
+	/**
+	 * <!-- 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);
+
+		// Obtain other dependent packages
+		Xpand3Package theXpand3Package = (Xpand3Package)EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI);
+		ExpressionPackage theExpressionPackage = (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
+		StatementPackage theStatementPackage = (StatementPackage)EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractDeclarationEClass.getESuperTypes().add(theXpand3Package.getSyntaxElement());
+		abstractNamedDeclarationEClass.getESuperTypes().add(this.getAbstractDeclaration());
+		definitionEClass.getESuperTypes().add(this.getAbstractNamedDeclaration());
+		extensionEClass.getESuperTypes().add(this.getAbstractNamedDeclaration());
+		abstractAspectEClass.getESuperTypes().add(this.getAbstractDeclaration());
+		extensionAspectEClass.getESuperTypes().add(this.getAbstractAspect());
+		definitionAspectEClass.getESuperTypes().add(this.getAbstractAspect());
+		checkEClass.getESuperTypes().add(this.getAbstractDeclaration());
+		createExtensionEClass.getESuperTypes().add(this.getExtension());
+		javaExtensionEClass.getESuperTypes().add(this.getAbstractNamedDeclaration());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(abstractDeclarationEClass, AbstractDeclaration.class, "AbstractDeclaration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractDeclaration_Owner(), theXpand3Package.getFile(), null, "owner", null, 1, 1, AbstractDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAbstractDeclaration_Params(), theXpand3Package.getDeclaredParameter(), null, "params", null, 0, -1, AbstractDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAbstractDeclaration_IsPrivate(), ecorePackage.getEBoolean(), "isPrivate", null, 0, 1, AbstractDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAbstractDeclaration_Guard(), theExpressionPackage.getAbstractExpression(), null, "guard", null, 0, 1, AbstractDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(abstractNamedDeclarationEClass, AbstractNamedDeclaration.class, "AbstractNamedDeclaration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractNamedDeclaration_Name(), theXpand3Package.getIdentifier(), null, "name", null, 0, 1, AbstractNamedDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDefinition_Body(), theStatementPackage.getAbstractStatement(), null, "body", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(extensionEClass, Extension.class, "Extension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getExtension_Cached(), ecorePackage.getEBoolean(), "cached", null, 0, 1, Extension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtension_Body(), theExpressionPackage.getAbstractExpression(), null, "body", null, 1, 1, Extension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtension_ReturnType(), theXpand3Package.getIdentifier(), null, "returnType", null, 0, 1, Extension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(abstractAspectEClass, AbstractAspect.class, "AbstractAspect", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractAspect_Pointcut(), theXpand3Package.getIdentifier(), null, "pointcut", null, 0, 1, AbstractAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAbstractAspect_Wildparams(), ecorePackage.getEBoolean(), "wildparams", null, 0, 1, AbstractAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(extensionAspectEClass, ExtensionAspect.class, "ExtensionAspect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getExtensionAspect_Expression(), theExpressionPackage.getAbstractExpression(), null, "expression", null, 0, 1, ExtensionAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(definitionAspectEClass, DefinitionAspect.class, "DefinitionAspect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDefinitionAspect_Body(), theStatementPackage.getAbstractStatement(), null, "body", null, 0, -1, DefinitionAspect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(checkEClass, Check.class, "Check", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCheck_ErrorSeverity(), ecorePackage.getEBoolean(), "errorSeverity", null, 0, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCheck_Msg(), theExpressionPackage.getAbstractExpression(), null, "msg", null, 0, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCheck_Constraint(), theExpressionPackage.getAbstractExpression(), null, "constraint", null, 0, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCheck_Feature(), ecorePackage.getEString(), "feature", null, 0, 1, Check.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(createExtensionEClass, CreateExtension.class, "CreateExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCreateExtension_ToBeCreated(), theXpand3Package.getDeclaredParameter(), null, "toBeCreated", null, 0, 1, CreateExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(javaExtensionEClass, JavaExtension.class, "JavaExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getJavaExtension_JavaType(), theXpand3Package.getIdentifier(), null, "javaType", null, 0, 1, JavaExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getJavaExtension_JavaMethod(), theXpand3Package.getIdentifier(), null, "javaMethod", null, 0, 1, JavaExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getJavaExtension_JavaParamTypes(), theXpand3Package.getIdentifier(), null, "javaParamTypes", null, 0, -1, JavaExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+	}
+
+} //DeclarationPackageImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionAspectImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionAspectImpl.java
new file mode 100644
index 00000000..eaa811d2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionAspectImpl.java
@@ -0,0 +1,155 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DefinitionAspectImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.DefinitionAspect;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Definition Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.DefinitionAspectImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DefinitionAspectImpl extends AbstractAspectImpl implements DefinitionAspect {
+	/**
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractStatement> body;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DefinitionAspectImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.DEFINITION_ASPECT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractStatement> getBody() {
+		if (body == null) {
+			body = new EObjectContainmentEList<AbstractStatement>(AbstractStatement.class, this, DeclarationPackage.DEFINITION_ASPECT__BODY);
+		}
+		return body;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION_ASPECT__BODY:
+				return ((InternalEList<?>)getBody()).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 DeclarationPackage.DEFINITION_ASPECT__BODY:
+				return getBody();
+		}
+		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 DeclarationPackage.DEFINITION_ASPECT__BODY:
+				getBody().clear();
+				getBody().addAll((Collection<? extends AbstractStatement>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION_ASPECT__BODY:
+				getBody().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION_ASPECT__BODY:
+				return body != null && !body.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //DefinitionAspectImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionImpl.java
new file mode 100644
index 00000000..a427d41b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DefinitionImpl.java
@@ -0,0 +1,155 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DefinitionImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.Definition;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.DefinitionImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DefinitionImpl extends AbstractNamedDeclarationImpl implements Definition {
+	/**
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractStatement> body;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DefinitionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.DEFINITION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractStatement> getBody() {
+		if (body == null) {
+			body = new EObjectContainmentEList<AbstractStatement>(AbstractStatement.class, this, DeclarationPackage.DEFINITION__BODY);
+		}
+		return body;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION__BODY:
+				return ((InternalEList<?>)getBody()).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 DeclarationPackage.DEFINITION__BODY:
+				return getBody();
+		}
+		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 DeclarationPackage.DEFINITION__BODY:
+				getBody().clear();
+				getBody().addAll((Collection<? extends AbstractStatement>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION__BODY:
+				getBody().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.DEFINITION__BODY:
+				return body != null && !body.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //DefinitionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionAspectImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionAspectImpl.java
new file mode 100644
index 00000000..d141ea83
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionAspectImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExtensionAspectImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.ExtensionAspect;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extension Aspect</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.ExtensionAspectImpl#getExpression <em>Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExtensionAspectImpl extends AbstractAspectImpl implements ExtensionAspect {
+	/**
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpression()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression expression;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExtensionAspectImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.EXTENSION_ASPECT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getExpression() {
+		return expression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetExpression(AbstractExpression newExpression, NotificationChain msgs) {
+		AbstractExpression oldExpression = expression;
+		expression = newExpression;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION_ASPECT__EXPRESSION, oldExpression, newExpression);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExpression(AbstractExpression newExpression) {
+		if (newExpression != expression) {
+			NotificationChain msgs = null;
+			if (expression != null)
+				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION_ASPECT__EXPRESSION, null, msgs);
+			if (newExpression != null)
+				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION_ASPECT__EXPRESSION, null, msgs);
+			msgs = basicSetExpression(newExpression, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION_ASPECT__EXPRESSION, newExpression, newExpression));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION_ASPECT__EXPRESSION:
+				return basicSetExpression(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 DeclarationPackage.EXTENSION_ASPECT__EXPRESSION:
+				return getExpression();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION_ASPECT__EXPRESSION:
+				setExpression((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION_ASPECT__EXPRESSION:
+				setExpression((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION_ASPECT__EXPRESSION:
+				return expression != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ExtensionAspectImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java
new file mode 100644
index 00000000..5d8c0065
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java
@@ -0,0 +1,316 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExtensionImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.Extension;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extension</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.ExtensionImpl#isCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.ExtensionImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.ExtensionImpl#getReturnType <em>Return Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExtensionImpl extends AbstractNamedDeclarationImpl implements Extension {
+	/**
+	 * The default value of the '{@link #isCached() <em>Cached</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isCached()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean CACHED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isCached() <em>Cached</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isCached()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean cached = CACHED_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression body;
+
+	/**
+	 * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getReturnType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier returnType;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExtensionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.EXTENSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isCached() {
+		return cached;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCached(boolean newCached) {
+		boolean oldCached = cached;
+		cached = newCached;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION__CACHED, oldCached, cached));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getBody() {
+		return body;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetBody(AbstractExpression newBody, NotificationChain msgs) {
+		AbstractExpression oldBody = body;
+		body = newBody;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION__BODY, oldBody, newBody);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBody(AbstractExpression newBody) {
+		if (newBody != body) {
+			NotificationChain msgs = null;
+			if (body != null)
+				msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION__BODY, null, msgs);
+			if (newBody != null)
+				msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION__BODY, null, msgs);
+			msgs = basicSetBody(newBody, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION__BODY, newBody, newBody));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getReturnType() {
+		return returnType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetReturnType(Identifier newReturnType, NotificationChain msgs) {
+		Identifier oldReturnType = returnType;
+		returnType = newReturnType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION__RETURN_TYPE, oldReturnType, newReturnType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setReturnType(Identifier newReturnType) {
+		if (newReturnType != returnType) {
+			NotificationChain msgs = null;
+			if (returnType != null)
+				msgs = ((InternalEObject)returnType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION__RETURN_TYPE, null, msgs);
+			if (newReturnType != null)
+				msgs = ((InternalEObject)newReturnType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.EXTENSION__RETURN_TYPE, null, msgs);
+			msgs = basicSetReturnType(newReturnType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.EXTENSION__RETURN_TYPE, newReturnType, newReturnType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION__BODY:
+				return basicSetBody(null, msgs);
+			case DeclarationPackage.EXTENSION__RETURN_TYPE:
+				return basicSetReturnType(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 DeclarationPackage.EXTENSION__CACHED:
+				return isCached() ? Boolean.TRUE : Boolean.FALSE;
+			case DeclarationPackage.EXTENSION__BODY:
+				return getBody();
+			case DeclarationPackage.EXTENSION__RETURN_TYPE:
+				return getReturnType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION__CACHED:
+				setCached(((Boolean)newValue).booleanValue());
+				return;
+			case DeclarationPackage.EXTENSION__BODY:
+				setBody((AbstractExpression)newValue);
+				return;
+			case DeclarationPackage.EXTENSION__RETURN_TYPE:
+				setReturnType((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION__CACHED:
+				setCached(CACHED_EDEFAULT);
+				return;
+			case DeclarationPackage.EXTENSION__BODY:
+				setBody((AbstractExpression)null);
+				return;
+			case DeclarationPackage.EXTENSION__RETURN_TYPE:
+				setReturnType((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.EXTENSION__CACHED:
+				return cached != CACHED_EDEFAULT;
+			case DeclarationPackage.EXTENSION__BODY:
+				return body != null;
+			case DeclarationPackage.EXTENSION__RETURN_TYPE:
+				return returnType != 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(" (cached: ");
+		result.append(cached);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ExtensionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/JavaExtensionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/JavaExtensionImpl.java
new file mode 100644
index 00000000..54fe76ea
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/JavaExtensionImpl.java
@@ -0,0 +1,290 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaExtensionImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+import org.eclipse.xpand3.declaration.JavaExtension;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Java Extension</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.JavaExtensionImpl#getJavaType <em>Java Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.JavaExtensionImpl#getJavaMethod <em>Java Method</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.declaration.impl.JavaExtensionImpl#getJavaParamTypes <em>Java Param Types</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class JavaExtensionImpl extends AbstractNamedDeclarationImpl implements JavaExtension {
+	/**
+	 * The cached value of the '{@link #getJavaType() <em>Java Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJavaType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier javaType;
+
+	/**
+	 * The cached value of the '{@link #getJavaMethod() <em>Java Method</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJavaMethod()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier javaMethod;
+
+	/**
+	 * The cached value of the '{@link #getJavaParamTypes() <em>Java Param Types</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJavaParamTypes()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Identifier> javaParamTypes;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected JavaExtensionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return DeclarationPackage.Literals.JAVA_EXTENSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getJavaType() {
+		return javaType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetJavaType(Identifier newJavaType, NotificationChain msgs) {
+		Identifier oldJavaType = javaType;
+		javaType = newJavaType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE, oldJavaType, newJavaType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJavaType(Identifier newJavaType) {
+		if (newJavaType != javaType) {
+			NotificationChain msgs = null;
+			if (javaType != null)
+				msgs = ((InternalEObject)javaType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE, null, msgs);
+			if (newJavaType != null)
+				msgs = ((InternalEObject)newJavaType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE, null, msgs);
+			msgs = basicSetJavaType(newJavaType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE, newJavaType, newJavaType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getJavaMethod() {
+		return javaMethod;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetJavaMethod(Identifier newJavaMethod, NotificationChain msgs) {
+		Identifier oldJavaMethod = javaMethod;
+		javaMethod = newJavaMethod;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD, oldJavaMethod, newJavaMethod);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJavaMethod(Identifier newJavaMethod) {
+		if (newJavaMethod != javaMethod) {
+			NotificationChain msgs = null;
+			if (javaMethod != null)
+				msgs = ((InternalEObject)javaMethod).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD, null, msgs);
+			if (newJavaMethod != null)
+				msgs = ((InternalEObject)newJavaMethod).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD, null, msgs);
+			msgs = basicSetJavaMethod(newJavaMethod, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD, newJavaMethod, newJavaMethod));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Identifier> getJavaParamTypes() {
+		if (javaParamTypes == null) {
+			javaParamTypes = new EObjectContainmentEList<Identifier>(Identifier.class, this, DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES);
+		}
+		return javaParamTypes;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE:
+				return basicSetJavaType(null, msgs);
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD:
+				return basicSetJavaMethod(null, msgs);
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES:
+				return ((InternalEList<?>)getJavaParamTypes()).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 DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE:
+				return getJavaType();
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD:
+				return getJavaMethod();
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES:
+				return getJavaParamTypes();
+		}
+		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 DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE:
+				setJavaType((Identifier)newValue);
+				return;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD:
+				setJavaMethod((Identifier)newValue);
+				return;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES:
+				getJavaParamTypes().clear();
+				getJavaParamTypes().addAll((Collection<? extends Identifier>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE:
+				setJavaType((Identifier)null);
+				return;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD:
+				setJavaMethod((Identifier)null);
+				return;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES:
+				getJavaParamTypes().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_TYPE:
+				return javaType != null;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_METHOD:
+				return javaMethod != null;
+			case DeclarationPackage.JAVA_EXTENSION__JAVA_PARAM_TYPES:
+				return javaParamTypes != null && !javaParamTypes.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //JavaExtensionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationAdapterFactory.java
new file mode 100644
index 00000000..30d35071
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationAdapterFactory.java
@@ -0,0 +1,306 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationAdapterFactory.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.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.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.declaration.*;
+
+/**
+ * <!-- 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.xpand3.declaration.DeclarationPackage
+ * @generated
+ */
+public class DeclarationAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static DeclarationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclarationAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = DeclarationPackage.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 the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DeclarationSwitch<Adapter> modelSwitch =
+		new DeclarationSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractDeclaration(AbstractDeclaration object) {
+				return createAbstractDeclarationAdapter();
+			}
+			@Override
+			public Adapter caseAbstractNamedDeclaration(AbstractNamedDeclaration object) {
+				return createAbstractNamedDeclarationAdapter();
+			}
+			@Override
+			public Adapter caseDefinition(Definition object) {
+				return createDefinitionAdapter();
+			}
+			@Override
+			public Adapter caseExtension(Extension object) {
+				return createExtensionAdapter();
+			}
+			@Override
+			public Adapter caseAbstractAspect(AbstractAspect object) {
+				return createAbstractAspectAdapter();
+			}
+			@Override
+			public Adapter caseExtensionAspect(ExtensionAspect object) {
+				return createExtensionAspectAdapter();
+			}
+			@Override
+			public Adapter caseDefinitionAspect(DefinitionAspect object) {
+				return createDefinitionAspectAdapter();
+			}
+			@Override
+			public Adapter caseCheck(Check object) {
+				return createCheckAdapter();
+			}
+			@Override
+			public Adapter caseCreateExtension(CreateExtension object) {
+				return createCreateExtensionAdapter();
+			}
+			@Override
+			public Adapter caseJavaExtension(JavaExtension object) {
+				return createJavaExtensionAdapter();
+			}
+			@Override
+			public Adapter caseSyntaxElement(SyntaxElement object) {
+				return createSyntaxElementAdapter();
+			}
+			@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.xpand3.declaration.AbstractDeclaration <em>Abstract Declaration</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.xpand3.declaration.AbstractDeclaration
+	 * @generated
+	 */
+	public Adapter createAbstractDeclarationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration <em>Abstract Named Declaration</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.xpand3.declaration.AbstractNamedDeclaration
+	 * @generated
+	 */
+	public Adapter createAbstractNamedDeclarationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.Definition <em>Definition</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.xpand3.declaration.Definition
+	 * @generated
+	 */
+	public Adapter createDefinitionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.Extension <em>Extension</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.xpand3.declaration.Extension
+	 * @generated
+	 */
+	public Adapter createExtensionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.AbstractAspect <em>Abstract Aspect</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.xpand3.declaration.AbstractAspect
+	 * @generated
+	 */
+	public Adapter createAbstractAspectAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.ExtensionAspect <em>Extension Aspect</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.xpand3.declaration.ExtensionAspect
+	 * @generated
+	 */
+	public Adapter createExtensionAspectAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.DefinitionAspect <em>Definition Aspect</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.xpand3.declaration.DefinitionAspect
+	 * @generated
+	 */
+	public Adapter createDefinitionAspectAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.Check <em>Check</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.xpand3.declaration.Check
+	 * @generated
+	 */
+	public Adapter createCheckAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.CreateExtension <em>Create Extension</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.xpand3.declaration.CreateExtension
+	 * @generated
+	 */
+	public Adapter createCreateExtensionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.declaration.JavaExtension <em>Java Extension</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.xpand3.declaration.JavaExtension
+	 * @generated
+	 */
+	public Adapter createJavaExtensionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SyntaxElement <em>Syntax Element</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.xpand3.SyntaxElement
+	 * @generated
+	 */
+	public Adapter createSyntaxElementAdapter() {
+		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;
+	}
+
+} //DeclarationAdapterFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java
new file mode 100644
index 00000000..c0510238
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/util/DeclarationSwitch.java
@@ -0,0 +1,362 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclarationSwitch.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.declaration.*;
+
+/**
+ * <!-- 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.xpand3.declaration.DeclarationPackage
+ * @generated
+ */
+public class DeclarationSwitch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static DeclarationPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclarationSwitch() {
+		if (modelPackage == null) {
+			modelPackage = DeclarationPackage.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 DeclarationPackage.ABSTRACT_DECLARATION: {
+				AbstractDeclaration abstractDeclaration = (AbstractDeclaration)theEObject;
+				T result = caseAbstractDeclaration(abstractDeclaration);
+				if (result == null) result = caseSyntaxElement(abstractDeclaration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.ABSTRACT_NAMED_DECLARATION: {
+				AbstractNamedDeclaration abstractNamedDeclaration = (AbstractNamedDeclaration)theEObject;
+				T result = caseAbstractNamedDeclaration(abstractNamedDeclaration);
+				if (result == null) result = caseAbstractDeclaration(abstractNamedDeclaration);
+				if (result == null) result = caseSyntaxElement(abstractNamedDeclaration);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.DEFINITION: {
+				Definition definition = (Definition)theEObject;
+				T result = caseDefinition(definition);
+				if (result == null) result = caseAbstractNamedDeclaration(definition);
+				if (result == null) result = caseAbstractDeclaration(definition);
+				if (result == null) result = caseSyntaxElement(definition);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.EXTENSION: {
+				Extension extension = (Extension)theEObject;
+				T result = caseExtension(extension);
+				if (result == null) result = caseAbstractNamedDeclaration(extension);
+				if (result == null) result = caseAbstractDeclaration(extension);
+				if (result == null) result = caseSyntaxElement(extension);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.ABSTRACT_ASPECT: {
+				AbstractAspect abstractAspect = (AbstractAspect)theEObject;
+				T result = caseAbstractAspect(abstractAspect);
+				if (result == null) result = caseAbstractDeclaration(abstractAspect);
+				if (result == null) result = caseSyntaxElement(abstractAspect);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.EXTENSION_ASPECT: {
+				ExtensionAspect extensionAspect = (ExtensionAspect)theEObject;
+				T result = caseExtensionAspect(extensionAspect);
+				if (result == null) result = caseAbstractAspect(extensionAspect);
+				if (result == null) result = caseAbstractDeclaration(extensionAspect);
+				if (result == null) result = caseSyntaxElement(extensionAspect);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.DEFINITION_ASPECT: {
+				DefinitionAspect definitionAspect = (DefinitionAspect)theEObject;
+				T result = caseDefinitionAspect(definitionAspect);
+				if (result == null) result = caseAbstractAspect(definitionAspect);
+				if (result == null) result = caseAbstractDeclaration(definitionAspect);
+				if (result == null) result = caseSyntaxElement(definitionAspect);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.CHECK: {
+				Check check = (Check)theEObject;
+				T result = caseCheck(check);
+				if (result == null) result = caseAbstractDeclaration(check);
+				if (result == null) result = caseSyntaxElement(check);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.CREATE_EXTENSION: {
+				CreateExtension createExtension = (CreateExtension)theEObject;
+				T result = caseCreateExtension(createExtension);
+				if (result == null) result = caseExtension(createExtension);
+				if (result == null) result = caseAbstractNamedDeclaration(createExtension);
+				if (result == null) result = caseAbstractDeclaration(createExtension);
+				if (result == null) result = caseSyntaxElement(createExtension);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DeclarationPackage.JAVA_EXTENSION: {
+				JavaExtension javaExtension = (JavaExtension)theEObject;
+				T result = caseJavaExtension(javaExtension);
+				if (result == null) result = caseAbstractNamedDeclaration(javaExtension);
+				if (result == null) result = caseAbstractDeclaration(javaExtension);
+				if (result == null) result = caseSyntaxElement(javaExtension);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Declaration</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 Declaration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractDeclaration(AbstractDeclaration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Named Declaration</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 Named Declaration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractNamedDeclaration(AbstractNamedDeclaration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Definition</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>Definition</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDefinition(Definition object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Extension</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>Extension</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExtension(Extension object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Aspect</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 Aspect</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractAspect(AbstractAspect object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Extension Aspect</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>Extension Aspect</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExtensionAspect(ExtensionAspect object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Definition Aspect</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>Definition Aspect</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDefinitionAspect(DefinitionAspect object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Check</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>Check</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCheck(Check object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Create Extension</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>Create Extension</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCreateExtension(CreateExtension object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Java Extension</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>Java Extension</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseJavaExtension(JavaExtension object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Syntax Element</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>Syntax Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSyntaxElement(SyntaxElement 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;
+	}
+
+} //DeclarationSwitch
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java
new file mode 100644
index 00000000..61db28a0
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractAspectValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractAspect}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractAspectValidator {
+	boolean validate();
+
+	boolean validatePointcut(Identifier value);
+	boolean validateWildparams(boolean value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java
new file mode 100644
index 00000000..5c7b9cc4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java
@@ -0,0 +1,29 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractDeclarationValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.File;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractDeclaration}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractDeclarationValidator {
+	boolean validate();
+
+	boolean validateOwner(File value);
+	boolean validateParams(EList<DeclaredParameter> value);
+	boolean validateIsPrivate(boolean value);
+	boolean validateGuard(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java
new file mode 100644
index 00000000..223bbed2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractNamedDeclarationValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractNamedDeclarationValidator {
+	boolean validate();
+
+	boolean validateName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java
new file mode 100644
index 00000000..2a42acbb
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CheckValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.Check}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CheckValidator {
+	boolean validate();
+
+	boolean validateErrorSeverity(boolean value);
+	boolean validateMsg(AbstractExpression value);
+	boolean validateConstraint(AbstractExpression value);
+	boolean validateFeature(String value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionValidator.java
new file mode 100644
index 00000000..aafcf3e3
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CreateExtensionValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.DeclaredParameter;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.CreateExtension}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CreateExtensionValidator {
+	boolean validate();
+
+	boolean validateToBeCreated(DeclaredParameter value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java
new file mode 100644
index 00000000..df3455f2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DefinitionAspectValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.DefinitionAspect}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface DefinitionAspectValidator {
+	boolean validate();
+
+	boolean validateBody(EList<AbstractStatement> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java
new file mode 100644
index 00000000..f2ec9812
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DefinitionValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.Definition}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface DefinitionValidator {
+	boolean validate();
+
+	boolean validateBody(EList<AbstractStatement> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java
new file mode 100644
index 00000000..eeab8fce
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExtensionAspectValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.ExtensionAspect}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ExtensionAspectValidator {
+	boolean validate();
+
+	boolean validateExpression(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java
new file mode 100644
index 00000000..65f28cd4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExtensionValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.Extension}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ExtensionValidator {
+	boolean validate();
+
+	boolean validateCached(boolean value);
+	boolean validateBody(AbstractExpression value);
+	boolean validateReturnType(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionValidator.java
new file mode 100644
index 00000000..9c1e81c6
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaExtensionValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.declaration.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.declaration.JavaExtension}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface JavaExtensionValidator {
+	boolean validate();
+
+	boolean validateJavaType(Identifier value);
+	boolean validateJavaMethod(Identifier value);
+	boolean validateJavaParamTypes(EList<Identifier> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/AbstractExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/AbstractExpression.java
new file mode 100644
index 00000000..523b4841
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/AbstractExpression.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getAbstractExpression()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractExpression extends SyntaxElement {
+} // AbstractExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BinaryOperation.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BinaryOperation.java
new file mode 100644
index 00000000..a65fd2e9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BinaryOperation.java
@@ -0,0 +1,108 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BinaryOperation.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Binary Operation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.BinaryOperation#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.BinaryOperation#getRight <em>Right</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.BinaryOperation#getOperator <em>Operator</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getBinaryOperation()
+ * @model
+ * @generated
+ */
+public interface BinaryOperation extends AbstractExpression {
+	/**
+	 * 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(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getBinaryOperation_Left()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getLeft();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.BinaryOperation#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(AbstractExpression 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(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getBinaryOperation_Right()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getRight();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.BinaryOperation#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(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Operator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Operator</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>Operator</em>' containment reference.
+	 * @see #setOperator(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getBinaryOperation_Operator()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getOperator();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.BinaryOperation#getOperator <em>Operator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Operator</em>' containment reference.
+	 * @see #getOperator()
+	 * @generated
+	 */
+	void setOperator(Identifier value);
+
+} // BinaryOperation
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanLiteral.java
new file mode 100644
index 00000000..82459062
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanLiteral.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanLiteral.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getBooleanLiteral()
+ * @model
+ * @generated
+ */
+public interface BooleanLiteral extends Literal {
+} // BooleanLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanOperation.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanOperation.java
new file mode 100644
index 00000000..1b93b036
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/BooleanOperation.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperation.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Boolean Operation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getBooleanOperation()
+ * @model
+ * @generated
+ */
+public interface BooleanOperation extends BinaryOperation {
+} // BooleanOperation
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Case.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Case.java
new file mode 100644
index 00000000..a4e5c557
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Case.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Case.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Case</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.Case#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.Case#getThenPart <em>Then Part</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getCase()
+ * @model
+ * @generated
+ */
+public interface Case extends SyntaxElement {
+	/**
+	 * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Condition</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>Condition</em>' containment reference.
+	 * @see #setCondition(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCase_Condition()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getCondition();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.Case#getCondition <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Condition</em>' containment reference.
+	 * @see #getCondition()
+	 * @generated
+	 */
+	void setCondition(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Then Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Then Part</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>Then Part</em>' containment reference.
+	 * @see #setThenPart(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCase_ThenPart()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getThenPart();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.Case#getThenPart <em>Then Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Then Part</em>' containment reference.
+	 * @see #getThenPart()
+	 * @generated
+	 */
+	void setThenPart(AbstractExpression value);
+
+} // Case
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Cast.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Cast.java
new file mode 100644
index 00000000..8a559e10
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Cast.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Cast.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cast</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.Cast#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.Cast#getTarget <em>Target</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getCast()
+ * @model
+ * @generated
+ */
+public interface Cast extends AbstractExpression {
+	/**
+	 * 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(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCast_Type()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.Cast#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(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target</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>Target</em>' containment reference.
+	 * @see #setTarget(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCast_Target()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getTarget();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.Cast#getTarget <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' containment reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(AbstractExpression value);
+
+} // Cast
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ChainExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ChainExpression.java
new file mode 100644
index 00000000..ad23f047
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ChainExpression.java
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ChainExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Chain Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.ChainExpression#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.ChainExpression#getNext <em>Next</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getChainExpression()
+ * @model
+ * @generated
+ */
+public interface ChainExpression extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>First</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>First</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>First</em>' containment reference.
+	 * @see #setFirst(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getChainExpression_First()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getFirst();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.ChainExpression#getFirst <em>First</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>First</em>' containment reference.
+	 * @see #getFirst()
+	 * @generated
+	 */
+	void setFirst(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Next</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Next</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>Next</em>' containment reference.
+	 * @see #setNext(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getChainExpression_Next()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getNext();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.ChainExpression#getNext <em>Next</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Next</em>' containment reference.
+	 * @see #getNext()
+	 * @generated
+	 */
+	void setNext(AbstractExpression value);
+
+} // ChainExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/CollectionExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/CollectionExpression.java
new file mode 100644
index 00000000..acc7e989
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/CollectionExpression.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CollectionExpression.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Collection Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.CollectionExpression#getClosure <em>Closure</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.CollectionExpression#getEleName <em>Ele Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getCollectionExpression()
+ * @model
+ * @generated
+ */
+public interface CollectionExpression extends FeatureCall {
+	/**
+	 * Returns the value of the '<em><b>Closure</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Closure</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>Closure</em>' containment reference.
+	 * @see #setClosure(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCollectionExpression_Closure()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getClosure();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.CollectionExpression#getClosure <em>Closure</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Closure</em>' containment reference.
+	 * @see #getClosure()
+	 * @generated
+	 */
+	void setClosure(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Ele Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Ele 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>Ele Name</em>' containment reference.
+	 * @see #setEleName(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getCollectionExpression_EleName()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getEleName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.CollectionExpression#getEleName <em>Ele Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Ele Name</em>' containment reference.
+	 * @see #getEleName()
+	 * @generated
+	 */
+	void setEleName(Identifier value);
+
+} // CollectionExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ConstructorCallExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ConstructorCallExpression.java
new file mode 100644
index 00000000..c690595f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ConstructorCallExpression.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ConstructorCallExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constructor Call Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.ConstructorCallExpression#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getConstructorCallExpression()
+ * @model
+ * @generated
+ */
+public interface ConstructorCallExpression extends AbstractExpression {
+	/**
+	 * 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(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getConstructorCallExpression_Type()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.ConstructorCallExpression#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(Identifier value);
+
+} // ConstructorCallExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionFactory.java
new file mode 100644
index 00000000..0c9ece8a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionFactory.java
@@ -0,0 +1,226 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionFactory.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+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.xpand3.expression.ExpressionPackage
+ * @generated
+ */
+public interface ExpressionFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ExpressionFactory eINSTANCE = org.eclipse.xpand3.expression.impl.ExpressionFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Boolean Operation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Boolean Operation</em>'.
+	 * @generated
+	 */
+	BooleanOperation createBooleanOperation();
+
+	/**
+	 * Returns a new object of class '<em>Cast</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Cast</em>'.
+	 * @generated
+	 */
+	Cast createCast();
+
+	/**
+	 * Returns a new object of class '<em>Chain Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Chain Expression</em>'.
+	 * @generated
+	 */
+	ChainExpression createChainExpression();
+
+	/**
+	 * Returns a new object of class '<em>Constructor Call Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Constructor Call Expression</em>'.
+	 * @generated
+	 */
+	ConstructorCallExpression createConstructorCallExpression();
+
+	/**
+	 * Returns a new object of class '<em>Feature Call</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Feature Call</em>'.
+	 * @generated
+	 */
+	FeatureCall createFeatureCall();
+
+	/**
+	 * Returns a new object of class '<em>Collection Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Collection Expression</em>'.
+	 * @generated
+	 */
+	CollectionExpression createCollectionExpression();
+
+	/**
+	 * Returns a new object of class '<em>Operation Call</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Operation Call</em>'.
+	 * @generated
+	 */
+	OperationCall createOperationCall();
+
+	/**
+	 * Returns a new object of class '<em>Type Select Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Type Select Expression</em>'.
+	 * @generated
+	 */
+	TypeSelectExpression createTypeSelectExpression();
+
+	/**
+	 * Returns a new object of class '<em>Global Var Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Global Var Expression</em>'.
+	 * @generated
+	 */
+	GlobalVarExpression createGlobalVarExpression();
+
+	/**
+	 * Returns a new object of class '<em>If Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>If Expression</em>'.
+	 * @generated
+	 */
+	IfExpression createIfExpression();
+
+	/**
+	 * Returns a new object of class '<em>Let Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Let Expression</em>'.
+	 * @generated
+	 */
+	LetExpression createLetExpression();
+
+	/**
+	 * Returns a new object of class '<em>List Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>List Literal</em>'.
+	 * @generated
+	 */
+	ListLiteral createListLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Boolean Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Boolean Literal</em>'.
+	 * @generated
+	 */
+	BooleanLiteral createBooleanLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Integer Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Integer Literal</em>'.
+	 * @generated
+	 */
+	IntegerLiteral createIntegerLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Null Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Null Literal</em>'.
+	 * @generated
+	 */
+	NullLiteral createNullLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Real Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Real Literal</em>'.
+	 * @generated
+	 */
+	RealLiteral createRealLiteral();
+
+	/**
+	 * Returns a new object of class '<em>String Literal</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>String Literal</em>'.
+	 * @generated
+	 */
+	StringLiteral createStringLiteral();
+
+	/**
+	 * Returns a new object of class '<em>Switch Expression</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Switch Expression</em>'.
+	 * @generated
+	 */
+	SwitchExpression createSwitchExpression();
+
+	/**
+	 * Returns a new object of class '<em>Case</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Case</em>'.
+	 * @generated
+	 */
+	Case createCase();
+
+	/**
+	 * Returns a new object of class '<em>Binary Operation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Binary Operation</em>'.
+	 * @generated
+	 */
+	BinaryOperation createBinaryOperation();
+
+	/**
+	 * Returns a new object of class '<em>Unary Operation</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Unary Operation</em>'.
+	 * @generated
+	 */
+	UnaryOperation createUnaryOperation();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	ExpressionPackage getExpressionPackage();
+
+} //ExpressionFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java
new file mode 100644
index 00000000..5c370e70
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java
@@ -0,0 +1,2779 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionPackage.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.xpand3.Xpand3Package;
+
+/**
+ * <!-- 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.xpand3.expression.ExpressionFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface ExpressionPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "expression";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/expession";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "expression";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	ExpressionPackage eINSTANCE = org.eclipse.xpand3.expression.impl.ExpressionPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.AbstractExpressionImpl <em>Abstract Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.AbstractExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getAbstractExpression()
+	 * @generated
+	 */
+	int ABSTRACT_EXPRESSION = 0;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EXPRESSION__LINE = Xpand3Package.SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EXPRESSION__START = Xpand3Package.SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EXPRESSION__END = Xpand3Package.SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EXPRESSION__FILE_NAME = Xpand3Package.SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_EXPRESSION_FEATURE_COUNT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.BinaryOperationImpl <em>Binary Operation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.BinaryOperationImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBinaryOperation()
+	 * @generated
+	 */
+	int BINARY_OPERATION = 21;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Left</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__LEFT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Right</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__RIGHT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Operator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION__OPERATOR = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Binary Operation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BINARY_OPERATION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.BooleanOperationImpl <em>Boolean Operation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.BooleanOperationImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBooleanOperation()
+	 * @generated
+	 */
+	int BOOLEAN_OPERATION = 1;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__LINE = BINARY_OPERATION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__START = BINARY_OPERATION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__END = BINARY_OPERATION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__FILE_NAME = BINARY_OPERATION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Left</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__LEFT = BINARY_OPERATION__LEFT;
+
+	/**
+	 * The feature id for the '<em><b>Right</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__RIGHT = BINARY_OPERATION__RIGHT;
+
+	/**
+	 * The feature id for the '<em><b>Operator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION__OPERATOR = BINARY_OPERATION__OPERATOR;
+
+	/**
+	 * The number of structural features of the '<em>Boolean Operation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_OPERATION_FEATURE_COUNT = BINARY_OPERATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.CastImpl <em>Cast</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.CastImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCast()
+	 * @generated
+	 */
+	int CAST = 2;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__TYPE = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST__TARGET = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Cast</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CAST_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.ChainExpressionImpl <em>Chain Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.ChainExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getChainExpression()
+	 * @generated
+	 */
+	int CHAIN_EXPRESSION = 3;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>First</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__FIRST = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Next</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION__NEXT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Chain Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CHAIN_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.ConstructorCallExpressionImpl <em>Constructor Call Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.ConstructorCallExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getConstructorCallExpression()
+	 * @generated
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION = 4;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Type</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION__TYPE = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Constructor Call Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CONSTRUCTOR_CALL_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.FeatureCallImpl <em>Feature Call</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.FeatureCallImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getFeatureCall()
+	 * @generated
+	 */
+	int FEATURE_CALL = 5;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__TARGET = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL__NAME = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Feature Call</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FEATURE_CALL_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.CollectionExpressionImpl <em>Collection Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.CollectionExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCollectionExpression()
+	 * @generated
+	 */
+	int COLLECTION_EXPRESSION = 6;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__LINE = FEATURE_CALL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__START = FEATURE_CALL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__END = FEATURE_CALL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__FILE_NAME = FEATURE_CALL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__TARGET = FEATURE_CALL__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__NAME = FEATURE_CALL__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Closure</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__CLOSURE = FEATURE_CALL_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Ele Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION__ELE_NAME = FEATURE_CALL_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Collection Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int COLLECTION_EXPRESSION_FEATURE_COUNT = FEATURE_CALL_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.OperationCallImpl <em>Operation Call</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.OperationCallImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getOperationCall()
+	 * @generated
+	 */
+	int OPERATION_CALL = 7;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__LINE = FEATURE_CALL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__START = FEATURE_CALL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__END = FEATURE_CALL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__FILE_NAME = FEATURE_CALL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__TARGET = FEATURE_CALL__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__NAME = FEATURE_CALL__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Params</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL__PARAMS = FEATURE_CALL_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Operation Call</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int OPERATION_CALL_FEATURE_COUNT = FEATURE_CALL_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.TypeSelectExpressionImpl <em>Type Select Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.TypeSelectExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getTypeSelectExpression()
+	 * @generated
+	 */
+	int TYPE_SELECT_EXPRESSION = 8;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__LINE = FEATURE_CALL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__START = FEATURE_CALL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__END = FEATURE_CALL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__FILE_NAME = FEATURE_CALL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__TARGET = FEATURE_CALL__TARGET;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__NAME = FEATURE_CALL__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Type Literal</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION__TYPE_LITERAL = FEATURE_CALL_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Type Select Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_SELECT_EXPRESSION_FEATURE_COUNT = FEATURE_CALL_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.GlobalVarExpressionImpl <em>Global Var Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.GlobalVarExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getGlobalVarExpression()
+	 * @generated
+	 */
+	int GLOBAL_VAR_EXPRESSION = 9;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Global Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Global Var Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GLOBAL_VAR_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.IfExpressionImpl <em>If Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.IfExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getIfExpression()
+	 * @generated
+	 */
+	int IF_EXPRESSION = 10;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__CONDITION = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Then Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__THEN_PART = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Else Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION__ELSE_PART = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>If Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.LetExpressionImpl <em>Let Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.LetExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getLetExpression()
+	 * @generated
+	 */
+	int LET_EXPRESSION = 11;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Var Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__VAR_EXPRESSION = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Target Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__TARGET_EXPRESSION = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION__VAR_NAME = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Let Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.ListLiteralImpl <em>List Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.ListLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getListLiteral()
+	 * @generated
+	 */
+	int LIST_LITERAL = 12;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Elements</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL__ELEMENTS = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>List Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LIST_LITERAL_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.LiteralImpl <em>Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.LiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getLiteral()
+	 * @generated
+	 */
+	int LITERAL = 13;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL__LITERAL_VALUE = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LITERAL_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.BooleanLiteralImpl <em>Boolean Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.BooleanLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBooleanLiteral()
+	 * @generated
+	 */
+	int BOOLEAN_LITERAL = 14;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL__LINE = LITERAL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL__START = LITERAL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL__END = LITERAL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL__FILE_NAME = LITERAL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL__LITERAL_VALUE = LITERAL__LITERAL_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>Boolean Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int BOOLEAN_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.IntegerLiteralImpl <em>Integer Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.IntegerLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getIntegerLiteral()
+	 * @generated
+	 */
+	int INTEGER_LITERAL = 15;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL__LINE = LITERAL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL__START = LITERAL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL__END = LITERAL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL__FILE_NAME = LITERAL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL__LITERAL_VALUE = LITERAL__LITERAL_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>Integer Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INTEGER_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.NullLiteralImpl <em>Null Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.NullLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getNullLiteral()
+	 * @generated
+	 */
+	int NULL_LITERAL = 16;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL__LINE = LITERAL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL__START = LITERAL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL__END = LITERAL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL__FILE_NAME = LITERAL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL__LITERAL_VALUE = LITERAL__LITERAL_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>Null Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int NULL_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.RealLiteralImpl <em>Real Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.RealLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getRealLiteral()
+	 * @generated
+	 */
+	int REAL_LITERAL = 17;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL__LINE = LITERAL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL__START = LITERAL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL__END = LITERAL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL__FILE_NAME = LITERAL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL__LITERAL_VALUE = LITERAL__LITERAL_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>Real Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int REAL_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.StringLiteralImpl <em>String Literal</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.StringLiteralImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getStringLiteral()
+	 * @generated
+	 */
+	int STRING_LITERAL = 18;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL__LINE = LITERAL__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL__START = LITERAL__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL__END = LITERAL__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL__FILE_NAME = LITERAL__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL__LITERAL_VALUE = LITERAL__LITERAL_VALUE;
+
+	/**
+	 * The number of structural features of the '<em>String Literal</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.SwitchExpressionImpl <em>Switch Expression</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.SwitchExpressionImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getSwitchExpression()
+	 * @generated
+	 */
+	int SWITCH_EXPRESSION = 19;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Switch Expr</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__SWITCH_EXPR = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Default Expr</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__DEFAULT_EXPR = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Cases</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION__CASES = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Switch Expression</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SWITCH_EXPRESSION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.CaseImpl <em>Case</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.CaseImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCase()
+	 * @generated
+	 */
+	int CASE = 20;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__LINE = Xpand3Package.SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__START = Xpand3Package.SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__END = Xpand3Package.SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__FILE_NAME = Xpand3Package.SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__CONDITION = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Then Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE__THEN_PART = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Case</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CASE_FEATURE_COUNT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.expression.impl.UnaryOperationImpl <em>Unary Operation</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.expression.impl.UnaryOperationImpl
+	 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getUnaryOperation()
+	 * @generated
+	 */
+	int UNARY_OPERATION = 22;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__LINE = ABSTRACT_EXPRESSION__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__START = ABSTRACT_EXPRESSION__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__END = ABSTRACT_EXPRESSION__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__FILE_NAME = ABSTRACT_EXPRESSION__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Operator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__OPERATOR = ABSTRACT_EXPRESSION_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Operand</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION__OPERAND = ABSTRACT_EXPRESSION_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Unary Operation</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UNARY_OPERATION_FEATURE_COUNT = ABSTRACT_EXPRESSION_FEATURE_COUNT + 2;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.AbstractExpression <em>Abstract Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.AbstractExpression
+	 * @generated
+	 */
+	EClass getAbstractExpression();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.BooleanOperation <em>Boolean Operation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Boolean Operation</em>'.
+	 * @see org.eclipse.xpand3.expression.BooleanOperation
+	 * @generated
+	 */
+	EClass getBooleanOperation();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.Cast <em>Cast</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cast</em>'.
+	 * @see org.eclipse.xpand3.expression.Cast
+	 * @generated
+	 */
+	EClass getCast();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.Cast#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Type</em>'.
+	 * @see org.eclipse.xpand3.expression.Cast#getType()
+	 * @see #getCast()
+	 * @generated
+	 */
+	EReference getCast_Type();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.Cast#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.expression.Cast#getTarget()
+	 * @see #getCast()
+	 * @generated
+	 */
+	EReference getCast_Target();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.ChainExpression <em>Chain Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Chain Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.ChainExpression
+	 * @generated
+	 */
+	EClass getChainExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.ChainExpression#getFirst <em>First</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>First</em>'.
+	 * @see org.eclipse.xpand3.expression.ChainExpression#getFirst()
+	 * @see #getChainExpression()
+	 * @generated
+	 */
+	EReference getChainExpression_First();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.ChainExpression#getNext <em>Next</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Next</em>'.
+	 * @see org.eclipse.xpand3.expression.ChainExpression#getNext()
+	 * @see #getChainExpression()
+	 * @generated
+	 */
+	EReference getChainExpression_Next();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.ConstructorCallExpression <em>Constructor Call Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Constructor Call Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.ConstructorCallExpression
+	 * @generated
+	 */
+	EClass getConstructorCallExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.ConstructorCallExpression#getType <em>Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Type</em>'.
+	 * @see org.eclipse.xpand3.expression.ConstructorCallExpression#getType()
+	 * @see #getConstructorCallExpression()
+	 * @generated
+	 */
+	EReference getConstructorCallExpression_Type();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.FeatureCall <em>Feature Call</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Feature Call</em>'.
+	 * @see org.eclipse.xpand3.expression.FeatureCall
+	 * @generated
+	 */
+	EClass getFeatureCall();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.FeatureCall#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.expression.FeatureCall#getTarget()
+	 * @see #getFeatureCall()
+	 * @generated
+	 */
+	EReference getFeatureCall_Target();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.FeatureCall#getName <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Name</em>'.
+	 * @see org.eclipse.xpand3.expression.FeatureCall#getName()
+	 * @see #getFeatureCall()
+	 * @generated
+	 */
+	EReference getFeatureCall_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.CollectionExpression <em>Collection Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Collection Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.CollectionExpression
+	 * @generated
+	 */
+	EClass getCollectionExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.CollectionExpression#getClosure <em>Closure</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Closure</em>'.
+	 * @see org.eclipse.xpand3.expression.CollectionExpression#getClosure()
+	 * @see #getCollectionExpression()
+	 * @generated
+	 */
+	EReference getCollectionExpression_Closure();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.CollectionExpression#getEleName <em>Ele Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Ele Name</em>'.
+	 * @see org.eclipse.xpand3.expression.CollectionExpression#getEleName()
+	 * @see #getCollectionExpression()
+	 * @generated
+	 */
+	EReference getCollectionExpression_EleName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.OperationCall <em>Operation Call</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Operation Call</em>'.
+	 * @see org.eclipse.xpand3.expression.OperationCall
+	 * @generated
+	 */
+	EClass getOperationCall();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.expression.OperationCall#getParams <em>Params</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Params</em>'.
+	 * @see org.eclipse.xpand3.expression.OperationCall#getParams()
+	 * @see #getOperationCall()
+	 * @generated
+	 */
+	EReference getOperationCall_Params();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.TypeSelectExpression <em>Type Select Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Type Select Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.TypeSelectExpression
+	 * @generated
+	 */
+	EClass getTypeSelectExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.TypeSelectExpression#getTypeLiteral <em>Type Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Type Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.TypeSelectExpression#getTypeLiteral()
+	 * @see #getTypeSelectExpression()
+	 * @generated
+	 */
+	EReference getTypeSelectExpression_TypeLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.GlobalVarExpression <em>Global Var Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Global Var Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.GlobalVarExpression
+	 * @generated
+	 */
+	EClass getGlobalVarExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.GlobalVarExpression#getGlobalVarName <em>Global Var Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Global Var Name</em>'.
+	 * @see org.eclipse.xpand3.expression.GlobalVarExpression#getGlobalVarName()
+	 * @see #getGlobalVarExpression()
+	 * @generated
+	 */
+	EReference getGlobalVarExpression_GlobalVarName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.IfExpression <em>If Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>If Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.IfExpression
+	 * @generated
+	 */
+	EClass getIfExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.IfExpression#getCondition <em>Condition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Condition</em>'.
+	 * @see org.eclipse.xpand3.expression.IfExpression#getCondition()
+	 * @see #getIfExpression()
+	 * @generated
+	 */
+	EReference getIfExpression_Condition();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.IfExpression#getThenPart <em>Then Part</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Then Part</em>'.
+	 * @see org.eclipse.xpand3.expression.IfExpression#getThenPart()
+	 * @see #getIfExpression()
+	 * @generated
+	 */
+	EReference getIfExpression_ThenPart();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.IfExpression#getElsePart <em>Else Part</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Else Part</em>'.
+	 * @see org.eclipse.xpand3.expression.IfExpression#getElsePart()
+	 * @see #getIfExpression()
+	 * @generated
+	 */
+	EReference getIfExpression_ElsePart();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.LetExpression <em>Let Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Let Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.LetExpression
+	 * @generated
+	 */
+	EClass getLetExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.LetExpression#getVarExpression <em>Var Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Var Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.LetExpression#getVarExpression()
+	 * @see #getLetExpression()
+	 * @generated
+	 */
+	EReference getLetExpression_VarExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.LetExpression#getTargetExpression <em>Target Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Target Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.LetExpression#getTargetExpression()
+	 * @see #getLetExpression()
+	 * @generated
+	 */
+	EReference getLetExpression_TargetExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.LetExpression#getVarName <em>Var Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Var Name</em>'.
+	 * @see org.eclipse.xpand3.expression.LetExpression#getVarName()
+	 * @see #getLetExpression()
+	 * @generated
+	 */
+	EReference getLetExpression_VarName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.ListLiteral <em>List Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>List Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.ListLiteral
+	 * @generated
+	 */
+	EClass getListLiteral();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.expression.ListLiteral#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.xpand3.expression.ListLiteral#getElements()
+	 * @see #getListLiteral()
+	 * @generated
+	 */
+	EReference getListLiteral_Elements();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.Literal <em>Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.Literal
+	 * @generated
+	 */
+	EClass getLiteral();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.Literal#getLiteralValue <em>Literal Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Literal Value</em>'.
+	 * @see org.eclipse.xpand3.expression.Literal#getLiteralValue()
+	 * @see #getLiteral()
+	 * @generated
+	 */
+	EReference getLiteral_LiteralValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.BooleanLiteral <em>Boolean Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Boolean Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.BooleanLiteral
+	 * @generated
+	 */
+	EClass getBooleanLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.IntegerLiteral <em>Integer Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Integer Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.IntegerLiteral
+	 * @generated
+	 */
+	EClass getIntegerLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.NullLiteral <em>Null Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Null Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.NullLiteral
+	 * @generated
+	 */
+	EClass getNullLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.RealLiteral <em>Real Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Real Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.RealLiteral
+	 * @generated
+	 */
+	EClass getRealLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.StringLiteral <em>String Literal</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>String Literal</em>'.
+	 * @see org.eclipse.xpand3.expression.StringLiteral
+	 * @generated
+	 */
+	EClass getStringLiteral();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.SwitchExpression <em>Switch Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Switch Expression</em>'.
+	 * @see org.eclipse.xpand3.expression.SwitchExpression
+	 * @generated
+	 */
+	EClass getSwitchExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.SwitchExpression#getSwitchExpr <em>Switch Expr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Switch Expr</em>'.
+	 * @see org.eclipse.xpand3.expression.SwitchExpression#getSwitchExpr()
+	 * @see #getSwitchExpression()
+	 * @generated
+	 */
+	EReference getSwitchExpression_SwitchExpr();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.SwitchExpression#getDefaultExpr <em>Default Expr</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Default Expr</em>'.
+	 * @see org.eclipse.xpand3.expression.SwitchExpression#getDefaultExpr()
+	 * @see #getSwitchExpression()
+	 * @generated
+	 */
+	EReference getSwitchExpression_DefaultExpr();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.expression.SwitchExpression#getCases <em>Cases</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Cases</em>'.
+	 * @see org.eclipse.xpand3.expression.SwitchExpression#getCases()
+	 * @see #getSwitchExpression()
+	 * @generated
+	 */
+	EReference getSwitchExpression_Cases();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.Case <em>Case</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Case</em>'.
+	 * @see org.eclipse.xpand3.expression.Case
+	 * @generated
+	 */
+	EClass getCase();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.Case#getCondition <em>Condition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Condition</em>'.
+	 * @see org.eclipse.xpand3.expression.Case#getCondition()
+	 * @see #getCase()
+	 * @generated
+	 */
+	EReference getCase_Condition();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.Case#getThenPart <em>Then Part</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Then Part</em>'.
+	 * @see org.eclipse.xpand3.expression.Case#getThenPart()
+	 * @see #getCase()
+	 * @generated
+	 */
+	EReference getCase_ThenPart();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.BinaryOperation <em>Binary Operation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Binary Operation</em>'.
+	 * @see org.eclipse.xpand3.expression.BinaryOperation
+	 * @generated
+	 */
+	EClass getBinaryOperation();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.BinaryOperation#getLeft <em>Left</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Left</em>'.
+	 * @see org.eclipse.xpand3.expression.BinaryOperation#getLeft()
+	 * @see #getBinaryOperation()
+	 * @generated
+	 */
+	EReference getBinaryOperation_Left();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.BinaryOperation#getRight <em>Right</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Right</em>'.
+	 * @see org.eclipse.xpand3.expression.BinaryOperation#getRight()
+	 * @see #getBinaryOperation()
+	 * @generated
+	 */
+	EReference getBinaryOperation_Right();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.BinaryOperation#getOperator <em>Operator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Operator</em>'.
+	 * @see org.eclipse.xpand3.expression.BinaryOperation#getOperator()
+	 * @see #getBinaryOperation()
+	 * @generated
+	 */
+	EReference getBinaryOperation_Operator();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.expression.UnaryOperation <em>Unary Operation</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Unary Operation</em>'.
+	 * @see org.eclipse.xpand3.expression.UnaryOperation
+	 * @generated
+	 */
+	EClass getUnaryOperation();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.expression.UnaryOperation#getOperator <em>Operator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Operator</em>'.
+	 * @see org.eclipse.xpand3.expression.UnaryOperation#getOperator()
+	 * @see #getUnaryOperation()
+	 * @generated
+	 */
+	EReference getUnaryOperation_Operator();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.expression.UnaryOperation#getOperand <em>Operand</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Operand</em>'.
+	 * @see org.eclipse.xpand3.expression.UnaryOperation#getOperand()
+	 * @see #getUnaryOperation()
+	 * @generated
+	 */
+	EReference getUnaryOperation_Operand();
+
+	/**
+	 * 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
+	 */
+	ExpressionFactory getExpressionFactory();
+
+	/**
+	 * <!-- 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.xpand3.expression.impl.AbstractExpressionImpl <em>Abstract Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.AbstractExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getAbstractExpression()
+		 * @generated
+		 */
+		EClass ABSTRACT_EXPRESSION = eINSTANCE.getAbstractExpression();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.BooleanOperationImpl <em>Boolean Operation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.BooleanOperationImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBooleanOperation()
+		 * @generated
+		 */
+		EClass BOOLEAN_OPERATION = eINSTANCE.getBooleanOperation();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.CastImpl <em>Cast</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.CastImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCast()
+		 * @generated
+		 */
+		EClass CAST = eINSTANCE.getCast();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CAST__TYPE = eINSTANCE.getCast_Type();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CAST__TARGET = eINSTANCE.getCast_Target();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.ChainExpressionImpl <em>Chain Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.ChainExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getChainExpression()
+		 * @generated
+		 */
+		EClass CHAIN_EXPRESSION = eINSTANCE.getChainExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>First</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHAIN_EXPRESSION__FIRST = eINSTANCE.getChainExpression_First();
+
+		/**
+		 * The meta object literal for the '<em><b>Next</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CHAIN_EXPRESSION__NEXT = eINSTANCE.getChainExpression_Next();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.ConstructorCallExpressionImpl <em>Constructor Call Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.ConstructorCallExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getConstructorCallExpression()
+		 * @generated
+		 */
+		EClass CONSTRUCTOR_CALL_EXPRESSION = eINSTANCE.getConstructorCallExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CONSTRUCTOR_CALL_EXPRESSION__TYPE = eINSTANCE.getConstructorCallExpression_Type();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.FeatureCallImpl <em>Feature Call</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.FeatureCallImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getFeatureCall()
+		 * @generated
+		 */
+		EClass FEATURE_CALL = eINSTANCE.getFeatureCall();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FEATURE_CALL__TARGET = eINSTANCE.getFeatureCall_Target();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FEATURE_CALL__NAME = eINSTANCE.getFeatureCall_Name();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.CollectionExpressionImpl <em>Collection Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.CollectionExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCollectionExpression()
+		 * @generated
+		 */
+		EClass COLLECTION_EXPRESSION = eINSTANCE.getCollectionExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Closure</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COLLECTION_EXPRESSION__CLOSURE = eINSTANCE.getCollectionExpression_Closure();
+
+		/**
+		 * The meta object literal for the '<em><b>Ele Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference COLLECTION_EXPRESSION__ELE_NAME = eINSTANCE.getCollectionExpression_EleName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.OperationCallImpl <em>Operation Call</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.OperationCallImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getOperationCall()
+		 * @generated
+		 */
+		EClass OPERATION_CALL = eINSTANCE.getOperationCall();
+
+		/**
+		 * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference OPERATION_CALL__PARAMS = eINSTANCE.getOperationCall_Params();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.TypeSelectExpressionImpl <em>Type Select Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.TypeSelectExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getTypeSelectExpression()
+		 * @generated
+		 */
+		EClass TYPE_SELECT_EXPRESSION = eINSTANCE.getTypeSelectExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Type Literal</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference TYPE_SELECT_EXPRESSION__TYPE_LITERAL = eINSTANCE.getTypeSelectExpression_TypeLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.GlobalVarExpressionImpl <em>Global Var Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.GlobalVarExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getGlobalVarExpression()
+		 * @generated
+		 */
+		EClass GLOBAL_VAR_EXPRESSION = eINSTANCE.getGlobalVarExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Global Var Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME = eINSTANCE.getGlobalVarExpression_GlobalVarName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.IfExpressionImpl <em>If Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.IfExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getIfExpression()
+		 * @generated
+		 */
+		EClass IF_EXPRESSION = eINSTANCE.getIfExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF_EXPRESSION__CONDITION = eINSTANCE.getIfExpression_Condition();
+
+		/**
+		 * The meta object literal for the '<em><b>Then Part</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF_EXPRESSION__THEN_PART = eINSTANCE.getIfExpression_ThenPart();
+
+		/**
+		 * The meta object literal for the '<em><b>Else Part</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF_EXPRESSION__ELSE_PART = eINSTANCE.getIfExpression_ElsePart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.LetExpressionImpl <em>Let Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.LetExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getLetExpression()
+		 * @generated
+		 */
+		EClass LET_EXPRESSION = eINSTANCE.getLetExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Var Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LET_EXPRESSION__VAR_EXPRESSION = eINSTANCE.getLetExpression_VarExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LET_EXPRESSION__TARGET_EXPRESSION = eINSTANCE.getLetExpression_TargetExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Var Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LET_EXPRESSION__VAR_NAME = eINSTANCE.getLetExpression_VarName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.ListLiteralImpl <em>List Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.ListLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getListLiteral()
+		 * @generated
+		 */
+		EClass LIST_LITERAL = eINSTANCE.getListLiteral();
+
+		/**
+		 * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LIST_LITERAL__ELEMENTS = eINSTANCE.getListLiteral_Elements();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.LiteralImpl <em>Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.LiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getLiteral()
+		 * @generated
+		 */
+		EClass LITERAL = eINSTANCE.getLiteral();
+
+		/**
+		 * The meta object literal for the '<em><b>Literal Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LITERAL__LITERAL_VALUE = eINSTANCE.getLiteral_LiteralValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.BooleanLiteralImpl <em>Boolean Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.BooleanLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBooleanLiteral()
+		 * @generated
+		 */
+		EClass BOOLEAN_LITERAL = eINSTANCE.getBooleanLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.IntegerLiteralImpl <em>Integer Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.IntegerLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getIntegerLiteral()
+		 * @generated
+		 */
+		EClass INTEGER_LITERAL = eINSTANCE.getIntegerLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.NullLiteralImpl <em>Null Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.NullLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getNullLiteral()
+		 * @generated
+		 */
+		EClass NULL_LITERAL = eINSTANCE.getNullLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.RealLiteralImpl <em>Real Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.RealLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getRealLiteral()
+		 * @generated
+		 */
+		EClass REAL_LITERAL = eINSTANCE.getRealLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.StringLiteralImpl <em>String Literal</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.StringLiteralImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getStringLiteral()
+		 * @generated
+		 */
+		EClass STRING_LITERAL = eINSTANCE.getStringLiteral();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.SwitchExpressionImpl <em>Switch Expression</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.SwitchExpressionImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getSwitchExpression()
+		 * @generated
+		 */
+		EClass SWITCH_EXPRESSION = eINSTANCE.getSwitchExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Switch Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SWITCH_EXPRESSION__SWITCH_EXPR = eINSTANCE.getSwitchExpression_SwitchExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Default Expr</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SWITCH_EXPRESSION__DEFAULT_EXPR = eINSTANCE.getSwitchExpression_DefaultExpr();
+
+		/**
+		 * The meta object literal for the '<em><b>Cases</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference SWITCH_EXPRESSION__CASES = eINSTANCE.getSwitchExpression_Cases();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.CaseImpl <em>Case</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.CaseImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getCase()
+		 * @generated
+		 */
+		EClass CASE = eINSTANCE.getCase();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CASE__CONDITION = eINSTANCE.getCase_Condition();
+
+		/**
+		 * The meta object literal for the '<em><b>Then Part</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CASE__THEN_PART = eINSTANCE.getCase_ThenPart();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.BinaryOperationImpl <em>Binary Operation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.BinaryOperationImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getBinaryOperation()
+		 * @generated
+		 */
+		EClass BINARY_OPERATION = eINSTANCE.getBinaryOperation();
+
+		/**
+		 * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference BINARY_OPERATION__LEFT = eINSTANCE.getBinaryOperation_Left();
+
+		/**
+		 * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference BINARY_OPERATION__RIGHT = eINSTANCE.getBinaryOperation_Right();
+
+		/**
+		 * The meta object literal for the '<em><b>Operator</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference BINARY_OPERATION__OPERATOR = eINSTANCE.getBinaryOperation_Operator();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.expression.impl.UnaryOperationImpl <em>Unary Operation</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.expression.impl.UnaryOperationImpl
+		 * @see org.eclipse.xpand3.expression.impl.ExpressionPackageImpl#getUnaryOperation()
+		 * @generated
+		 */
+		EClass UNARY_OPERATION = eINSTANCE.getUnaryOperation();
+
+		/**
+		 * The meta object literal for the '<em><b>Operator</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UNARY_OPERATION__OPERATOR = eINSTANCE.getUnaryOperation_Operator();
+
+		/**
+		 * The meta object literal for the '<em><b>Operand</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UNARY_OPERATION__OPERAND = eINSTANCE.getUnaryOperation_Operand();
+
+	}
+
+} //ExpressionPackage
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/FeatureCall.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/FeatureCall.java
new file mode 100644
index 00000000..82dc816f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/FeatureCall.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FeatureCall.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Feature Call</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.FeatureCall#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.FeatureCall#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getFeatureCall()
+ * @model
+ * @generated
+ */
+public interface FeatureCall extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target</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>Target</em>' containment reference.
+	 * @see #setTarget(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getFeatureCall_Target()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getTarget();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.FeatureCall#getTarget <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' containment reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>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>Name</em>' containment reference.
+	 * @see #setName(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getFeatureCall_Name()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.FeatureCall#getName <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Name</em>' containment reference.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(Identifier value);
+
+} // FeatureCall
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/GlobalVarExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/GlobalVarExpression.java
new file mode 100644
index 00000000..f7e91ba1
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/GlobalVarExpression.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: GlobalVarExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Global Var Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.GlobalVarExpression#getGlobalVarName <em>Global Var Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getGlobalVarExpression()
+ * @model
+ * @generated
+ */
+public interface GlobalVarExpression extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Global Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Global Var 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>Global Var Name</em>' containment reference.
+	 * @see #setGlobalVarName(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getGlobalVarExpression_GlobalVarName()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getGlobalVarName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.GlobalVarExpression#getGlobalVarName <em>Global Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Global Var Name</em>' containment reference.
+	 * @see #getGlobalVarName()
+	 * @generated
+	 */
+	void setGlobalVarName(Identifier value);
+
+} // GlobalVarExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IfExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IfExpression.java
new file mode 100644
index 00000000..1e1175da
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IfExpression.java
@@ -0,0 +1,107 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>If Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.IfExpression#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.IfExpression#getThenPart <em>Then Part</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.IfExpression#getElsePart <em>Else Part</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getIfExpression()
+ * @model
+ * @generated
+ */
+public interface IfExpression extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Condition</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>Condition</em>' containment reference.
+	 * @see #setCondition(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getIfExpression_Condition()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getCondition();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.IfExpression#getCondition <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Condition</em>' containment reference.
+	 * @see #getCondition()
+	 * @generated
+	 */
+	void setCondition(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Then Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Then Part</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>Then Part</em>' containment reference.
+	 * @see #setThenPart(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getIfExpression_ThenPart()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getThenPart();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.IfExpression#getThenPart <em>Then Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Then Part</em>' containment reference.
+	 * @see #getThenPart()
+	 * @generated
+	 */
+	void setThenPart(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Else Part</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Else Part</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>Else Part</em>' containment reference.
+	 * @see #setElsePart(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getIfExpression_ElsePart()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getElsePart();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.IfExpression#getElsePart <em>Else Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Else Part</em>' containment reference.
+	 * @see #getElsePart()
+	 * @generated
+	 */
+	void setElsePart(AbstractExpression value);
+
+} // IfExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IntegerLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IntegerLiteral.java
new file mode 100644
index 00000000..946975b8
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/IntegerLiteral.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IntegerLiteral.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Integer Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getIntegerLiteral()
+ * @model
+ * @generated
+ */
+public interface IntegerLiteral extends Literal {
+} // IntegerLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/LetExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/LetExpression.java
new file mode 100644
index 00000000..d067a461
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/LetExpression.java
@@ -0,0 +1,108 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Let Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.LetExpression#getVarExpression <em>Var Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.LetExpression#getTargetExpression <em>Target Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.LetExpression#getVarName <em>Var Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getLetExpression()
+ * @model
+ * @generated
+ */
+public interface LetExpression extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Var Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Var Expression</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>Var Expression</em>' containment reference.
+	 * @see #setVarExpression(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getLetExpression_VarExpression()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getVarExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.LetExpression#getVarExpression <em>Var Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Var Expression</em>' containment reference.
+	 * @see #getVarExpression()
+	 * @generated
+	 */
+	void setVarExpression(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Target Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target Expression</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>Target Expression</em>' containment reference.
+	 * @see #setTargetExpression(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getLetExpression_TargetExpression()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getTargetExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.LetExpression#getTargetExpression <em>Target Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target Expression</em>' containment reference.
+	 * @see #getTargetExpression()
+	 * @generated
+	 */
+	void setTargetExpression(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Var 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>Var Name</em>' containment reference.
+	 * @see #setVarName(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getLetExpression_VarName()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getVarName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.LetExpression#getVarName <em>Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Var Name</em>' containment reference.
+	 * @see #getVarName()
+	 * @generated
+	 */
+	void setVarName(Identifier value);
+
+} // LetExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ListLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ListLiteral.java
new file mode 100644
index 00000000..d6f2caa6
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ListLiteral.java
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ListLiteral.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>List Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.ListLiteral#getElements <em>Elements</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getListLiteral()
+ * @model
+ * @generated
+ */
+public interface ListLiteral extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.expression.AbstractExpression}.
+	 * <!-- 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.xpand3.expression.ExpressionPackage#getListLiteral_Elements()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AbstractExpression> getElements();
+
+} // ListLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Literal.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Literal.java
new file mode 100644
index 00000000..cba8a549
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/Literal.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Literal.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.Literal#getLiteralValue <em>Literal Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getLiteral()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Literal extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Literal Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Literal Value</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>Literal Value</em>' containment reference.
+	 * @see #setLiteralValue(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getLiteral_LiteralValue()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getLiteralValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.Literal#getLiteralValue <em>Literal Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Literal Value</em>' containment reference.
+	 * @see #getLiteralValue()
+	 * @generated
+	 */
+	void setLiteralValue(Identifier value);
+
+} // Literal
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/NullLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/NullLiteral.java
new file mode 100644
index 00000000..1d387b1f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/NullLiteral.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: NullLiteral.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Null Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getNullLiteral()
+ * @model
+ * @generated
+ */
+public interface NullLiteral extends Literal {
+} // NullLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/OperationCall.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/OperationCall.java
new file mode 100644
index 00000000..fcfac138
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/OperationCall.java
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: OperationCall.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Operation Call</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.OperationCall#getParams <em>Params</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getOperationCall()
+ * @model
+ * @generated
+ */
+public interface OperationCall extends FeatureCall {
+	/**
+	 * Returns the value of the '<em><b>Params</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.expression.AbstractExpression}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Params</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>Params</em>' containment reference list.
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getOperationCall_Params()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AbstractExpression> getParams();
+
+} // OperationCall
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/RealLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/RealLiteral.java
new file mode 100644
index 00000000..014e9664
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/RealLiteral.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RealLiteral.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Real Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getRealLiteral()
+ * @model
+ * @generated
+ */
+public interface RealLiteral extends Literal {
+} // RealLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/StringLiteral.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/StringLiteral.java
new file mode 100644
index 00000000..036c5f0c
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/StringLiteral.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StringLiteral.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getStringLiteral()
+ * @model
+ * @generated
+ */
+public interface StringLiteral extends Literal {
+} // StringLiteral
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/SwitchExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/SwitchExpression.java
new file mode 100644
index 00000000..b199dc97
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/SwitchExpression.java
@@ -0,0 +1,98 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SwitchExpression.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Switch Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.SwitchExpression#getSwitchExpr <em>Switch Expr</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.SwitchExpression#getDefaultExpr <em>Default Expr</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.SwitchExpression#getCases <em>Cases</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getSwitchExpression()
+ * @model
+ * @generated
+ */
+public interface SwitchExpression extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Switch Expr</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Switch Expr</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>Switch Expr</em>' containment reference.
+	 * @see #setSwitchExpr(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getSwitchExpression_SwitchExpr()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getSwitchExpr();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.SwitchExpression#getSwitchExpr <em>Switch Expr</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Switch Expr</em>' containment reference.
+	 * @see #getSwitchExpr()
+	 * @generated
+	 */
+	void setSwitchExpr(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Default Expr</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default Expr</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>Default Expr</em>' containment reference.
+	 * @see #setDefaultExpr(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getSwitchExpression_DefaultExpr()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getDefaultExpr();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.SwitchExpression#getDefaultExpr <em>Default Expr</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default Expr</em>' containment reference.
+	 * @see #getDefaultExpr()
+	 * @generated
+	 */
+	void setDefaultExpr(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Cases</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.expression.Case}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cases</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>Cases</em>' containment reference list.
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getSwitchExpression_Cases()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<Case> getCases();
+
+} // SwitchExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/TypeSelectExpression.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/TypeSelectExpression.java
new file mode 100644
index 00000000..d56459dd
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/TypeSelectExpression.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TypeSelectExpression.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Type Select Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.TypeSelectExpression#getTypeLiteral <em>Type Literal</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getTypeSelectExpression()
+ * @model
+ * @generated
+ */
+public interface TypeSelectExpression extends FeatureCall {
+	/**
+	 * Returns the value of the '<em><b>Type Literal</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Type Literal</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 Literal</em>' containment reference.
+	 * @see #setTypeLiteral(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getTypeSelectExpression_TypeLiteral()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getTypeLiteral();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.TypeSelectExpression#getTypeLiteral <em>Type Literal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Type Literal</em>' containment reference.
+	 * @see #getTypeLiteral()
+	 * @generated
+	 */
+	void setTypeLiteral(Identifier value);
+
+} // TypeSelectExpression
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/UnaryOperation.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/UnaryOperation.java
new file mode 100644
index 00000000..dda5440f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/UnaryOperation.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: UnaryOperation.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unary Operation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.UnaryOperation#getOperator <em>Operator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.UnaryOperation#getOperand <em>Operand</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.expression.ExpressionPackage#getUnaryOperation()
+ * @model
+ * @generated
+ */
+public interface UnaryOperation extends AbstractExpression {
+	/**
+	 * Returns the value of the '<em><b>Operator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Operator</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>Operator</em>' containment reference.
+	 * @see #setOperator(Identifier)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getUnaryOperation_Operator()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getOperator();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.UnaryOperation#getOperator <em>Operator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Operator</em>' containment reference.
+	 * @see #getOperator()
+	 * @generated
+	 */
+	void setOperator(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Operand</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Operand</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Operand</em>' reference.
+	 * @see #setOperand(AbstractExpression)
+	 * @see org.eclipse.xpand3.expression.ExpressionPackage#getUnaryOperation_Operand()
+	 * @model
+	 * @generated
+	 */
+	AbstractExpression getOperand();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.expression.UnaryOperation#getOperand <em>Operand</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Operand</em>' reference.
+	 * @see #getOperand()
+	 * @generated
+	 */
+	void setOperand(AbstractExpression value);
+
+} // UnaryOperation
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/AbstractExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/AbstractExpressionImpl.java
new file mode 100644
index 00000000..ac9661d7
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/AbstractExpressionImpl.java
@@ -0,0 +1,45 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+import org.eclipse.xpand3.impl.SyntaxElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractExpressionImpl extends SyntaxElementImpl implements AbstractExpression {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.ABSTRACT_EXPRESSION;
+	}
+
+} //AbstractExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BinaryOperationImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BinaryOperationImpl.java
new file mode 100644
index 00000000..e792fa8a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BinaryOperationImpl.java
@@ -0,0 +1,313 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BinaryOperationImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.BinaryOperation;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Binary Operation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.BinaryOperationImpl#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.BinaryOperationImpl#getRight <em>Right</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.BinaryOperationImpl#getOperator <em>Operator</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class BinaryOperationImpl extends AbstractExpressionImpl implements BinaryOperation {
+	/**
+	 * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLeft()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression left;
+
+	/**
+	 * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRight()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression right;
+
+	/**
+	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOperator()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier operator;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BinaryOperationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.BINARY_OPERATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getLeft() {
+		return left;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLeft(AbstractExpression newLeft, NotificationChain msgs) {
+		AbstractExpression oldLeft = left;
+		left = newLeft;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__LEFT, oldLeft, newLeft);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLeft(AbstractExpression newLeft) {
+		if (newLeft != left) {
+			NotificationChain msgs = null;
+			if (left != null)
+				msgs = ((InternalEObject)left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__LEFT, null, msgs);
+			if (newLeft != null)
+				msgs = ((InternalEObject)newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__LEFT, null, msgs);
+			msgs = basicSetLeft(newLeft, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__LEFT, newLeft, newLeft));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getRight() {
+		return right;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetRight(AbstractExpression newRight, NotificationChain msgs) {
+		AbstractExpression oldRight = right;
+		right = newRight;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__RIGHT, oldRight, newRight);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setRight(AbstractExpression newRight) {
+		if (newRight != right) {
+			NotificationChain msgs = null;
+			if (right != null)
+				msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__RIGHT, null, msgs);
+			if (newRight != null)
+				msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__RIGHT, null, msgs);
+			msgs = basicSetRight(newRight, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__RIGHT, newRight, newRight));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getOperator() {
+		return operator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOperator(Identifier newOperator, NotificationChain msgs) {
+		Identifier oldOperator = operator;
+		operator = newOperator;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__OPERATOR, oldOperator, newOperator);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOperator(Identifier newOperator) {
+		if (newOperator != operator) {
+			NotificationChain msgs = null;
+			if (operator != null)
+				msgs = ((InternalEObject)operator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__OPERATOR, null, msgs);
+			if (newOperator != null)
+				msgs = ((InternalEObject)newOperator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.BINARY_OPERATION__OPERATOR, null, msgs);
+			msgs = basicSetOperator(newOperator, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.BINARY_OPERATION__OPERATOR, newOperator, newOperator));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.BINARY_OPERATION__LEFT:
+				return basicSetLeft(null, msgs);
+			case ExpressionPackage.BINARY_OPERATION__RIGHT:
+				return basicSetRight(null, msgs);
+			case ExpressionPackage.BINARY_OPERATION__OPERATOR:
+				return basicSetOperator(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 ExpressionPackage.BINARY_OPERATION__LEFT:
+				return getLeft();
+			case ExpressionPackage.BINARY_OPERATION__RIGHT:
+				return getRight();
+			case ExpressionPackage.BINARY_OPERATION__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 ExpressionPackage.BINARY_OPERATION__LEFT:
+				setLeft((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.BINARY_OPERATION__RIGHT:
+				setRight((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.BINARY_OPERATION__OPERATOR:
+				setOperator((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.BINARY_OPERATION__LEFT:
+				setLeft((AbstractExpression)null);
+				return;
+			case ExpressionPackage.BINARY_OPERATION__RIGHT:
+				setRight((AbstractExpression)null);
+				return;
+			case ExpressionPackage.BINARY_OPERATION__OPERATOR:
+				setOperator((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.BINARY_OPERATION__LEFT:
+				return left != null;
+			case ExpressionPackage.BINARY_OPERATION__RIGHT:
+				return right != null;
+			case ExpressionPackage.BINARY_OPERATION__OPERATOR:
+				return operator != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //BinaryOperationImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanLiteralImpl.java
new file mode 100644
index 00000000..e71f5d21
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanLiteralImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.BooleanLiteral;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class BooleanLiteralImpl extends LiteralImpl implements BooleanLiteral {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.BOOLEAN_LITERAL;
+	}
+
+} //BooleanLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanOperationImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanOperationImpl.java
new file mode 100644
index 00000000..dc5916fe
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/BooleanOperationImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperationImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.BooleanOperation;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Boolean Operation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class BooleanOperationImpl extends BinaryOperationImpl implements BooleanOperation {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BooleanOperationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.BOOLEAN_OPERATION;
+	}
+
+} //BooleanOperationImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CaseImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CaseImpl.java
new file mode 100644
index 00000000..51d48d98
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CaseImpl.java
@@ -0,0 +1,247 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CaseImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.Case;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+import org.eclipse.xpand3.impl.SyntaxElementImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Case</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CaseImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CaseImpl#getThenPart <em>Then Part</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CaseImpl extends SyntaxElementImpl implements Case {
+	/**
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCondition()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression condition;
+
+	/**
+	 * The cached value of the '{@link #getThenPart() <em>Then Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThenPart()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression thenPart;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CaseImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.CASE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getCondition() {
+		return condition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCondition(AbstractExpression newCondition, NotificationChain msgs) {
+		AbstractExpression oldCondition = condition;
+		condition = newCondition;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CASE__CONDITION, oldCondition, newCondition);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCondition(AbstractExpression newCondition) {
+		if (newCondition != condition) {
+			NotificationChain msgs = null;
+			if (condition != null)
+				msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CASE__CONDITION, null, msgs);
+			if (newCondition != null)
+				msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CASE__CONDITION, null, msgs);
+			msgs = basicSetCondition(newCondition, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CASE__CONDITION, newCondition, newCondition));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getThenPart() {
+		return thenPart;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetThenPart(AbstractExpression newThenPart, NotificationChain msgs) {
+		AbstractExpression oldThenPart = thenPart;
+		thenPart = newThenPart;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CASE__THEN_PART, oldThenPart, newThenPart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setThenPart(AbstractExpression newThenPart) {
+		if (newThenPart != thenPart) {
+			NotificationChain msgs = null;
+			if (thenPart != null)
+				msgs = ((InternalEObject)thenPart).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CASE__THEN_PART, null, msgs);
+			if (newThenPart != null)
+				msgs = ((InternalEObject)newThenPart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CASE__THEN_PART, null, msgs);
+			msgs = basicSetThenPart(newThenPart, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CASE__THEN_PART, newThenPart, newThenPart));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.CASE__CONDITION:
+				return basicSetCondition(null, msgs);
+			case ExpressionPackage.CASE__THEN_PART:
+				return basicSetThenPart(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 ExpressionPackage.CASE__CONDITION:
+				return getCondition();
+			case ExpressionPackage.CASE__THEN_PART:
+				return getThenPart();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.CASE__CONDITION:
+				setCondition((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.CASE__THEN_PART:
+				setThenPart((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CASE__CONDITION:
+				setCondition((AbstractExpression)null);
+				return;
+			case ExpressionPackage.CASE__THEN_PART:
+				setThenPart((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CASE__CONDITION:
+				return condition != null;
+			case ExpressionPackage.CASE__THEN_PART:
+				return thenPart != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CaseImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CastImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CastImpl.java
new file mode 100644
index 00000000..66a26bd0
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CastImpl.java
@@ -0,0 +1,247 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CastImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.Cast;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cast</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CastImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CastImpl#getTarget <em>Target</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CastImpl extends AbstractExpressionImpl implements Cast {
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier type;
+
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression target;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CastImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.CAST;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetType(Identifier newType, NotificationChain msgs) {
+		Identifier oldType = type;
+		type = newType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CAST__TYPE, oldType, newType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(Identifier newType) {
+		if (newType != type) {
+			NotificationChain msgs = null;
+			if (type != null)
+				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CAST__TYPE, null, msgs);
+			if (newType != null)
+				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CAST__TYPE, null, msgs);
+			msgs = basicSetType(newType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CAST__TYPE, newType, newType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTarget(AbstractExpression newTarget, NotificationChain msgs) {
+		AbstractExpression oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CAST__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTarget(AbstractExpression newTarget) {
+		if (newTarget != target) {
+			NotificationChain msgs = null;
+			if (target != null)
+				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CAST__TARGET, null, msgs);
+			if (newTarget != null)
+				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CAST__TARGET, null, msgs);
+			msgs = basicSetTarget(newTarget, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CAST__TARGET, newTarget, newTarget));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.CAST__TYPE:
+				return basicSetType(null, msgs);
+			case ExpressionPackage.CAST__TARGET:
+				return basicSetTarget(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 ExpressionPackage.CAST__TYPE:
+				return getType();
+			case ExpressionPackage.CAST__TARGET:
+				return getTarget();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.CAST__TYPE:
+				setType((Identifier)newValue);
+				return;
+			case ExpressionPackage.CAST__TARGET:
+				setTarget((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CAST__TYPE:
+				setType((Identifier)null);
+				return;
+			case ExpressionPackage.CAST__TARGET:
+				setTarget((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CAST__TYPE:
+				return type != null;
+			case ExpressionPackage.CAST__TARGET:
+				return target != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CastImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ChainExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ChainExpressionImpl.java
new file mode 100644
index 00000000..ce0dc17f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ChainExpressionImpl.java
@@ -0,0 +1,245 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ChainExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ChainExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Chain Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.ChainExpressionImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.ChainExpressionImpl#getNext <em>Next</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ChainExpressionImpl extends AbstractExpressionImpl implements ChainExpression {
+	/**
+	 * The cached value of the '{@link #getFirst() <em>First</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFirst()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression first;
+
+	/**
+	 * The cached value of the '{@link #getNext() <em>Next</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getNext()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression next;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ChainExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.CHAIN_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getFirst() {
+		return first;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFirst(AbstractExpression newFirst, NotificationChain msgs) {
+		AbstractExpression oldFirst = first;
+		first = newFirst;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CHAIN_EXPRESSION__FIRST, oldFirst, newFirst);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFirst(AbstractExpression newFirst) {
+		if (newFirst != first) {
+			NotificationChain msgs = null;
+			if (first != null)
+				msgs = ((InternalEObject)first).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CHAIN_EXPRESSION__FIRST, null, msgs);
+			if (newFirst != null)
+				msgs = ((InternalEObject)newFirst).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CHAIN_EXPRESSION__FIRST, null, msgs);
+			msgs = basicSetFirst(newFirst, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CHAIN_EXPRESSION__FIRST, newFirst, newFirst));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getNext() {
+		return next;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetNext(AbstractExpression newNext, NotificationChain msgs) {
+		AbstractExpression oldNext = next;
+		next = newNext;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CHAIN_EXPRESSION__NEXT, oldNext, newNext);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setNext(AbstractExpression newNext) {
+		if (newNext != next) {
+			NotificationChain msgs = null;
+			if (next != null)
+				msgs = ((InternalEObject)next).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CHAIN_EXPRESSION__NEXT, null, msgs);
+			if (newNext != null)
+				msgs = ((InternalEObject)newNext).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CHAIN_EXPRESSION__NEXT, null, msgs);
+			msgs = basicSetNext(newNext, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CHAIN_EXPRESSION__NEXT, newNext, newNext));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.CHAIN_EXPRESSION__FIRST:
+				return basicSetFirst(null, msgs);
+			case ExpressionPackage.CHAIN_EXPRESSION__NEXT:
+				return basicSetNext(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 ExpressionPackage.CHAIN_EXPRESSION__FIRST:
+				return getFirst();
+			case ExpressionPackage.CHAIN_EXPRESSION__NEXT:
+				return getNext();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.CHAIN_EXPRESSION__FIRST:
+				setFirst((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.CHAIN_EXPRESSION__NEXT:
+				setNext((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CHAIN_EXPRESSION__FIRST:
+				setFirst((AbstractExpression)null);
+				return;
+			case ExpressionPackage.CHAIN_EXPRESSION__NEXT:
+				setNext((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CHAIN_EXPRESSION__FIRST:
+				return first != null;
+			case ExpressionPackage.CHAIN_EXPRESSION__NEXT:
+				return next != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ChainExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CollectionExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CollectionExpressionImpl.java
new file mode 100644
index 00000000..108ad69b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/CollectionExpressionImpl.java
@@ -0,0 +1,247 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CollectionExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.CollectionExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Collection Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CollectionExpressionImpl#getClosure <em>Closure</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.CollectionExpressionImpl#getEleName <em>Ele Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class CollectionExpressionImpl extends FeatureCallImpl implements CollectionExpression {
+	/**
+	 * The cached value of the '{@link #getClosure() <em>Closure</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getClosure()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression closure;
+
+	/**
+	 * The cached value of the '{@link #getEleName() <em>Ele Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEleName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier eleName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CollectionExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.COLLECTION_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getClosure() {
+		return closure;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetClosure(AbstractExpression newClosure, NotificationChain msgs) {
+		AbstractExpression oldClosure = closure;
+		closure = newClosure;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE, oldClosure, newClosure);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setClosure(AbstractExpression newClosure) {
+		if (newClosure != closure) {
+			NotificationChain msgs = null;
+			if (closure != null)
+				msgs = ((InternalEObject)closure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE, null, msgs);
+			if (newClosure != null)
+				msgs = ((InternalEObject)newClosure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE, null, msgs);
+			msgs = basicSetClosure(newClosure, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE, newClosure, newClosure));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getEleName() {
+		return eleName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetEleName(Identifier newEleName, NotificationChain msgs) {
+		Identifier oldEleName = eleName;
+		eleName = newEleName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME, oldEleName, newEleName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEleName(Identifier newEleName) {
+		if (newEleName != eleName) {
+			NotificationChain msgs = null;
+			if (eleName != null)
+				msgs = ((InternalEObject)eleName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME, null, msgs);
+			if (newEleName != null)
+				msgs = ((InternalEObject)newEleName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME, null, msgs);
+			msgs = basicSetEleName(newEleName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME, newEleName, newEleName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE:
+				return basicSetClosure(null, msgs);
+			case ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME:
+				return basicSetEleName(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 ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE:
+				return getClosure();
+			case ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME:
+				return getEleName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE:
+				setClosure((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME:
+				setEleName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE:
+				setClosure((AbstractExpression)null);
+				return;
+			case ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME:
+				setEleName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.COLLECTION_EXPRESSION__CLOSURE:
+				return closure != null;
+			case ExpressionPackage.COLLECTION_EXPRESSION__ELE_NAME:
+				return eleName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //CollectionExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ConstructorCallExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ConstructorCallExpressionImpl.java
new file mode 100644
index 00000000..7671b370
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ConstructorCallExpressionImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ConstructorCallExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.ConstructorCallExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constructor Call Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.ConstructorCallExpressionImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ConstructorCallExpressionImpl extends AbstractExpressionImpl implements ConstructorCallExpression {
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier type;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ConstructorCallExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.CONSTRUCTOR_CALL_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetType(Identifier newType, NotificationChain msgs) {
+		Identifier oldType = type;
+		type = newType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE, oldType, newType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(Identifier newType) {
+		if (newType != type) {
+			NotificationChain msgs = null;
+			if (type != null)
+				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE, null, msgs);
+			if (newType != null)
+				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE, null, msgs);
+			msgs = basicSetType(newType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE, newType, newType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__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 ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE:
+				return getType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE:
+				setType((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE:
+				setType((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION__TYPE:
+				return type != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ConstructorCallExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java
new file mode 100644
index 00000000..624f1d74
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java
@@ -0,0 +1,319 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionFactoryImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ExpressionFactoryImpl extends EFactoryImpl implements ExpressionFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static ExpressionFactory init() {
+		try {
+			ExpressionFactory theExpressionFactory = (ExpressionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/expession"); 
+			if (theExpressionFactory != null) {
+				return theExpressionFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new ExpressionFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case ExpressionPackage.BOOLEAN_OPERATION: return createBooleanOperation();
+			case ExpressionPackage.CAST: return createCast();
+			case ExpressionPackage.CHAIN_EXPRESSION: return createChainExpression();
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION: return createConstructorCallExpression();
+			case ExpressionPackage.FEATURE_CALL: return createFeatureCall();
+			case ExpressionPackage.COLLECTION_EXPRESSION: return createCollectionExpression();
+			case ExpressionPackage.OPERATION_CALL: return createOperationCall();
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION: return createTypeSelectExpression();
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION: return createGlobalVarExpression();
+			case ExpressionPackage.IF_EXPRESSION: return createIfExpression();
+			case ExpressionPackage.LET_EXPRESSION: return createLetExpression();
+			case ExpressionPackage.LIST_LITERAL: return createListLiteral();
+			case ExpressionPackage.BOOLEAN_LITERAL: return createBooleanLiteral();
+			case ExpressionPackage.INTEGER_LITERAL: return createIntegerLiteral();
+			case ExpressionPackage.NULL_LITERAL: return createNullLiteral();
+			case ExpressionPackage.REAL_LITERAL: return createRealLiteral();
+			case ExpressionPackage.STRING_LITERAL: return createStringLiteral();
+			case ExpressionPackage.SWITCH_EXPRESSION: return createSwitchExpression();
+			case ExpressionPackage.CASE: return createCase();
+			case ExpressionPackage.BINARY_OPERATION: return createBinaryOperation();
+			case ExpressionPackage.UNARY_OPERATION: return createUnaryOperation();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanOperation createBooleanOperation() {
+		BooleanOperationImpl booleanOperation = new BooleanOperationImpl();
+		return booleanOperation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Cast createCast() {
+		CastImpl cast = new CastImpl();
+		return cast;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ChainExpression createChainExpression() {
+		ChainExpressionImpl chainExpression = new ChainExpressionImpl();
+		return chainExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConstructorCallExpression createConstructorCallExpression() {
+		ConstructorCallExpressionImpl constructorCallExpression = new ConstructorCallExpressionImpl();
+		return constructorCallExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FeatureCall createFeatureCall() {
+		FeatureCallImpl featureCall = new FeatureCallImpl();
+		return featureCall;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CollectionExpression createCollectionExpression() {
+		CollectionExpressionImpl collectionExpression = new CollectionExpressionImpl();
+		return collectionExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public OperationCall createOperationCall() {
+		OperationCallImpl operationCall = new OperationCallImpl();
+		return operationCall;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TypeSelectExpression createTypeSelectExpression() {
+		TypeSelectExpressionImpl typeSelectExpression = new TypeSelectExpressionImpl();
+		return typeSelectExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public GlobalVarExpression createGlobalVarExpression() {
+		GlobalVarExpressionImpl globalVarExpression = new GlobalVarExpressionImpl();
+		return globalVarExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IfExpression createIfExpression() {
+		IfExpressionImpl ifExpression = new IfExpressionImpl();
+		return ifExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LetExpression createLetExpression() {
+		LetExpressionImpl letExpression = new LetExpressionImpl();
+		return letExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ListLiteral createListLiteral() {
+		ListLiteralImpl listLiteral = new ListLiteralImpl();
+		return listLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BooleanLiteral createBooleanLiteral() {
+		BooleanLiteralImpl booleanLiteral = new BooleanLiteralImpl();
+		return booleanLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IntegerLiteral createIntegerLiteral() {
+		IntegerLiteralImpl integerLiteral = new IntegerLiteralImpl();
+		return integerLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NullLiteral createNullLiteral() {
+		NullLiteralImpl nullLiteral = new NullLiteralImpl();
+		return nullLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public RealLiteral createRealLiteral() {
+		RealLiteralImpl realLiteral = new RealLiteralImpl();
+		return realLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StringLiteral createStringLiteral() {
+		StringLiteralImpl stringLiteral = new StringLiteralImpl();
+		return stringLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public SwitchExpression createSwitchExpression() {
+		SwitchExpressionImpl switchExpression = new SwitchExpressionImpl();
+		return switchExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Case createCase() {
+		CaseImpl case_ = new CaseImpl();
+		return case_;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public BinaryOperation createBinaryOperation() {
+		BinaryOperationImpl binaryOperation = new BinaryOperationImpl();
+		return binaryOperation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UnaryOperation createUnaryOperation() {
+		UnaryOperationImpl unaryOperation = new UnaryOperationImpl();
+		return unaryOperation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionPackage getExpressionPackage() {
+		return (ExpressionPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static ExpressionPackage getPackage() {
+		return ExpressionPackage.eINSTANCE;
+	}
+
+} //ExpressionFactoryImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionPackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionPackageImpl.java
new file mode 100644
index 00000000..96bc3205
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionPackageImpl.java
@@ -0,0 +1,1015 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionPackageImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+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.xpand3.Xpand3Package;
+
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+import org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.BinaryOperation;
+import org.eclipse.xpand3.expression.BooleanLiteral;
+import org.eclipse.xpand3.expression.BooleanOperation;
+import org.eclipse.xpand3.expression.Case;
+import org.eclipse.xpand3.expression.Cast;
+import org.eclipse.xpand3.expression.ChainExpression;
+import org.eclipse.xpand3.expression.CollectionExpression;
+import org.eclipse.xpand3.expression.ConstructorCallExpression;
+import org.eclipse.xpand3.expression.ExpressionFactory;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.FeatureCall;
+import org.eclipse.xpand3.expression.GlobalVarExpression;
+import org.eclipse.xpand3.expression.IfExpression;
+import org.eclipse.xpand3.expression.IntegerLiteral;
+import org.eclipse.xpand3.expression.LetExpression;
+import org.eclipse.xpand3.expression.ListLiteral;
+import org.eclipse.xpand3.expression.Literal;
+import org.eclipse.xpand3.expression.NullLiteral;
+import org.eclipse.xpand3.expression.OperationCall;
+import org.eclipse.xpand3.expression.RealLiteral;
+import org.eclipse.xpand3.expression.StringLiteral;
+import org.eclipse.xpand3.expression.SwitchExpression;
+import org.eclipse.xpand3.expression.TypeSelectExpression;
+import org.eclipse.xpand3.expression.UnaryOperation;
+
+import org.eclipse.xpand3.impl.Xpand3PackageImpl;
+
+import org.eclipse.xpand3.statement.StatementPackage;
+
+import org.eclipse.xpand3.statement.impl.StatementPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ExpressionPackageImpl extends EPackageImpl implements ExpressionPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanOperationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass castEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass chainExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass constructorCallExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass featureCallEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass collectionExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass operationCallEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass typeSelectExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass globalVarExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass ifExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass letExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass listLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass literalEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass booleanLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass integerLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass nullLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass realLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass stringLiteralEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass switchExpressionEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass caseEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass binaryOperationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass unaryOperationEClass = 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.xpand3.expression.ExpressionPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private ExpressionPackageImpl() {
+		super(eNS_URI, ExpressionFactory.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 ExpressionPackage init() {
+		if (isInited) return (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
+
+		// Obtain or create and register package
+		ExpressionPackageImpl theExpressionPackage = (ExpressionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ExpressionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ExpressionPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		Xpand3PackageImpl theXpand3Package = (Xpand3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) instanceof Xpand3PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) : Xpand3Package.eINSTANCE);
+		StatementPackageImpl theStatementPackage = (StatementPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) instanceof StatementPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) : StatementPackage.eINSTANCE);
+		DeclarationPackageImpl theDeclarationPackage = (DeclarationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) instanceof DeclarationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) : DeclarationPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theExpressionPackage.createPackageContents();
+		theXpand3Package.createPackageContents();
+		theStatementPackage.createPackageContents();
+		theDeclarationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theExpressionPackage.initializePackageContents();
+		theXpand3Package.initializePackageContents();
+		theStatementPackage.initializePackageContents();
+		theDeclarationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theExpressionPackage.freeze();
+
+		return theExpressionPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractExpression() {
+		return abstractExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getBooleanOperation() {
+		return booleanOperationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCast() {
+		return castEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCast_Type() {
+		return (EReference)castEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCast_Target() {
+		return (EReference)castEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getChainExpression() {
+		return chainExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChainExpression_First() {
+		return (EReference)chainExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getChainExpression_Next() {
+		return (EReference)chainExpressionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getConstructorCallExpression() {
+		return constructorCallExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getConstructorCallExpression_Type() {
+		return (EReference)constructorCallExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getFeatureCall() {
+		return featureCallEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFeatureCall_Target() {
+		return (EReference)featureCallEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFeatureCall_Name() {
+		return (EReference)featureCallEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCollectionExpression() {
+		return collectionExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCollectionExpression_Closure() {
+		return (EReference)collectionExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCollectionExpression_EleName() {
+		return (EReference)collectionExpressionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getOperationCall() {
+		return operationCallEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getOperationCall_Params() {
+		return (EReference)operationCallEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getTypeSelectExpression() {
+		return typeSelectExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getTypeSelectExpression_TypeLiteral() {
+		return (EReference)typeSelectExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getGlobalVarExpression() {
+		return globalVarExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getGlobalVarExpression_GlobalVarName() {
+		return (EReference)globalVarExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIfExpression() {
+		return ifExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIfExpression_Condition() {
+		return (EReference)ifExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIfExpression_ThenPart() {
+		return (EReference)ifExpressionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIfExpression_ElsePart() {
+		return (EReference)ifExpressionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getLetExpression() {
+		return letExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLetExpression_VarExpression() {
+		return (EReference)letExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLetExpression_TargetExpression() {
+		return (EReference)letExpressionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLetExpression_VarName() {
+		return (EReference)letExpressionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getListLiteral() {
+		return listLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getListLiteral_Elements() {
+		return (EReference)listLiteralEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getLiteral() {
+		return literalEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLiteral_LiteralValue() {
+		return (EReference)literalEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getBooleanLiteral() {
+		return booleanLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIntegerLiteral() {
+		return integerLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getNullLiteral() {
+		return nullLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getRealLiteral() {
+		return realLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getStringLiteral() {
+		return stringLiteralEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getSwitchExpression() {
+		return switchExpressionEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getSwitchExpression_SwitchExpr() {
+		return (EReference)switchExpressionEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getSwitchExpression_DefaultExpr() {
+		return (EReference)switchExpressionEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getSwitchExpression_Cases() {
+		return (EReference)switchExpressionEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCase() {
+		return caseEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCase_Condition() {
+		return (EReference)caseEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCase_ThenPart() {
+		return (EReference)caseEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getBinaryOperation() {
+		return binaryOperationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getBinaryOperation_Left() {
+		return (EReference)binaryOperationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getBinaryOperation_Right() {
+		return (EReference)binaryOperationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getBinaryOperation_Operator() {
+		return (EReference)binaryOperationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUnaryOperation() {
+		return unaryOperationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUnaryOperation_Operator() {
+		return (EReference)unaryOperationEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUnaryOperation_Operand() {
+		return (EReference)unaryOperationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionFactory getExpressionFactory() {
+		return (ExpressionFactory)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
+		abstractExpressionEClass = createEClass(ABSTRACT_EXPRESSION);
+
+		booleanOperationEClass = createEClass(BOOLEAN_OPERATION);
+
+		castEClass = createEClass(CAST);
+		createEReference(castEClass, CAST__TYPE);
+		createEReference(castEClass, CAST__TARGET);
+
+		chainExpressionEClass = createEClass(CHAIN_EXPRESSION);
+		createEReference(chainExpressionEClass, CHAIN_EXPRESSION__FIRST);
+		createEReference(chainExpressionEClass, CHAIN_EXPRESSION__NEXT);
+
+		constructorCallExpressionEClass = createEClass(CONSTRUCTOR_CALL_EXPRESSION);
+		createEReference(constructorCallExpressionEClass, CONSTRUCTOR_CALL_EXPRESSION__TYPE);
+
+		featureCallEClass = createEClass(FEATURE_CALL);
+		createEReference(featureCallEClass, FEATURE_CALL__TARGET);
+		createEReference(featureCallEClass, FEATURE_CALL__NAME);
+
+		collectionExpressionEClass = createEClass(COLLECTION_EXPRESSION);
+		createEReference(collectionExpressionEClass, COLLECTION_EXPRESSION__CLOSURE);
+		createEReference(collectionExpressionEClass, COLLECTION_EXPRESSION__ELE_NAME);
+
+		operationCallEClass = createEClass(OPERATION_CALL);
+		createEReference(operationCallEClass, OPERATION_CALL__PARAMS);
+
+		typeSelectExpressionEClass = createEClass(TYPE_SELECT_EXPRESSION);
+		createEReference(typeSelectExpressionEClass, TYPE_SELECT_EXPRESSION__TYPE_LITERAL);
+
+		globalVarExpressionEClass = createEClass(GLOBAL_VAR_EXPRESSION);
+		createEReference(globalVarExpressionEClass, GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME);
+
+		ifExpressionEClass = createEClass(IF_EXPRESSION);
+		createEReference(ifExpressionEClass, IF_EXPRESSION__CONDITION);
+		createEReference(ifExpressionEClass, IF_EXPRESSION__THEN_PART);
+		createEReference(ifExpressionEClass, IF_EXPRESSION__ELSE_PART);
+
+		letExpressionEClass = createEClass(LET_EXPRESSION);
+		createEReference(letExpressionEClass, LET_EXPRESSION__VAR_EXPRESSION);
+		createEReference(letExpressionEClass, LET_EXPRESSION__TARGET_EXPRESSION);
+		createEReference(letExpressionEClass, LET_EXPRESSION__VAR_NAME);
+
+		listLiteralEClass = createEClass(LIST_LITERAL);
+		createEReference(listLiteralEClass, LIST_LITERAL__ELEMENTS);
+
+		literalEClass = createEClass(LITERAL);
+		createEReference(literalEClass, LITERAL__LITERAL_VALUE);
+
+		booleanLiteralEClass = createEClass(BOOLEAN_LITERAL);
+
+		integerLiteralEClass = createEClass(INTEGER_LITERAL);
+
+		nullLiteralEClass = createEClass(NULL_LITERAL);
+
+		realLiteralEClass = createEClass(REAL_LITERAL);
+
+		stringLiteralEClass = createEClass(STRING_LITERAL);
+
+		switchExpressionEClass = createEClass(SWITCH_EXPRESSION);
+		createEReference(switchExpressionEClass, SWITCH_EXPRESSION__SWITCH_EXPR);
+		createEReference(switchExpressionEClass, SWITCH_EXPRESSION__DEFAULT_EXPR);
+		createEReference(switchExpressionEClass, SWITCH_EXPRESSION__CASES);
+
+		caseEClass = createEClass(CASE);
+		createEReference(caseEClass, CASE__CONDITION);
+		createEReference(caseEClass, CASE__THEN_PART);
+
+		binaryOperationEClass = createEClass(BINARY_OPERATION);
+		createEReference(binaryOperationEClass, BINARY_OPERATION__LEFT);
+		createEReference(binaryOperationEClass, BINARY_OPERATION__RIGHT);
+		createEReference(binaryOperationEClass, BINARY_OPERATION__OPERATOR);
+
+		unaryOperationEClass = createEClass(UNARY_OPERATION);
+		createEReference(unaryOperationEClass, UNARY_OPERATION__OPERATOR);
+		createEReference(unaryOperationEClass, UNARY_OPERATION__OPERAND);
+	}
+
+	/**
+	 * <!-- 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);
+
+		// Obtain other dependent packages
+		Xpand3Package theXpand3Package = (Xpand3Package)EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractExpressionEClass.getESuperTypes().add(theXpand3Package.getSyntaxElement());
+		booleanOperationEClass.getESuperTypes().add(this.getBinaryOperation());
+		castEClass.getESuperTypes().add(this.getAbstractExpression());
+		chainExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		constructorCallExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		featureCallEClass.getESuperTypes().add(this.getAbstractExpression());
+		collectionExpressionEClass.getESuperTypes().add(this.getFeatureCall());
+		operationCallEClass.getESuperTypes().add(this.getFeatureCall());
+		typeSelectExpressionEClass.getESuperTypes().add(this.getFeatureCall());
+		globalVarExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		ifExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		letExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		listLiteralEClass.getESuperTypes().add(this.getAbstractExpression());
+		literalEClass.getESuperTypes().add(this.getAbstractExpression());
+		booleanLiteralEClass.getESuperTypes().add(this.getLiteral());
+		integerLiteralEClass.getESuperTypes().add(this.getLiteral());
+		nullLiteralEClass.getESuperTypes().add(this.getLiteral());
+		realLiteralEClass.getESuperTypes().add(this.getLiteral());
+		stringLiteralEClass.getESuperTypes().add(this.getLiteral());
+		switchExpressionEClass.getESuperTypes().add(this.getAbstractExpression());
+		caseEClass.getESuperTypes().add(theXpand3Package.getSyntaxElement());
+		binaryOperationEClass.getESuperTypes().add(this.getAbstractExpression());
+		unaryOperationEClass.getESuperTypes().add(this.getAbstractExpression());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(abstractExpressionEClass, AbstractExpression.class, "AbstractExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(booleanOperationEClass, BooleanOperation.class, "BooleanOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(castEClass, Cast.class, "Cast", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCast_Type(), theXpand3Package.getIdentifier(), null, "type", null, 0, 1, Cast.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCast_Target(), this.getAbstractExpression(), null, "target", null, 0, 1, Cast.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(chainExpressionEClass, ChainExpression.class, "ChainExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getChainExpression_First(), this.getAbstractExpression(), null, "first", null, 0, 1, ChainExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getChainExpression_Next(), this.getAbstractExpression(), null, "next", null, 0, 1, ChainExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(constructorCallExpressionEClass, ConstructorCallExpression.class, "ConstructorCallExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getConstructorCallExpression_Type(), theXpand3Package.getIdentifier(), null, "type", null, 0, 1, ConstructorCallExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(featureCallEClass, FeatureCall.class, "FeatureCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFeatureCall_Target(), this.getAbstractExpression(), null, "target", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFeatureCall_Name(), theXpand3Package.getIdentifier(), null, "name", null, 0, 1, FeatureCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(collectionExpressionEClass, CollectionExpression.class, "CollectionExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCollectionExpression_Closure(), this.getAbstractExpression(), null, "closure", null, 0, 1, CollectionExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCollectionExpression_EleName(), theXpand3Package.getIdentifier(), null, "eleName", null, 0, 1, CollectionExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(operationCallEClass, OperationCall.class, "OperationCall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getOperationCall_Params(), this.getAbstractExpression(), null, "params", null, 0, -1, OperationCall.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(typeSelectExpressionEClass, TypeSelectExpression.class, "TypeSelectExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTypeSelectExpression_TypeLiteral(), theXpand3Package.getIdentifier(), null, "typeLiteral", null, 0, 1, TypeSelectExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(globalVarExpressionEClass, GlobalVarExpression.class, "GlobalVarExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getGlobalVarExpression_GlobalVarName(), theXpand3Package.getIdentifier(), null, "globalVarName", null, 0, 1, GlobalVarExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(ifExpressionEClass, IfExpression.class, "IfExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getIfExpression_Condition(), this.getAbstractExpression(), null, "condition", null, 0, 1, IfExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfExpression_ThenPart(), this.getAbstractExpression(), null, "thenPart", null, 0, 1, IfExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfExpression_ElsePart(), this.getAbstractExpression(), null, "elsePart", null, 0, 1, IfExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(letExpressionEClass, LetExpression.class, "LetExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLetExpression_VarExpression(), this.getAbstractExpression(), null, "varExpression", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLetExpression_TargetExpression(), this.getAbstractExpression(), null, "targetExpression", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLetExpression_VarName(), theXpand3Package.getIdentifier(), null, "varName", null, 0, 1, LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(listLiteralEClass, ListLiteral.class, "ListLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getListLiteral_Elements(), this.getAbstractExpression(), null, "elements", null, 0, -1, ListLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(literalEClass, Literal.class, "Literal", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLiteral_LiteralValue(), theXpand3Package.getIdentifier(), null, "literalValue", null, 0, 1, Literal.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(booleanLiteralEClass, BooleanLiteral.class, "BooleanLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(integerLiteralEClass, IntegerLiteral.class, "IntegerLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(nullLiteralEClass, NullLiteral.class, "NullLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(switchExpressionEClass, SwitchExpression.class, "SwitchExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSwitchExpression_SwitchExpr(), this.getAbstractExpression(), null, "switchExpr", null, 0, 1, SwitchExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSwitchExpression_DefaultExpr(), this.getAbstractExpression(), null, "defaultExpr", null, 0, 1, SwitchExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSwitchExpression_Cases(), this.getCase(), null, "cases", null, 0, -1, SwitchExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(caseEClass, Case.class, "Case", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCase_Condition(), this.getAbstractExpression(), null, "condition", null, 0, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCase_ThenPart(), this.getAbstractExpression(), null, "thenPart", null, 0, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(binaryOperationEClass, BinaryOperation.class, "BinaryOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getBinaryOperation_Left(), this.getAbstractExpression(), null, "left", null, 0, 1, BinaryOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBinaryOperation_Right(), this.getAbstractExpression(), null, "right", null, 0, 1, BinaryOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getBinaryOperation_Operator(), theXpand3Package.getIdentifier(), null, "operator", null, 0, 1, BinaryOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(unaryOperationEClass, UnaryOperation.class, "UnaryOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getUnaryOperation_Operator(), theXpand3Package.getIdentifier(), null, "operator", null, 0, 1, UnaryOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUnaryOperation_Operand(), this.getAbstractExpression(), null, "operand", null, 0, 1, UnaryOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+	}
+
+} //ExpressionPackageImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/FeatureCallImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/FeatureCallImpl.java
new file mode 100644
index 00000000..c24e67eb
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/FeatureCallImpl.java
@@ -0,0 +1,247 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FeatureCallImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.FeatureCall;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Feature Call</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.FeatureCallImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.FeatureCallImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FeatureCallImpl extends AbstractExpressionImpl implements FeatureCall {
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression target;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FeatureCallImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.FEATURE_CALL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTarget(AbstractExpression newTarget, NotificationChain msgs) {
+		AbstractExpression oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.FEATURE_CALL__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTarget(AbstractExpression newTarget) {
+		if (newTarget != target) {
+			NotificationChain msgs = null;
+			if (target != null)
+				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.FEATURE_CALL__TARGET, null, msgs);
+			if (newTarget != null)
+				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.FEATURE_CALL__TARGET, null, msgs);
+			msgs = basicSetTarget(newTarget, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.FEATURE_CALL__TARGET, newTarget, newTarget));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetName(Identifier newName, NotificationChain msgs) {
+		Identifier oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.FEATURE_CALL__NAME, oldName, newName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(Identifier newName) {
+		if (newName != name) {
+			NotificationChain msgs = null;
+			if (name != null)
+				msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.FEATURE_CALL__NAME, null, msgs);
+			if (newName != null)
+				msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.FEATURE_CALL__NAME, null, msgs);
+			msgs = basicSetName(newName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.FEATURE_CALL__NAME, newName, newName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.FEATURE_CALL__TARGET:
+				return basicSetTarget(null, msgs);
+			case ExpressionPackage.FEATURE_CALL__NAME:
+				return basicSetName(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 ExpressionPackage.FEATURE_CALL__TARGET:
+				return getTarget();
+			case ExpressionPackage.FEATURE_CALL__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 ExpressionPackage.FEATURE_CALL__TARGET:
+				setTarget((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.FEATURE_CALL__NAME:
+				setName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.FEATURE_CALL__TARGET:
+				setTarget((AbstractExpression)null);
+				return;
+			case ExpressionPackage.FEATURE_CALL__NAME:
+				setName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.FEATURE_CALL__TARGET:
+				return target != null;
+			case ExpressionPackage.FEATURE_CALL__NAME:
+				return name != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //FeatureCallImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/GlobalVarExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/GlobalVarExpressionImpl.java
new file mode 100644
index 00000000..8b1a0cf9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/GlobalVarExpressionImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: GlobalVarExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.GlobalVarExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Global Var Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.GlobalVarExpressionImpl#getGlobalVarName <em>Global Var Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class GlobalVarExpressionImpl extends AbstractExpressionImpl implements GlobalVarExpression {
+	/**
+	 * The cached value of the '{@link #getGlobalVarName() <em>Global Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getGlobalVarName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier globalVarName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected GlobalVarExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.GLOBAL_VAR_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getGlobalVarName() {
+		return globalVarName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetGlobalVarName(Identifier newGlobalVarName, NotificationChain msgs) {
+		Identifier oldGlobalVarName = globalVarName;
+		globalVarName = newGlobalVarName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME, oldGlobalVarName, newGlobalVarName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setGlobalVarName(Identifier newGlobalVarName) {
+		if (newGlobalVarName != globalVarName) {
+			NotificationChain msgs = null;
+			if (globalVarName != null)
+				msgs = ((InternalEObject)globalVarName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME, null, msgs);
+			if (newGlobalVarName != null)
+				msgs = ((InternalEObject)newGlobalVarName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME, null, msgs);
+			msgs = basicSetGlobalVarName(newGlobalVarName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME, newGlobalVarName, newGlobalVarName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME:
+				return basicSetGlobalVarName(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 ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME:
+				return getGlobalVarName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME:
+				setGlobalVarName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME:
+				setGlobalVarName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION__GLOBAL_VAR_NAME:
+				return globalVarName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //GlobalVarExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IfExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IfExpressionImpl.java
new file mode 100644
index 00000000..022b3876
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IfExpressionImpl.java
@@ -0,0 +1,311 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.IfExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>If Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.IfExpressionImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.IfExpressionImpl#getThenPart <em>Then Part</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.IfExpressionImpl#getElsePart <em>Else Part</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class IfExpressionImpl extends AbstractExpressionImpl implements IfExpression {
+	/**
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCondition()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression condition;
+
+	/**
+	 * The cached value of the '{@link #getThenPart() <em>Then Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getThenPart()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression thenPart;
+
+	/**
+	 * The cached value of the '{@link #getElsePart() <em>Else Part</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElsePart()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression elsePart;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IfExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.IF_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getCondition() {
+		return condition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCondition(AbstractExpression newCondition, NotificationChain msgs) {
+		AbstractExpression oldCondition = condition;
+		condition = newCondition;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__CONDITION, oldCondition, newCondition);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCondition(AbstractExpression newCondition) {
+		if (newCondition != condition) {
+			NotificationChain msgs = null;
+			if (condition != null)
+				msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__CONDITION, null, msgs);
+			if (newCondition != null)
+				msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__CONDITION, null, msgs);
+			msgs = basicSetCondition(newCondition, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__CONDITION, newCondition, newCondition));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getThenPart() {
+		return thenPart;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetThenPart(AbstractExpression newThenPart, NotificationChain msgs) {
+		AbstractExpression oldThenPart = thenPart;
+		thenPart = newThenPart;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__THEN_PART, oldThenPart, newThenPart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setThenPart(AbstractExpression newThenPart) {
+		if (newThenPart != thenPart) {
+			NotificationChain msgs = null;
+			if (thenPart != null)
+				msgs = ((InternalEObject)thenPart).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__THEN_PART, null, msgs);
+			if (newThenPart != null)
+				msgs = ((InternalEObject)newThenPart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__THEN_PART, null, msgs);
+			msgs = basicSetThenPart(newThenPart, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__THEN_PART, newThenPart, newThenPart));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getElsePart() {
+		return elsePart;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetElsePart(AbstractExpression newElsePart, NotificationChain msgs) {
+		AbstractExpression oldElsePart = elsePart;
+		elsePart = newElsePart;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__ELSE_PART, oldElsePart, newElsePart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setElsePart(AbstractExpression newElsePart) {
+		if (newElsePart != elsePart) {
+			NotificationChain msgs = null;
+			if (elsePart != null)
+				msgs = ((InternalEObject)elsePart).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__ELSE_PART, null, msgs);
+			if (newElsePart != null)
+				msgs = ((InternalEObject)newElsePart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.IF_EXPRESSION__ELSE_PART, null, msgs);
+			msgs = basicSetElsePart(newElsePart, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.IF_EXPRESSION__ELSE_PART, newElsePart, newElsePart));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.IF_EXPRESSION__CONDITION:
+				return basicSetCondition(null, msgs);
+			case ExpressionPackage.IF_EXPRESSION__THEN_PART:
+				return basicSetThenPart(null, msgs);
+			case ExpressionPackage.IF_EXPRESSION__ELSE_PART:
+				return basicSetElsePart(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 ExpressionPackage.IF_EXPRESSION__CONDITION:
+				return getCondition();
+			case ExpressionPackage.IF_EXPRESSION__THEN_PART:
+				return getThenPart();
+			case ExpressionPackage.IF_EXPRESSION__ELSE_PART:
+				return getElsePart();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.IF_EXPRESSION__CONDITION:
+				setCondition((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.IF_EXPRESSION__THEN_PART:
+				setThenPart((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.IF_EXPRESSION__ELSE_PART:
+				setElsePart((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.IF_EXPRESSION__CONDITION:
+				setCondition((AbstractExpression)null);
+				return;
+			case ExpressionPackage.IF_EXPRESSION__THEN_PART:
+				setThenPart((AbstractExpression)null);
+				return;
+			case ExpressionPackage.IF_EXPRESSION__ELSE_PART:
+				setElsePart((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.IF_EXPRESSION__CONDITION:
+				return condition != null;
+			case ExpressionPackage.IF_EXPRESSION__THEN_PART:
+				return thenPart != null;
+			case ExpressionPackage.IF_EXPRESSION__ELSE_PART:
+				return elsePart != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //IfExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IntegerLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IntegerLiteralImpl.java
new file mode 100644
index 00000000..4df8ed38
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/IntegerLiteralImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IntegerLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.IntegerLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Integer Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class IntegerLiteralImpl extends LiteralImpl implements IntegerLiteral {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IntegerLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.INTEGER_LITERAL;
+	}
+
+} //IntegerLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LetExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LetExpressionImpl.java
new file mode 100644
index 00000000..f07743b4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LetExpressionImpl.java
@@ -0,0 +1,313 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.LetExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Let Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.LetExpressionImpl#getVarExpression <em>Var Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.LetExpressionImpl#getTargetExpression <em>Target Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.LetExpressionImpl#getVarName <em>Var Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class LetExpressionImpl extends AbstractExpressionImpl implements LetExpression {
+	/**
+	 * The cached value of the '{@link #getVarExpression() <em>Var Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVarExpression()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression varExpression;
+
+	/**
+	 * The cached value of the '{@link #getTargetExpression() <em>Target Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetExpression()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression targetExpression;
+
+	/**
+	 * The cached value of the '{@link #getVarName() <em>Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVarName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier varName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LetExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.LET_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getVarExpression() {
+		return varExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVarExpression(AbstractExpression newVarExpression, NotificationChain msgs) {
+		AbstractExpression oldVarExpression = varExpression;
+		varExpression = newVarExpression;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION, oldVarExpression, newVarExpression);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVarExpression(AbstractExpression newVarExpression) {
+		if (newVarExpression != varExpression) {
+			NotificationChain msgs = null;
+			if (varExpression != null)
+				msgs = ((InternalEObject)varExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION, null, msgs);
+			if (newVarExpression != null)
+				msgs = ((InternalEObject)newVarExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION, null, msgs);
+			msgs = basicSetVarExpression(newVarExpression, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION, newVarExpression, newVarExpression));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getTargetExpression() {
+		return targetExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTargetExpression(AbstractExpression newTargetExpression, NotificationChain msgs) {
+		AbstractExpression oldTargetExpression = targetExpression;
+		targetExpression = newTargetExpression;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION, oldTargetExpression, newTargetExpression);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTargetExpression(AbstractExpression newTargetExpression) {
+		if (newTargetExpression != targetExpression) {
+			NotificationChain msgs = null;
+			if (targetExpression != null)
+				msgs = ((InternalEObject)targetExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION, null, msgs);
+			if (newTargetExpression != null)
+				msgs = ((InternalEObject)newTargetExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION, null, msgs);
+			msgs = basicSetTargetExpression(newTargetExpression, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION, newTargetExpression, newTargetExpression));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getVarName() {
+		return varName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVarName(Identifier newVarName, NotificationChain msgs) {
+		Identifier oldVarName = varName;
+		varName = newVarName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__VAR_NAME, oldVarName, newVarName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVarName(Identifier newVarName) {
+		if (newVarName != varName) {
+			NotificationChain msgs = null;
+			if (varName != null)
+				msgs = ((InternalEObject)varName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__VAR_NAME, null, msgs);
+			if (newVarName != null)
+				msgs = ((InternalEObject)newVarName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LET_EXPRESSION__VAR_NAME, null, msgs);
+			msgs = basicSetVarName(newVarName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.LET_EXPRESSION__VAR_NAME, newVarName, newVarName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION:
+				return basicSetVarExpression(null, msgs);
+			case ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION:
+				return basicSetTargetExpression(null, msgs);
+			case ExpressionPackage.LET_EXPRESSION__VAR_NAME:
+				return basicSetVarName(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 ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION:
+				return getVarExpression();
+			case ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION:
+				return getTargetExpression();
+			case ExpressionPackage.LET_EXPRESSION__VAR_NAME:
+				return getVarName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION:
+				setVarExpression((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION:
+				setTargetExpression((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.LET_EXPRESSION__VAR_NAME:
+				setVarName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION:
+				setVarExpression((AbstractExpression)null);
+				return;
+			case ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION:
+				setTargetExpression((AbstractExpression)null);
+				return;
+			case ExpressionPackage.LET_EXPRESSION__VAR_NAME:
+				setVarName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LET_EXPRESSION__VAR_EXPRESSION:
+				return varExpression != null;
+			case ExpressionPackage.LET_EXPRESSION__TARGET_EXPRESSION:
+				return targetExpression != null;
+			case ExpressionPackage.LET_EXPRESSION__VAR_NAME:
+				return varName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //LetExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ListLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ListLiteralImpl.java
new file mode 100644
index 00000000..27509fc9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ListLiteralImpl.java
@@ -0,0 +1,154 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ListLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.ListLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>List Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.ListLiteralImpl#getElements <em>Elements</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ListLiteralImpl extends AbstractExpressionImpl implements ListLiteral {
+	/**
+	 * 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<AbstractExpression> elements;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ListLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.LIST_LITERAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractExpression> getElements() {
+		if (elements == null) {
+			elements = new EObjectContainmentEList<AbstractExpression>(AbstractExpression.class, this, ExpressionPackage.LIST_LITERAL__ELEMENTS);
+		}
+		return elements;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.LIST_LITERAL__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 ExpressionPackage.LIST_LITERAL__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 ExpressionPackage.LIST_LITERAL__ELEMENTS:
+				getElements().clear();
+				getElements().addAll((Collection<? extends AbstractExpression>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LIST_LITERAL__ELEMENTS:
+				getElements().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LIST_LITERAL__ELEMENTS:
+				return elements != null && !elements.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ListLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LiteralImpl.java
new file mode 100644
index 00000000..57af9b46
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/LiteralImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.Literal;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.LiteralImpl#getLiteralValue <em>Literal Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class LiteralImpl extends AbstractExpressionImpl implements Literal {
+	/**
+	 * The cached value of the '{@link #getLiteralValue() <em>Literal Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLiteralValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier literalValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.LITERAL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getLiteralValue() {
+		return literalValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLiteralValue(Identifier newLiteralValue, NotificationChain msgs) {
+		Identifier oldLiteralValue = literalValue;
+		literalValue = newLiteralValue;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.LITERAL__LITERAL_VALUE, oldLiteralValue, newLiteralValue);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLiteralValue(Identifier newLiteralValue) {
+		if (newLiteralValue != literalValue) {
+			NotificationChain msgs = null;
+			if (literalValue != null)
+				msgs = ((InternalEObject)literalValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LITERAL__LITERAL_VALUE, null, msgs);
+			if (newLiteralValue != null)
+				msgs = ((InternalEObject)newLiteralValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.LITERAL__LITERAL_VALUE, null, msgs);
+			msgs = basicSetLiteralValue(newLiteralValue, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.LITERAL__LITERAL_VALUE, newLiteralValue, newLiteralValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.LITERAL__LITERAL_VALUE:
+				return basicSetLiteralValue(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 ExpressionPackage.LITERAL__LITERAL_VALUE:
+				return getLiteralValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.LITERAL__LITERAL_VALUE:
+				setLiteralValue((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LITERAL__LITERAL_VALUE:
+				setLiteralValue((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.LITERAL__LITERAL_VALUE:
+				return literalValue != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //LiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/NullLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/NullLiteralImpl.java
new file mode 100644
index 00000000..0bfb3a04
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/NullLiteralImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: NullLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.NullLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Null Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class NullLiteralImpl extends LiteralImpl implements NullLiteral {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected NullLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.NULL_LITERAL;
+	}
+
+} //NullLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/OperationCallImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/OperationCallImpl.java
new file mode 100644
index 00000000..2a2b39c9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/OperationCallImpl.java
@@ -0,0 +1,154 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: OperationCallImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.OperationCall;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Operation Call</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.OperationCallImpl#getParams <em>Params</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class OperationCallImpl extends FeatureCallImpl implements OperationCall {
+	/**
+	 * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParams()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractExpression> params;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected OperationCallImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.OPERATION_CALL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractExpression> getParams() {
+		if (params == null) {
+			params = new EObjectContainmentEList<AbstractExpression>(AbstractExpression.class, this, ExpressionPackage.OPERATION_CALL__PARAMS);
+		}
+		return params;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.OPERATION_CALL__PARAMS:
+				return ((InternalEList<?>)getParams()).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 ExpressionPackage.OPERATION_CALL__PARAMS:
+				return getParams();
+		}
+		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 ExpressionPackage.OPERATION_CALL__PARAMS:
+				getParams().clear();
+				getParams().addAll((Collection<? extends AbstractExpression>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.OPERATION_CALL__PARAMS:
+				getParams().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.OPERATION_CALL__PARAMS:
+				return params != null && !params.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //OperationCallImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/RealLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/RealLiteralImpl.java
new file mode 100644
index 00000000..cb4d13d4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/RealLiteralImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RealLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.RealLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Real Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class RealLiteralImpl extends LiteralImpl implements RealLiteral {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected RealLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.REAL_LITERAL;
+	}
+
+} //RealLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/StringLiteralImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/StringLiteralImpl.java
new file mode 100644
index 00000000..6977f971
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/StringLiteralImpl.java
@@ -0,0 +1,43 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StringLiteralImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.StringLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class StringLiteralImpl extends LiteralImpl implements StringLiteral {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StringLiteralImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.STRING_LITERAL;
+	}
+
+} //StringLiteralImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/SwitchExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/SwitchExpressionImpl.java
new file mode 100644
index 00000000..4dcc91b2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/SwitchExpressionImpl.java
@@ -0,0 +1,290 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SwitchExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.Case;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.SwitchExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Switch Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.SwitchExpressionImpl#getSwitchExpr <em>Switch Expr</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.SwitchExpressionImpl#getDefaultExpr <em>Default Expr</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.SwitchExpressionImpl#getCases <em>Cases</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class SwitchExpressionImpl extends AbstractExpressionImpl implements SwitchExpression {
+	/**
+	 * The cached value of the '{@link #getSwitchExpr() <em>Switch Expr</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSwitchExpr()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression switchExpr;
+
+	/**
+	 * The cached value of the '{@link #getDefaultExpr() <em>Default Expr</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefaultExpr()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression defaultExpr;
+
+	/**
+	 * The cached value of the '{@link #getCases() <em>Cases</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCases()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Case> cases;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SwitchExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.SWITCH_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getSwitchExpr() {
+		return switchExpr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSwitchExpr(AbstractExpression newSwitchExpr, NotificationChain msgs) {
+		AbstractExpression oldSwitchExpr = switchExpr;
+		switchExpr = newSwitchExpr;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR, oldSwitchExpr, newSwitchExpr);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSwitchExpr(AbstractExpression newSwitchExpr) {
+		if (newSwitchExpr != switchExpr) {
+			NotificationChain msgs = null;
+			if (switchExpr != null)
+				msgs = ((InternalEObject)switchExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR, null, msgs);
+			if (newSwitchExpr != null)
+				msgs = ((InternalEObject)newSwitchExpr).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR, null, msgs);
+			msgs = basicSetSwitchExpr(newSwitchExpr, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR, newSwitchExpr, newSwitchExpr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getDefaultExpr() {
+		return defaultExpr;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDefaultExpr(AbstractExpression newDefaultExpr, NotificationChain msgs) {
+		AbstractExpression oldDefaultExpr = defaultExpr;
+		defaultExpr = newDefaultExpr;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR, oldDefaultExpr, newDefaultExpr);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefaultExpr(AbstractExpression newDefaultExpr) {
+		if (newDefaultExpr != defaultExpr) {
+			NotificationChain msgs = null;
+			if (defaultExpr != null)
+				msgs = ((InternalEObject)defaultExpr).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR, null, msgs);
+			if (newDefaultExpr != null)
+				msgs = ((InternalEObject)newDefaultExpr).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR, null, msgs);
+			msgs = basicSetDefaultExpr(newDefaultExpr, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR, newDefaultExpr, newDefaultExpr));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Case> getCases() {
+		if (cases == null) {
+			cases = new EObjectContainmentEList<Case>(Case.class, this, ExpressionPackage.SWITCH_EXPRESSION__CASES);
+		}
+		return cases;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR:
+				return basicSetSwitchExpr(null, msgs);
+			case ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR:
+				return basicSetDefaultExpr(null, msgs);
+			case ExpressionPackage.SWITCH_EXPRESSION__CASES:
+				return ((InternalEList<?>)getCases()).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 ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR:
+				return getSwitchExpr();
+			case ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR:
+				return getDefaultExpr();
+			case ExpressionPackage.SWITCH_EXPRESSION__CASES:
+				return getCases();
+		}
+		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 ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR:
+				setSwitchExpr((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR:
+				setDefaultExpr((AbstractExpression)newValue);
+				return;
+			case ExpressionPackage.SWITCH_EXPRESSION__CASES:
+				getCases().clear();
+				getCases().addAll((Collection<? extends Case>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR:
+				setSwitchExpr((AbstractExpression)null);
+				return;
+			case ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR:
+				setDefaultExpr((AbstractExpression)null);
+				return;
+			case ExpressionPackage.SWITCH_EXPRESSION__CASES:
+				getCases().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.SWITCH_EXPRESSION__SWITCH_EXPR:
+				return switchExpr != null;
+			case ExpressionPackage.SWITCH_EXPRESSION__DEFAULT_EXPR:
+				return defaultExpr != null;
+			case ExpressionPackage.SWITCH_EXPRESSION__CASES:
+				return cases != null && !cases.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //SwitchExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/TypeSelectExpressionImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/TypeSelectExpressionImpl.java
new file mode 100644
index 00000000..9c5991d4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/TypeSelectExpressionImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TypeSelectExpressionImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.TypeSelectExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Select Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.TypeSelectExpressionImpl#getTypeLiteral <em>Type Literal</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TypeSelectExpressionImpl extends FeatureCallImpl implements TypeSelectExpression {
+	/**
+	 * The cached value of the '{@link #getTypeLiteral() <em>Type Literal</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTypeLiteral()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier typeLiteral;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TypeSelectExpressionImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.TYPE_SELECT_EXPRESSION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getTypeLiteral() {
+		return typeLiteral;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTypeLiteral(Identifier newTypeLiteral, NotificationChain msgs) {
+		Identifier oldTypeLiteral = typeLiteral;
+		typeLiteral = newTypeLiteral;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL, oldTypeLiteral, newTypeLiteral);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTypeLiteral(Identifier newTypeLiteral) {
+		if (newTypeLiteral != typeLiteral) {
+			NotificationChain msgs = null;
+			if (typeLiteral != null)
+				msgs = ((InternalEObject)typeLiteral).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL, null, msgs);
+			if (newTypeLiteral != null)
+				msgs = ((InternalEObject)newTypeLiteral).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL, null, msgs);
+			msgs = basicSetTypeLiteral(newTypeLiteral, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL, newTypeLiteral, newTypeLiteral));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL:
+				return basicSetTypeLiteral(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 ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL:
+				return getTypeLiteral();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL:
+				setTypeLiteral((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL:
+				setTypeLiteral((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION__TYPE_LITERAL:
+				return typeLiteral != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //TypeSelectExpressionImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/UnaryOperationImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/UnaryOperationImpl.java
new file mode 100644
index 00000000..3773b016
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/UnaryOperationImpl.java
@@ -0,0 +1,241 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: UnaryOperationImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.ExpressionPackage;
+import org.eclipse.xpand3.expression.UnaryOperation;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unary Operation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.UnaryOperationImpl#getOperator <em>Operator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.expression.impl.UnaryOperationImpl#getOperand <em>Operand</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UnaryOperationImpl extends AbstractExpressionImpl implements UnaryOperation {
+	/**
+	 * The cached value of the '{@link #getOperator() <em>Operator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOperator()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier operator;
+
+	/**
+	 * The cached value of the '{@link #getOperand() <em>Operand</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOperand()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression operand;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UnaryOperationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return ExpressionPackage.Literals.UNARY_OPERATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getOperator() {
+		return operator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOperator(Identifier newOperator, NotificationChain msgs) {
+		Identifier oldOperator = operator;
+		operator = newOperator;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, ExpressionPackage.UNARY_OPERATION__OPERATOR, oldOperator, newOperator);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOperator(Identifier newOperator) {
+		if (newOperator != operator) {
+			NotificationChain msgs = null;
+			if (operator != null)
+				msgs = ((InternalEObject)operator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.UNARY_OPERATION__OPERATOR, null, msgs);
+			if (newOperator != null)
+				msgs = ((InternalEObject)newOperator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ExpressionPackage.UNARY_OPERATION__OPERATOR, null, msgs);
+			msgs = basicSetOperator(newOperator, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.UNARY_OPERATION__OPERATOR, newOperator, newOperator));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getOperand() {
+		if (operand != null && operand.eIsProxy()) {
+			InternalEObject oldOperand = (InternalEObject)operand;
+			operand = (AbstractExpression)eResolveProxy(oldOperand);
+			if (operand != oldOperand) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExpressionPackage.UNARY_OPERATION__OPERAND, oldOperand, operand));
+			}
+		}
+		return operand;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression basicGetOperand() {
+		return operand;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOperand(AbstractExpression newOperand) {
+		AbstractExpression oldOperand = operand;
+		operand = newOperand;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ExpressionPackage.UNARY_OPERATION__OPERAND, oldOperand, operand));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case ExpressionPackage.UNARY_OPERATION__OPERATOR:
+				return basicSetOperator(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 ExpressionPackage.UNARY_OPERATION__OPERATOR:
+				return getOperator();
+			case ExpressionPackage.UNARY_OPERATION__OPERAND:
+				if (resolve) return getOperand();
+				return basicGetOperand();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case ExpressionPackage.UNARY_OPERATION__OPERATOR:
+				setOperator((Identifier)newValue);
+				return;
+			case ExpressionPackage.UNARY_OPERATION__OPERAND:
+				setOperand((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.UNARY_OPERATION__OPERATOR:
+				setOperator((Identifier)null);
+				return;
+			case ExpressionPackage.UNARY_OPERATION__OPERAND:
+				setOperand((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case ExpressionPackage.UNARY_OPERATION__OPERATOR:
+				return operator != null;
+			case ExpressionPackage.UNARY_OPERATION__OPERAND:
+				return operand != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //UnaryOperationImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionAdapterFactory.java
new file mode 100644
index 00000000..13914b19
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionAdapterFactory.java
@@ -0,0 +1,540 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionAdapterFactory.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.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.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.expression.*;
+
+/**
+ * <!-- 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.xpand3.expression.ExpressionPackage
+ * @generated
+ */
+public class ExpressionAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ExpressionPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = ExpressionPackage.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 the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExpressionSwitch<Adapter> modelSwitch =
+		new ExpressionSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractExpression(AbstractExpression object) {
+				return createAbstractExpressionAdapter();
+			}
+			@Override
+			public Adapter caseBooleanOperation(BooleanOperation object) {
+				return createBooleanOperationAdapter();
+			}
+			@Override
+			public Adapter caseCast(Cast object) {
+				return createCastAdapter();
+			}
+			@Override
+			public Adapter caseChainExpression(ChainExpression object) {
+				return createChainExpressionAdapter();
+			}
+			@Override
+			public Adapter caseConstructorCallExpression(ConstructorCallExpression object) {
+				return createConstructorCallExpressionAdapter();
+			}
+			@Override
+			public Adapter caseFeatureCall(FeatureCall object) {
+				return createFeatureCallAdapter();
+			}
+			@Override
+			public Adapter caseCollectionExpression(CollectionExpression object) {
+				return createCollectionExpressionAdapter();
+			}
+			@Override
+			public Adapter caseOperationCall(OperationCall object) {
+				return createOperationCallAdapter();
+			}
+			@Override
+			public Adapter caseTypeSelectExpression(TypeSelectExpression object) {
+				return createTypeSelectExpressionAdapter();
+			}
+			@Override
+			public Adapter caseGlobalVarExpression(GlobalVarExpression object) {
+				return createGlobalVarExpressionAdapter();
+			}
+			@Override
+			public Adapter caseIfExpression(IfExpression object) {
+				return createIfExpressionAdapter();
+			}
+			@Override
+			public Adapter caseLetExpression(LetExpression object) {
+				return createLetExpressionAdapter();
+			}
+			@Override
+			public Adapter caseListLiteral(ListLiteral object) {
+				return createListLiteralAdapter();
+			}
+			@Override
+			public Adapter caseLiteral(Literal object) {
+				return createLiteralAdapter();
+			}
+			@Override
+			public Adapter caseBooleanLiteral(BooleanLiteral object) {
+				return createBooleanLiteralAdapter();
+			}
+			@Override
+			public Adapter caseIntegerLiteral(IntegerLiteral object) {
+				return createIntegerLiteralAdapter();
+			}
+			@Override
+			public Adapter caseNullLiteral(NullLiteral object) {
+				return createNullLiteralAdapter();
+			}
+			@Override
+			public Adapter caseRealLiteral(RealLiteral object) {
+				return createRealLiteralAdapter();
+			}
+			@Override
+			public Adapter caseStringLiteral(StringLiteral object) {
+				return createStringLiteralAdapter();
+			}
+			@Override
+			public Adapter caseSwitchExpression(SwitchExpression object) {
+				return createSwitchExpressionAdapter();
+			}
+			@Override
+			public Adapter caseCase(Case object) {
+				return createCaseAdapter();
+			}
+			@Override
+			public Adapter caseBinaryOperation(BinaryOperation object) {
+				return createBinaryOperationAdapter();
+			}
+			@Override
+			public Adapter caseUnaryOperation(UnaryOperation object) {
+				return createUnaryOperationAdapter();
+			}
+			@Override
+			public Adapter caseSyntaxElement(SyntaxElement object) {
+				return createSyntaxElementAdapter();
+			}
+			@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.xpand3.expression.AbstractExpression <em>Abstract Expression</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.xpand3.expression.AbstractExpression
+	 * @generated
+	 */
+	public Adapter createAbstractExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.BooleanOperation <em>Boolean Operation</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.xpand3.expression.BooleanOperation
+	 * @generated
+	 */
+	public Adapter createBooleanOperationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.Cast <em>Cast</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.xpand3.expression.Cast
+	 * @generated
+	 */
+	public Adapter createCastAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.ChainExpression <em>Chain Expression</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.xpand3.expression.ChainExpression
+	 * @generated
+	 */
+	public Adapter createChainExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.ConstructorCallExpression <em>Constructor Call Expression</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.xpand3.expression.ConstructorCallExpression
+	 * @generated
+	 */
+	public Adapter createConstructorCallExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.FeatureCall <em>Feature 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.xpand3.expression.FeatureCall
+	 * @generated
+	 */
+	public Adapter createFeatureCallAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.CollectionExpression <em>Collection Expression</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.xpand3.expression.CollectionExpression
+	 * @generated
+	 */
+	public Adapter createCollectionExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.OperationCall <em>Operation 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.xpand3.expression.OperationCall
+	 * @generated
+	 */
+	public Adapter createOperationCallAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.TypeSelectExpression <em>Type Select Expression</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.xpand3.expression.TypeSelectExpression
+	 * @generated
+	 */
+	public Adapter createTypeSelectExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.GlobalVarExpression <em>Global Var Expression</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.xpand3.expression.GlobalVarExpression
+	 * @generated
+	 */
+	public Adapter createGlobalVarExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.IfExpression <em>If Expression</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.xpand3.expression.IfExpression
+	 * @generated
+	 */
+	public Adapter createIfExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.LetExpression <em>Let Expression</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.xpand3.expression.LetExpression
+	 * @generated
+	 */
+	public Adapter createLetExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.ListLiteral <em>List Literal</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.xpand3.expression.ListLiteral
+	 * @generated
+	 */
+	public Adapter createListLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.Literal <em>Literal</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.xpand3.expression.Literal
+	 * @generated
+	 */
+	public Adapter createLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.BooleanLiteral <em>Boolean Literal</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.xpand3.expression.BooleanLiteral
+	 * @generated
+	 */
+	public Adapter createBooleanLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.IntegerLiteral <em>Integer Literal</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.xpand3.expression.IntegerLiteral
+	 * @generated
+	 */
+	public Adapter createIntegerLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.NullLiteral <em>Null Literal</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.xpand3.expression.NullLiteral
+	 * @generated
+	 */
+	public Adapter createNullLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.RealLiteral <em>Real Literal</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.xpand3.expression.RealLiteral
+	 * @generated
+	 */
+	public Adapter createRealLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.StringLiteral <em>String Literal</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.xpand3.expression.StringLiteral
+	 * @generated
+	 */
+	public Adapter createStringLiteralAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.SwitchExpression <em>Switch Expression</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.xpand3.expression.SwitchExpression
+	 * @generated
+	 */
+	public Adapter createSwitchExpressionAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.Case <em>Case</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.xpand3.expression.Case
+	 * @generated
+	 */
+	public Adapter createCaseAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.BinaryOperation <em>Binary Operation</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.xpand3.expression.BinaryOperation
+	 * @generated
+	 */
+	public Adapter createBinaryOperationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.expression.UnaryOperation <em>Unary Operation</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.xpand3.expression.UnaryOperation
+	 * @generated
+	 */
+	public Adapter createUnaryOperationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SyntaxElement <em>Syntax Element</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.xpand3.SyntaxElement
+	 * @generated
+	 */
+	public Adapter createSyntaxElementAdapter() {
+		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;
+	}
+
+} //ExpressionAdapterFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionSwitch.java
new file mode 100644
index 00000000..3fc464dc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/util/ExpressionSwitch.java
@@ -0,0 +1,662 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionSwitch.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.expression.*;
+
+/**
+ * <!-- 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.xpand3.expression.ExpressionPackage
+ * @generated
+ */
+public class ExpressionSwitch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static ExpressionPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionSwitch() {
+		if (modelPackage == null) {
+			modelPackage = ExpressionPackage.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 ExpressionPackage.ABSTRACT_EXPRESSION: {
+				AbstractExpression abstractExpression = (AbstractExpression)theEObject;
+				T result = caseAbstractExpression(abstractExpression);
+				if (result == null) result = caseSyntaxElement(abstractExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.BOOLEAN_OPERATION: {
+				BooleanOperation booleanOperation = (BooleanOperation)theEObject;
+				T result = caseBooleanOperation(booleanOperation);
+				if (result == null) result = caseBinaryOperation(booleanOperation);
+				if (result == null) result = caseAbstractExpression(booleanOperation);
+				if (result == null) result = caseSyntaxElement(booleanOperation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.CAST: {
+				Cast cast = (Cast)theEObject;
+				T result = caseCast(cast);
+				if (result == null) result = caseAbstractExpression(cast);
+				if (result == null) result = caseSyntaxElement(cast);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.CHAIN_EXPRESSION: {
+				ChainExpression chainExpression = (ChainExpression)theEObject;
+				T result = caseChainExpression(chainExpression);
+				if (result == null) result = caseAbstractExpression(chainExpression);
+				if (result == null) result = caseSyntaxElement(chainExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.CONSTRUCTOR_CALL_EXPRESSION: {
+				ConstructorCallExpression constructorCallExpression = (ConstructorCallExpression)theEObject;
+				T result = caseConstructorCallExpression(constructorCallExpression);
+				if (result == null) result = caseAbstractExpression(constructorCallExpression);
+				if (result == null) result = caseSyntaxElement(constructorCallExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.FEATURE_CALL: {
+				FeatureCall featureCall = (FeatureCall)theEObject;
+				T result = caseFeatureCall(featureCall);
+				if (result == null) result = caseAbstractExpression(featureCall);
+				if (result == null) result = caseSyntaxElement(featureCall);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.COLLECTION_EXPRESSION: {
+				CollectionExpression collectionExpression = (CollectionExpression)theEObject;
+				T result = caseCollectionExpression(collectionExpression);
+				if (result == null) result = caseFeatureCall(collectionExpression);
+				if (result == null) result = caseAbstractExpression(collectionExpression);
+				if (result == null) result = caseSyntaxElement(collectionExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.OPERATION_CALL: {
+				OperationCall operationCall = (OperationCall)theEObject;
+				T result = caseOperationCall(operationCall);
+				if (result == null) result = caseFeatureCall(operationCall);
+				if (result == null) result = caseAbstractExpression(operationCall);
+				if (result == null) result = caseSyntaxElement(operationCall);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.TYPE_SELECT_EXPRESSION: {
+				TypeSelectExpression typeSelectExpression = (TypeSelectExpression)theEObject;
+				T result = caseTypeSelectExpression(typeSelectExpression);
+				if (result == null) result = caseFeatureCall(typeSelectExpression);
+				if (result == null) result = caseAbstractExpression(typeSelectExpression);
+				if (result == null) result = caseSyntaxElement(typeSelectExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.GLOBAL_VAR_EXPRESSION: {
+				GlobalVarExpression globalVarExpression = (GlobalVarExpression)theEObject;
+				T result = caseGlobalVarExpression(globalVarExpression);
+				if (result == null) result = caseAbstractExpression(globalVarExpression);
+				if (result == null) result = caseSyntaxElement(globalVarExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.IF_EXPRESSION: {
+				IfExpression ifExpression = (IfExpression)theEObject;
+				T result = caseIfExpression(ifExpression);
+				if (result == null) result = caseAbstractExpression(ifExpression);
+				if (result == null) result = caseSyntaxElement(ifExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.LET_EXPRESSION: {
+				LetExpression letExpression = (LetExpression)theEObject;
+				T result = caseLetExpression(letExpression);
+				if (result == null) result = caseAbstractExpression(letExpression);
+				if (result == null) result = caseSyntaxElement(letExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.LIST_LITERAL: {
+				ListLiteral listLiteral = (ListLiteral)theEObject;
+				T result = caseListLiteral(listLiteral);
+				if (result == null) result = caseAbstractExpression(listLiteral);
+				if (result == null) result = caseSyntaxElement(listLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.LITERAL: {
+				Literal literal = (Literal)theEObject;
+				T result = caseLiteral(literal);
+				if (result == null) result = caseAbstractExpression(literal);
+				if (result == null) result = caseSyntaxElement(literal);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.BOOLEAN_LITERAL: {
+				BooleanLiteral booleanLiteral = (BooleanLiteral)theEObject;
+				T result = caseBooleanLiteral(booleanLiteral);
+				if (result == null) result = caseLiteral(booleanLiteral);
+				if (result == null) result = caseAbstractExpression(booleanLiteral);
+				if (result == null) result = caseSyntaxElement(booleanLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.INTEGER_LITERAL: {
+				IntegerLiteral integerLiteral = (IntegerLiteral)theEObject;
+				T result = caseIntegerLiteral(integerLiteral);
+				if (result == null) result = caseLiteral(integerLiteral);
+				if (result == null) result = caseAbstractExpression(integerLiteral);
+				if (result == null) result = caseSyntaxElement(integerLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.NULL_LITERAL: {
+				NullLiteral nullLiteral = (NullLiteral)theEObject;
+				T result = caseNullLiteral(nullLiteral);
+				if (result == null) result = caseLiteral(nullLiteral);
+				if (result == null) result = caseAbstractExpression(nullLiteral);
+				if (result == null) result = caseSyntaxElement(nullLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.REAL_LITERAL: {
+				RealLiteral realLiteral = (RealLiteral)theEObject;
+				T result = caseRealLiteral(realLiteral);
+				if (result == null) result = caseLiteral(realLiteral);
+				if (result == null) result = caseAbstractExpression(realLiteral);
+				if (result == null) result = caseSyntaxElement(realLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.STRING_LITERAL: {
+				StringLiteral stringLiteral = (StringLiteral)theEObject;
+				T result = caseStringLiteral(stringLiteral);
+				if (result == null) result = caseLiteral(stringLiteral);
+				if (result == null) result = caseAbstractExpression(stringLiteral);
+				if (result == null) result = caseSyntaxElement(stringLiteral);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.SWITCH_EXPRESSION: {
+				SwitchExpression switchExpression = (SwitchExpression)theEObject;
+				T result = caseSwitchExpression(switchExpression);
+				if (result == null) result = caseAbstractExpression(switchExpression);
+				if (result == null) result = caseSyntaxElement(switchExpression);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.CASE: {
+				Case case_ = (Case)theEObject;
+				T result = caseCase(case_);
+				if (result == null) result = caseSyntaxElement(case_);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.BINARY_OPERATION: {
+				BinaryOperation binaryOperation = (BinaryOperation)theEObject;
+				T result = caseBinaryOperation(binaryOperation);
+				if (result == null) result = caseAbstractExpression(binaryOperation);
+				if (result == null) result = caseSyntaxElement(binaryOperation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case ExpressionPackage.UNARY_OPERATION: {
+				UnaryOperation unaryOperation = (UnaryOperation)theEObject;
+				T result = caseUnaryOperation(unaryOperation);
+				if (result == null) result = caseAbstractExpression(unaryOperation);
+				if (result == null) result = caseSyntaxElement(unaryOperation);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Expression</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 Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractExpression(AbstractExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean Operation</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>Boolean Operation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanOperation(BooleanOperation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Cast</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>Cast</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCast(Cast object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Chain Expression</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>Chain Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseChainExpression(ChainExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Constructor Call Expression</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>Constructor Call Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseConstructorCallExpression(ConstructorCallExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Feature 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>Feature Call</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFeatureCall(FeatureCall object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Collection Expression</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>Collection Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCollectionExpression(CollectionExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Operation 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>Operation Call</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseOperationCall(OperationCall object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Type Select Expression</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>Type Select Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTypeSelectExpression(TypeSelectExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Global Var Expression</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>Global Var Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseGlobalVarExpression(GlobalVarExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>If Expression</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>If Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIfExpression(IfExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Let Expression</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>Let Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLetExpression(LetExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>List Literal</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>List Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseListLiteral(ListLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Literal</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>Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLiteral(Literal object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Boolean Literal</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>Boolean Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBooleanLiteral(BooleanLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Integer Literal</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>Integer Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIntegerLiteral(IntegerLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Null Literal</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>Null Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseNullLiteral(NullLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Real Literal</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>Real Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseRealLiteral(RealLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String Literal</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>String Literal</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringLiteral(StringLiteral object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Switch Expression</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>Switch Expression</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSwitchExpression(SwitchExpression object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Case</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>Case</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCase(Case object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Binary Operation</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>Binary Operation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBinaryOperation(BinaryOperation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Unary Operation</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>Unary Operation</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUnaryOperation(UnaryOperation object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Syntax Element</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>Syntax Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSyntaxElement(SyntaxElement 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;
+	}
+
+} //ExpressionSwitch
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java
new file mode 100644
index 00000000..1568a8f8
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.AbstractExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractExpressionValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BinaryOperationValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BinaryOperationValidator.java
new file mode 100644
index 00000000..ad92322d
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BinaryOperationValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BinaryOperationValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.BinaryOperation}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface BinaryOperationValidator {
+	boolean validate();
+
+	boolean validateLeft(AbstractExpression value);
+	boolean validateRight(AbstractExpression value);
+	boolean validateOperator(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java
new file mode 100644
index 00000000..6d7be22a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanLiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.BooleanLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface BooleanLiteralValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java
new file mode 100644
index 00000000..0df8e9a1
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: BooleanOperationValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.BooleanOperation}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface BooleanOperationValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java
new file mode 100644
index 00000000..b7cb94bf
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CaseValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.Case}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CaseValidator {
+	boolean validate();
+
+	boolean validateCondition(AbstractExpression value);
+	boolean validateThenPart(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java
new file mode 100644
index 00000000..758686ce
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CastValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.Cast}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CastValidator {
+	boolean validate();
+
+	boolean validateType(Identifier value);
+	boolean validateTarget(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java
new file mode 100644
index 00000000..a27d2e29
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ChainExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.ChainExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ChainExpressionValidator {
+	boolean validate();
+
+	boolean validateFirst(AbstractExpression value);
+	boolean validateNext(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java
new file mode 100644
index 00000000..279d82d8
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: CollectionExpressionValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.CollectionExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface CollectionExpressionValidator {
+	boolean validate();
+
+	boolean validateClosure(AbstractExpression value);
+	boolean validateEleName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java
new file mode 100644
index 00000000..46c17ebc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ConstructorCallExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.ConstructorCallExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ConstructorCallExpressionValidator {
+	boolean validate();
+
+	boolean validateType(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java
new file mode 100644
index 00000000..4f2908ff
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FeatureCallValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.FeatureCall}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface FeatureCallValidator {
+	boolean validate();
+
+	boolean validateTarget(AbstractExpression value);
+	boolean validateName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java
new file mode 100644
index 00000000..cda6c86b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: GlobalVarExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.GlobalVarExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface GlobalVarExpressionValidator {
+	boolean validate();
+
+	boolean validateGlobalVarName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java
new file mode 100644
index 00000000..4ffc678b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfExpressionValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.IfExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface IfExpressionValidator {
+	boolean validate();
+
+	boolean validateCondition(AbstractExpression value);
+	boolean validateThenPart(AbstractExpression value);
+	boolean validateElsePart(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java
new file mode 100644
index 00000000..9652436e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IntegerLiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.IntegerLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface IntegerLiteralValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java
new file mode 100644
index 00000000..a87ab318
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.LetExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface LetExpressionValidator {
+	boolean validate();
+
+	boolean validateVarExpression(AbstractExpression value);
+	boolean validateTargetExpression(AbstractExpression value);
+	boolean validateVarName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java
new file mode 100644
index 00000000..b44741bc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ListLiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.ListLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ListLiteralValidator {
+	boolean validate();
+
+	boolean validateElements(EList<AbstractExpression> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java
new file mode 100644
index 00000000..6371fec9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.Literal}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface LiteralValidator {
+	boolean validate();
+
+	boolean validateLiteralValue(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java
new file mode 100644
index 00000000..60638251
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: NullLiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.NullLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface NullLiteralValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java
new file mode 100644
index 00000000..d07fec06
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: OperationCallValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.OperationCall}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface OperationCallValidator {
+	boolean validate();
+
+	boolean validateParams(EList<AbstractExpression> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java
new file mode 100644
index 00000000..5540c1d5
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: RealLiteralValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.RealLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface RealLiteralValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java
new file mode 100644
index 00000000..67c55bda
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StringLiteralValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.StringLiteral}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface StringLiteralValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java
new file mode 100644
index 00000000..f3aba146
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java
@@ -0,0 +1,26 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SwitchExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+import org.eclipse.xpand3.expression.Case;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.SwitchExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface SwitchExpressionValidator {
+	boolean validate();
+
+	boolean validateSwitchExpr(AbstractExpression value);
+	boolean validateDefaultExpr(AbstractExpression value);
+	boolean validateCases(EList<Case> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java
new file mode 100644
index 00000000..90b39b7e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TypeSelectExpressionValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.TypeSelectExpression}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface TypeSelectExpressionValidator {
+	boolean validate();
+
+	boolean validateTypeLiteral(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java
new file mode 100644
index 00000000..a31a486e
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/validation/UnaryOperationValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: UnaryOperationValidator.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.expression.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.expression.UnaryOperation}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface UnaryOperationValidator {
+	boolean validate();
+
+	boolean validateOperator(Identifier value);
+	boolean validateOperand(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/DeclaredParameterImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/DeclaredParameterImpl.java
new file mode 100644
index 00000000..d9caa7e1
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/DeclaredParameterImpl.java
@@ -0,0 +1,245 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclaredParameterImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.Identifier;
+import org.eclipse.xpand3.Xpand3Package;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Declared Parameter</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.impl.DeclaredParameterImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.DeclaredParameterImpl#getType <em>Type</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class DeclaredParameterImpl extends SyntaxElementImpl implements DeclaredParameter {
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier name;
+
+	/**
+	 * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getType()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier type;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected DeclaredParameterImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3Package.Literals.DECLARED_PARAMETER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetName(Identifier newName, NotificationChain msgs) {
+		Identifier oldName = name;
+		name = newName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Xpand3Package.DECLARED_PARAMETER__NAME, oldName, newName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setName(Identifier newName) {
+		if (newName != name) {
+			NotificationChain msgs = null;
+			if (name != null)
+				msgs = ((InternalEObject)name).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.DECLARED_PARAMETER__NAME, null, msgs);
+			if (newName != null)
+				msgs = ((InternalEObject)newName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.DECLARED_PARAMETER__NAME, null, msgs);
+			msgs = basicSetName(newName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.DECLARED_PARAMETER__NAME, newName, newName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getType() {
+		return type;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetType(Identifier newType, NotificationChain msgs) {
+		Identifier oldType = type;
+		type = newType;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Xpand3Package.DECLARED_PARAMETER__TYPE, oldType, newType);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setType(Identifier newType) {
+		if (newType != type) {
+			NotificationChain msgs = null;
+			if (type != null)
+				msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.DECLARED_PARAMETER__TYPE, null, msgs);
+			if (newType != null)
+				msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.DECLARED_PARAMETER__TYPE, null, msgs);
+			msgs = basicSetType(newType, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.DECLARED_PARAMETER__TYPE, newType, newType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case Xpand3Package.DECLARED_PARAMETER__NAME:
+				return basicSetName(null, msgs);
+			case Xpand3Package.DECLARED_PARAMETER__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 Xpand3Package.DECLARED_PARAMETER__NAME:
+				return getName();
+			case Xpand3Package.DECLARED_PARAMETER__TYPE:
+				return getType();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case Xpand3Package.DECLARED_PARAMETER__NAME:
+				setName((Identifier)newValue);
+				return;
+			case Xpand3Package.DECLARED_PARAMETER__TYPE:
+				setType((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.DECLARED_PARAMETER__NAME:
+				setName((Identifier)null);
+				return;
+			case Xpand3Package.DECLARED_PARAMETER__TYPE:
+				setType((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.DECLARED_PARAMETER__NAME:
+				return name != null;
+			case Xpand3Package.DECLARED_PARAMETER__TYPE:
+				return type != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //DeclaredParameterImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/FileImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/FileImpl.java
new file mode 100644
index 00000000..6d69108d
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/FileImpl.java
@@ -0,0 +1,192 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FileImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.File;
+import org.eclipse.xpand3.ImportStatement;
+import org.eclipse.xpand3.Xpand3Package;
+
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>File</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.impl.FileImpl#getImports <em>Imports</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.FileImpl#getDeclarations <em>Declarations</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FileImpl extends SyntaxElementImpl implements File {
+	/**
+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImports()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<ImportStatement> imports;
+
+	/**
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeclarations()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractDeclaration> declarations;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FileImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3Package.Literals.FILE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<ImportStatement> getImports() {
+		if (imports == null) {
+			imports = new EObjectContainmentEList<ImportStatement>(ImportStatement.class, this, Xpand3Package.FILE__IMPORTS);
+		}
+		return imports;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractDeclaration> getDeclarations() {
+		if (declarations == null) {
+			declarations = new EObjectContainmentEList<AbstractDeclaration>(AbstractDeclaration.class, this, Xpand3Package.FILE__DECLARATIONS);
+		}
+		return declarations;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case Xpand3Package.FILE__IMPORTS:
+				return ((InternalEList<?>)getImports()).basicRemove(otherEnd, msgs);
+			case Xpand3Package.FILE__DECLARATIONS:
+				return ((InternalEList<?>)getDeclarations()).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 Xpand3Package.FILE__IMPORTS:
+				return getImports();
+			case Xpand3Package.FILE__DECLARATIONS:
+				return getDeclarations();
+		}
+		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 Xpand3Package.FILE__IMPORTS:
+				getImports().clear();
+				getImports().addAll((Collection<? extends ImportStatement>)newValue);
+				return;
+			case Xpand3Package.FILE__DECLARATIONS:
+				getDeclarations().clear();
+				getDeclarations().addAll((Collection<? extends AbstractDeclaration>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.FILE__IMPORTS:
+				getImports().clear();
+				return;
+			case Xpand3Package.FILE__DECLARATIONS:
+				getDeclarations().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.FILE__IMPORTS:
+				return imports != null && !imports.isEmpty();
+			case Xpand3Package.FILE__DECLARATIONS:
+				return declarations != null && !declarations.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //FileImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
new file mode 100644
index 00000000..1b134ec4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
@@ -0,0 +1,166 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdentifierImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.xpand3.Identifier;
+import org.eclipse.xpand3.Xpand3Package;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Identifier</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.impl.IdentifierImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class IdentifierImpl extends SyntaxElementImpl implements Identifier {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IdentifierImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3Package.Literals.IDENTIFIER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case Xpand3Package.IDENTIFIER__VALUE:
+				return getValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case Xpand3Package.IDENTIFIER__VALUE:
+				setValue((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.IDENTIFIER__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.IDENTIFIER__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		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(" (value: ");
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+} //IdentifierImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/ImportStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/ImportStatementImpl.java
new file mode 100644
index 00000000..fc3d640b
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/ImportStatementImpl.java
@@ -0,0 +1,247 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ImportStatementImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.Identifier;
+import org.eclipse.xpand3.ImportStatement;
+import org.eclipse.xpand3.Xpand3Package;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Import Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.impl.ImportStatementImpl#getImportedId <em>Imported Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.ImportStatementImpl#isExported <em>Exported</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ImportStatementImpl extends SyntaxElementImpl implements ImportStatement {
+	/**
+	 * The cached value of the '{@link #getImportedId() <em>Imported Id</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getImportedId()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier importedId;
+
+	/**
+	 * The default value of the '{@link #isExported() <em>Exported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExported()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean EXPORTED_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isExported() <em>Exported</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isExported()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean exported = EXPORTED_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ImportStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3Package.Literals.IMPORT_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getImportedId() {
+		return importedId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetImportedId(Identifier newImportedId, NotificationChain msgs) {
+		Identifier oldImportedId = importedId;
+		importedId = newImportedId;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID, oldImportedId, newImportedId);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setImportedId(Identifier newImportedId) {
+		if (newImportedId != importedId) {
+			NotificationChain msgs = null;
+			if (importedId != null)
+				msgs = ((InternalEObject)importedId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID, null, msgs);
+			if (newImportedId != null)
+				msgs = ((InternalEObject)newImportedId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID, null, msgs);
+			msgs = basicSetImportedId(newImportedId, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID, newImportedId, newImportedId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isExported() {
+		return exported;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExported(boolean newExported) {
+		boolean oldExported = exported;
+		exported = newExported;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IMPORT_STATEMENT__EXPORTED, oldExported, exported));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID:
+				return basicSetImportedId(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 Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID:
+				return getImportedId();
+			case Xpand3Package.IMPORT_STATEMENT__EXPORTED:
+				return isExported() ? 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 Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID:
+				setImportedId((Identifier)newValue);
+				return;
+			case Xpand3Package.IMPORT_STATEMENT__EXPORTED:
+				setExported(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID:
+				setImportedId((Identifier)null);
+				return;
+			case Xpand3Package.IMPORT_STATEMENT__EXPORTED:
+				setExported(EXPORTED_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.IMPORT_STATEMENT__IMPORTED_ID:
+				return importedId != null;
+			case Xpand3Package.IMPORT_STATEMENT__EXPORTED:
+				return exported != EXPORTED_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(" (exported: ");
+		result.append(exported);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ImportStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/SyntaxElementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/SyntaxElementImpl.java
new file mode 100644
index 00000000..07c27c7f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/SyntaxElementImpl.java
@@ -0,0 +1,329 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SyntaxElementImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.SyntaxElement;
+import org.eclipse.xpand3.Xpand3Package;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Syntax Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.impl.SyntaxElementImpl#getLine <em>Line</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.SyntaxElementImpl#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.SyntaxElementImpl#getEnd <em>End</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.impl.SyntaxElementImpl#getFileName <em>File Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class SyntaxElementImpl extends EObjectImpl implements SyntaxElement {
+	/**
+	 * The default value of the '{@link #getLine() <em>Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int LINE_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getLine() <em>Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected int line = LINE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStart()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int START_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStart()
+	 * @generated
+	 * @ordered
+	 */
+	protected int start = START_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getEnd() <em>End</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnd()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int END_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getEnd() <em>End</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getEnd()
+	 * @generated
+	 * @ordered
+	 */
+	protected int end = END_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFileName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FILE_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFileName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fileName = FILE_NAME_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected SyntaxElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3Package.Literals.SYNTAX_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getLine() {
+		return line;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLine(int newLine) {
+		int oldLine = line;
+		line = newLine;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SYNTAX_ELEMENT__LINE, oldLine, line));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getStart() {
+		return start;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStart(int newStart) {
+		int oldStart = start;
+		start = newStart;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SYNTAX_ELEMENT__START, oldStart, start));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getEnd() {
+		return end;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setEnd(int newEnd) {
+		int oldEnd = end;
+		end = newEnd;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SYNTAX_ELEMENT__END, oldEnd, end));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFileName() {
+		return fileName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFileName(String newFileName) {
+		String oldFileName = fileName;
+		fileName = newFileName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SYNTAX_ELEMENT__FILE_NAME, oldFileName, fileName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case Xpand3Package.SYNTAX_ELEMENT__LINE:
+				return new Integer(getLine());
+			case Xpand3Package.SYNTAX_ELEMENT__START:
+				return new Integer(getStart());
+			case Xpand3Package.SYNTAX_ELEMENT__END:
+				return new Integer(getEnd());
+			case Xpand3Package.SYNTAX_ELEMENT__FILE_NAME:
+				return getFileName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case Xpand3Package.SYNTAX_ELEMENT__LINE:
+				setLine(((Integer)newValue).intValue());
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__START:
+				setStart(((Integer)newValue).intValue());
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__END:
+				setEnd(((Integer)newValue).intValue());
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__FILE_NAME:
+				setFileName((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.SYNTAX_ELEMENT__LINE:
+				setLine(LINE_EDEFAULT);
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__START:
+				setStart(START_EDEFAULT);
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__END:
+				setEnd(END_EDEFAULT);
+				return;
+			case Xpand3Package.SYNTAX_ELEMENT__FILE_NAME:
+				setFileName(FILE_NAME_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3Package.SYNTAX_ELEMENT__LINE:
+				return line != LINE_EDEFAULT;
+			case Xpand3Package.SYNTAX_ELEMENT__START:
+				return start != START_EDEFAULT;
+			case Xpand3Package.SYNTAX_ELEMENT__END:
+				return end != END_EDEFAULT;
+			case Xpand3Package.SYNTAX_ELEMENT__FILE_NAME:
+				return FILE_NAME_EDEFAULT == null ? fileName != null : !FILE_NAME_EDEFAULT.equals(fileName);
+		}
+		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(" (line: ");
+		result.append(line);
+		result.append(", start: ");
+		result.append(start);
+		result.append(", end: ");
+		result.append(end);
+		result.append(", fileName: ");
+		result.append(fileName);
+		result.append(')');
+		return result.toString();
+	}
+
+} //SyntaxElementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
new file mode 100644
index 00000000..d3b5d67d
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
@@ -0,0 +1,132 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3FactoryImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class Xpand3FactoryImpl extends EFactoryImpl implements Xpand3Factory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static Xpand3Factory init() {
+		try {
+			Xpand3Factory theXpand3Factory = (Xpand3Factory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3"); 
+			if (theXpand3Factory != null) {
+				return theXpand3Factory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new Xpand3FactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Xpand3FactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case Xpand3Package.FILE: return createFile();
+			case Xpand3Package.IMPORT_STATEMENT: return createImportStatement();
+			case Xpand3Package.IDENTIFIER: return createIdentifier();
+			case Xpand3Package.DECLARED_PARAMETER: return createDeclaredParameter();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public File createFile() {
+		FileImpl file = new FileImpl();
+		return file;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ImportStatement createImportStatement() {
+		ImportStatementImpl importStatement = new ImportStatementImpl();
+		return importStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier createIdentifier() {
+		IdentifierImpl identifier = new IdentifierImpl();
+		return identifier;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DeclaredParameter createDeclaredParameter() {
+		DeclaredParameterImpl declaredParameter = new DeclaredParameterImpl();
+		return declaredParameter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Xpand3Package getXpand3Package() {
+		return (Xpand3Package)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static Xpand3Package getPackage() {
+		return Xpand3Package.eINSTANCE;
+	}
+
+} //Xpand3FactoryImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
new file mode 100644
index 00000000..af9e6333
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
@@ -0,0 +1,420 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3PackageImpl.java,v 1.1 2008/03/17 14:39:05 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.File;
+import org.eclipse.xpand3.Identifier;
+import org.eclipse.xpand3.ImportStatement;
+import org.eclipse.xpand3.SyntaxElement;
+import org.eclipse.xpand3.Xpand3Factory;
+import org.eclipse.xpand3.Xpand3Package;
+
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+import org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+import org.eclipse.xpand3.expression.impl.ExpressionPackageImpl;
+
+import org.eclipse.xpand3.statement.StatementPackage;
+
+import org.eclipse.xpand3.statement.impl.StatementPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass syntaxElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fileEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass importStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass identifierEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass declaredParameterEClass = 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.xpand3.Xpand3Package#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private Xpand3PackageImpl() {
+		super(eNS_URI, Xpand3Factory.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 Xpand3Package init() {
+		if (isInited) return (Xpand3Package)EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI);
+
+		// Obtain or create and register package
+		Xpand3PackageImpl theXpand3Package = (Xpand3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof Xpand3PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new Xpand3PackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		ExpressionPackageImpl theExpressionPackage = (ExpressionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) instanceof ExpressionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) : ExpressionPackage.eINSTANCE);
+		StatementPackageImpl theStatementPackage = (StatementPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) instanceof StatementPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI) : StatementPackage.eINSTANCE);
+		DeclarationPackageImpl theDeclarationPackage = (DeclarationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) instanceof DeclarationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) : DeclarationPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theXpand3Package.createPackageContents();
+		theExpressionPackage.createPackageContents();
+		theStatementPackage.createPackageContents();
+		theDeclarationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theXpand3Package.initializePackageContents();
+		theExpressionPackage.initializePackageContents();
+		theStatementPackage.initializePackageContents();
+		theDeclarationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theXpand3Package.freeze();
+
+		return theXpand3Package;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getSyntaxElement() {
+		return syntaxElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSyntaxElement_Line() {
+		return (EAttribute)syntaxElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSyntaxElement_Start() {
+		return (EAttribute)syntaxElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSyntaxElement_End() {
+		return (EAttribute)syntaxElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getSyntaxElement_FileName() {
+		return (EAttribute)syntaxElementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getFile() {
+		return fileEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFile_Imports() {
+		return (EReference)fileEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFile_Declarations() {
+		return (EReference)fileEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getImportStatement() {
+		return importStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getImportStatement_ImportedId() {
+		return (EReference)importStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getImportStatement_Exported() {
+		return (EAttribute)importStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIdentifier() {
+		return identifierEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getIdentifier_Value() {
+		return (EAttribute)identifierEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getDeclaredParameter() {
+		return declaredParameterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDeclaredParameter_Name() {
+		return (EReference)declaredParameterEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDeclaredParameter_Type() {
+		return (EReference)declaredParameterEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Xpand3Factory getXpand3Factory() {
+		return (Xpand3Factory)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
+		syntaxElementEClass = createEClass(SYNTAX_ELEMENT);
+		createEAttribute(syntaxElementEClass, SYNTAX_ELEMENT__LINE);
+		createEAttribute(syntaxElementEClass, SYNTAX_ELEMENT__START);
+		createEAttribute(syntaxElementEClass, SYNTAX_ELEMENT__END);
+		createEAttribute(syntaxElementEClass, SYNTAX_ELEMENT__FILE_NAME);
+
+		fileEClass = createEClass(FILE);
+		createEReference(fileEClass, FILE__IMPORTS);
+		createEReference(fileEClass, FILE__DECLARATIONS);
+
+		importStatementEClass = createEClass(IMPORT_STATEMENT);
+		createEReference(importStatementEClass, IMPORT_STATEMENT__IMPORTED_ID);
+		createEAttribute(importStatementEClass, IMPORT_STATEMENT__EXPORTED);
+
+		identifierEClass = createEClass(IDENTIFIER);
+		createEAttribute(identifierEClass, IDENTIFIER__VALUE);
+
+		declaredParameterEClass = createEClass(DECLARED_PARAMETER);
+		createEReference(declaredParameterEClass, DECLARED_PARAMETER__NAME);
+		createEReference(declaredParameterEClass, DECLARED_PARAMETER__TYPE);
+	}
+
+	/**
+	 * <!-- 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);
+
+		// Obtain other dependent packages
+		ExpressionPackage theExpressionPackage = (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
+		StatementPackage theStatementPackage = (StatementPackage)EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI);
+		DeclarationPackage theDeclarationPackage = (DeclarationPackage)EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI);
+
+		// Add subpackages
+		getESubpackages().add(theExpressionPackage);
+		getESubpackages().add(theStatementPackage);
+		getESubpackages().add(theDeclarationPackage);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		fileEClass.getESuperTypes().add(this.getSyntaxElement());
+		importStatementEClass.getESuperTypes().add(this.getSyntaxElement());
+		identifierEClass.getESuperTypes().add(this.getSyntaxElement());
+		declaredParameterEClass.getESuperTypes().add(this.getSyntaxElement());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(syntaxElementEClass, SyntaxElement.class, "SyntaxElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSyntaxElement_Line(), ecorePackage.getEInt(), "line", null, 0, 1, SyntaxElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSyntaxElement_Start(), ecorePackage.getEInt(), "start", null, 0, 1, SyntaxElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSyntaxElement_End(), ecorePackage.getEInt(), "end", null, 0, 1, SyntaxElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSyntaxElement_FileName(), ecorePackage.getEString(), "fileName", null, 0, 1, SyntaxElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFile_Imports(), this.getImportStatement(), null, "imports", null, 0, -1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFile_Declarations(), theDeclarationPackage.getAbstractDeclaration(), null, "declarations", null, 1, -1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(importStatementEClass, ImportStatement.class, "ImportStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getImportStatement_ImportedId(), this.getIdentifier(), null, "importedId", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getImportStatement_Exported(), ecorePackage.getEBoolean(), "exported", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(identifierEClass, Identifier.class, "Identifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getIdentifier_Value(), ecorePackage.getEString(), "value", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(declaredParameterEClass, DeclaredParameter.class, "DeclaredParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDeclaredParameter_Name(), this.getIdentifier(), null, "name", null, 0, 1, DeclaredParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDeclaredParameter_Type(), this.getIdentifier(), null, "type", null, 0, 1, DeclaredParameter.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);
+	}
+
+} //Xpand3PackageImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AdditiveExpressionNode.java
index a04e077c..073d02de 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AdditiveExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AdditiveExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AdditiveExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: AdditiveExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface AdditiveExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_Nexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_Nexts()
 	 * @model
 	 * @generated
 	 */
@@ -54,14 +54,14 @@ public interface AdditiveExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAdditiveExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AndExpressionNode.java
index 958bdbbd..52c793c0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AndExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AndExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AndExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: AndExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface AndExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
@@ -64,7 +64,7 @@ public interface AndExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_Nexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAndExpressionNode_Nexts()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AroundNode.java
index c63af9ef..451490f3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/AroundNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/AroundNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AroundNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: AroundNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getAroundNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getAroundNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/BooleanLiteralNode.java
index d9ffc6f2..5e727962 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/BooleanLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/BooleanLiteralNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BooleanLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: BooleanLiteralNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getBooleanLiteralNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getBooleanLiteralNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CasePartNode.java
index 025a5608..fbfd9624 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CasePartNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CasePartNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CasePartNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CasePartNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,12 +16,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCasePartNode()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface CasePartNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Condition</em>' reference.
 	 * @see #setCondition(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Condition()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Condition()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getCondition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Condition</em>' reference.
@@ -62,14 +62,14 @@ public interface CasePartNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCasePartNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CastedExpressionNode.java
index 67083f29..e6c79f27 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CastedExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CastedExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CastedExpressionNode.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: CastedExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,66 +16,66 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode()
  * @model
  * @generated
  */
 public interface CastedExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Target</b></em>' reference.
+	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target</em>' reference isn't clear,
+	 * 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>Target</em>' reference.
-	 * @see #setTarget(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode_Target()
+	 * @return the value of the '<em>Type</em>' reference.
+	 * @see #setType(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode_Type()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getTarget();
+	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' reference.
-	 * @see #getTarget()
+	 * @param value the new value of the '<em>Type</em>' reference.
+	 * @see #getType()
 	 * @generated
 	 */
-	void setTarget(CompositeNode value);
+	void setType(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
+	 * Returns the value of the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
+	 * If the meaning of the '<em>Target</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(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode_Type()
+	 * @return the value of the '<em>Target</em>' reference.
+	 * @see #setTarget(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCastedExpressionNode_Target()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getType();
+	CompositeNode getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
-	 * @see #getType()
+	 * @param value the new value of the '<em>Target</em>' reference.
+	 * @see #getTarget()
 	 * @generated
 	 */
-	void setType(CompositeNode value);
+	void setTarget(CompositeNode value);
 
 } // CastedExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ChainExpressionNode.java
index 94f1c275..4308b0fc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ChainExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ChainExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ChainExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: ChainExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface ChainExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_Nexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_Nexts()
 	 * @model
 	 * @generated
 	 */
@@ -54,14 +54,14 @@ public interface ChainExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getChainExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CheckNode.java
index d28ad5b2..edd8dd82 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CheckNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CheckNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CheckNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: CheckNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
@@ -17,16 +17,16 @@ import org.eclipse.tmf.common.node.LeafNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getError <em>Error</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getMessage <em>Message</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode()
  * @model
  * @generated
  */
@@ -41,14 +41,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
@@ -67,14 +67,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Error</em>' reference.
 	 * @see #setError(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Error()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_Error()
 	 * @model
 	 * @generated
 	 */
 	LeafNode getError();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getError <em>Error</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Error</em>' reference.
@@ -93,14 +93,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Message</em>' reference.
 	 * @see #setMessage(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Message()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_Message()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getMessage();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getMessage <em>Message</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Message</em>' reference.
@@ -119,14 +119,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>If Expression</em>' reference.
 	 * @see #setIfExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_IfExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_IfExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getIfExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>If Expression</em>' reference.
@@ -145,14 +145,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Warning</em>' reference.
 	 * @see #setWarning(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Warning()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_Warning()
 	 * @model
 	 * @generated
 	 */
 	LeafNode getWarning();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Warning</em>' reference.
@@ -171,14 +171,14 @@ public interface CheckNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Constraint</em>' reference.
 	 * @see #setConstraint(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCheckNode_Constraint()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCheckNode_Constraint()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getConstraint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Constraint</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CollectionExpressionNode.java
index fddc0b56..a9bf76cc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CollectionExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: CollectionExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,18 +16,17 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode()
  * @model
  * @generated
  */
 public interface CollectionExpressionNode extends CompositeNode {
-
 	/**
 	 * Returns the value of the '<em><b>Variable</b></em>' reference.
 	 * <!-- begin-user-doc -->
@@ -38,14 +37,14 @@ public interface CollectionExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Variable</em>' reference.
 	 * @see #setVariable(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Variable()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Variable()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getVariable();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Variable</em>' reference.
@@ -55,54 +54,55 @@ public interface CollectionExpressionNode extends CompositeNode {
 	void setVariable(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Expression</b></em>' reference.
+	 * Returns the value of the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Expression</em>' reference isn't clear,
+	 * 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>Expression</em>' reference.
-	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Expression()
+	 * @return the value of the '<em>Type</em>' reference.
+	 * @see #setType(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Type()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getExpression();
+	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expression</em>' reference.
-	 * @see #getExpression()
+	 * @param value the new value of the '<em>Type</em>' reference.
+	 * @see #getType()
 	 * @generated
 	 */
-	void setExpression(CompositeNode value);
+	void setType(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
+	 * Returns the value of the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
+	 * If the meaning of the '<em>Expression</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(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Type()
+	 * @return the value of the '<em>Expression</em>' reference.
+	 * @see #setExpression(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionExpressionNode_Expression()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getType();
+	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
-	 * @see #getType()
+	 * @param value the new value of the '<em>Expression</em>' reference.
+	 * @see #getExpression()
 	 * @generated
 	 */
-	void setType(CompositeNode value);
+	void setExpression(CompositeNode value);
+
 } // CollectionExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CollectionTypeNode.java
index 42135fbd..bc8b7e94 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/CollectionTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/CollectionTypeNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionTypeNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CollectionTypeNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
@@ -17,12 +17,12 @@ import org.eclipse.tmf.common.node.LeafNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode()
  * @model
  * @generated
  */
@@ -37,14 +37,14 @@ public interface CollectionTypeNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Collection Type</em>' reference.
 	 * @see #setCollectionType(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_CollectionType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_CollectionType()
 	 * @model
 	 * @generated
 	 */
 	LeafNode getCollectionType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Collection Type</em>' reference.
@@ -63,14 +63,14 @@ public interface CollectionTypeNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element Type</em>' reference.
 	 * @see #setElementType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_ElementType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getCollectionTypeNode_ElementType()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getElementType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Element Type</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ConstructorCallNode.java
index af2f8e8f..7b5762fc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ConstructorCallNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ConstructorCallNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConstructorCallNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ConstructorCallNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getConstructorCallNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getConstructorCallNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DeclaredParameterListNode.java
index a2d71134..e58b512a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DeclaredParameterListNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterListNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: DeclaredParameterListNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,11 +18,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode()
  * @model
  * @generated
  */
@@ -37,7 +37,7 @@ public interface DeclaredParameterListNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Params</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode_Params()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterListNode_Params()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DeclaredParameterNode.java
index cb822ead..b5fe039e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DeclaredParameterNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DeclaredParameterNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterNode.java,v 1.5 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: DeclaredParameterNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,66 +16,66 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode()
  * @model
  * @generated
  */
 public interface DeclaredParameterNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Ptype</b></em>' reference.
+	 * Returns the value of the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Ptype</em>' reference isn't clear,
+	 * If the meaning of the '<em>Name</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ptype</em>' reference.
-	 * @see #setPtype(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Ptype()
+	 * @return the value of the '<em>Name</em>' reference.
+	 * @see #setName(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Name()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getPtype();
+	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ptype</em>' reference.
-	 * @see #getPtype()
+	 * @param value the new value of the '<em>Name</em>' reference.
+	 * @see #getName()
 	 * @generated
 	 */
-	void setPtype(CompositeNode value);
+	void setName(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' reference.
+	 * Returns the value of the '<em><b>Ptype</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Name</em>' reference isn't clear,
+	 * If the meaning of the '<em>Ptype</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' reference.
-	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Name()
+	 * @return the value of the '<em>Ptype</em>' reference.
+	 * @see #setPtype(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDeclaredParameterNode_Ptype()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getName();
+	CompositeNode getPtype();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' reference.
-	 * @see #getName()
+	 * @param value the new value of the '<em>Ptype</em>' reference.
+	 * @see #getPtype()
 	 * @generated
 	 */
-	void setName(CompositeNode value);
+	void setPtype(CompositeNode value);
 
 } // DeclaredParameterNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DefinitionAroundNode.java
index 96d5ead2..96481790 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionAroundNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DefinitionAroundNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionAroundNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: DefinitionAroundNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,14 +16,14 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface DefinitionAroundNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
@@ -64,14 +64,14 @@ public interface DefinitionAroundNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Pointcut</em>' reference.
 	 * @see #setPointcut(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Pointcut()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Pointcut()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getPointcut();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Pointcut</em>' reference.
@@ -90,14 +90,14 @@ public interface DefinitionAroundNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Param List</em>' reference.
 	 * @see #setParamList(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_ParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_ParamList()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getParamList();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Param List</em>' reference.
@@ -116,14 +116,14 @@ public interface DefinitionAroundNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionAroundNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DefinitionNode.java
index 311c834a..3d48e68d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/DefinitionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/DefinitionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionNode.java,v 1.6 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: DefinitionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,14 +16,14 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionNode()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface DefinitionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' reference.
 	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Name()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Name()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' reference.
@@ -64,14 +64,14 @@ public interface DefinitionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
@@ -90,14 +90,14 @@ public interface DefinitionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
@@ -116,14 +116,14 @@ public interface DefinitionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Param List</em>' reference.
 	 * @see #setParamList(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_ParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getDefinitionNode_ParamList()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getParamList();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Param List</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ElseIfStatementNode.java
index 169a0128..baac64dd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseIfStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ElseIfStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseIfStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ElseIfStatementNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,12 +16,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface ElseIfStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
@@ -62,14 +62,14 @@ public interface ElseIfStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getElseIfStatementNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ElseStatementNode.java
index e92f3ee5..5b7ea7b9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ElseStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ElseStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseStatementNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ElseStatementNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getElseStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getElseStatementNode()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface ElseStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getElseStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getElseStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ErrorStatementNode.java
index bfd0a2b2..cd25aa0e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ErrorStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ErrorStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ErrorStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ErrorStatementNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getErrorStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getErrorStatementNode()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface ErrorStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getErrorStatementNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getErrorStatementNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExpandStatementNode.java
index 86779dc1..9570debc 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpandStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExpandStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpandStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ExpandStatementNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,15 +16,15 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface ExpandStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Separator</em>' reference.
 	 * @see #setSeparator(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_Separator()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_Separator()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSeparator();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Separator</em>' reference.
@@ -65,14 +65,14 @@ public interface ExpandStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Param List</em>' reference.
 	 * @see #setParamList(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ParamList()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getParamList();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Param List</em>' reference.
@@ -91,14 +91,14 @@ public interface ExpandStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>For Each Expression</em>' reference.
 	 * @see #setForEachExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ForEachExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ForEachExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getForEachExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>For Each Expression</em>' reference.
@@ -117,14 +117,14 @@ public interface ExpandStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>For Expression</em>' reference.
 	 * @see #setForExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ForExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_ForExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getForExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>For Expression</em>' reference.
@@ -143,14 +143,14 @@ public interface ExpandStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' reference.
 	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_Name()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpandStatementNode_Name()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExpressionStmtNode.java
index 7ac6b453..dd79d9a6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExpressionStmtNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExpressionStmtNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpressionStmtNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ExpressionStmtNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpressionStmtNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpressionStmtNode()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface ExpressionStmtNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExpressionStmtNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExpressionStmtNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExtensionImportNode.java
index 1b876b79..432b4972 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionImportNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExtensionImportNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionImportNode.java,v 1.2 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ExtensionImportNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,12 +16,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface ExtensionImportNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
@@ -62,14 +62,14 @@ public interface ExtensionImportNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Namespace</em>' reference.
 	 * @see #setNamespace(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode_Namespace()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionImportNode_Namespace()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getNamespace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Namespace</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExtensionNode.java
index 49f859ea..82742da1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ExtensionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ExtensionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionNode.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: ExtensionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
@@ -17,152 +17,152 @@ import org.eclipse.tmf.common.node.LeafNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreatedName <em>Created Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getJavaCall <em>Java Call</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode()
  * @model
  * @generated
  */
 public interface ExtensionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Param List</b></em>' reference.
+	 * Returns the value of the '<em><b>Extend Body</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Param List</em>' reference isn't clear,
+	 * If the meaning of the '<em>Extend Body</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Param List</em>' reference.
-	 * @see #setParamList(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ParamList()
+	 * @return the value of the '<em>Extend Body</em>' reference.
+	 * @see #setExtendBody(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ExtendBody()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getParamList();
+	CompositeNode getExtendBody();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Param List</em>' reference.
-	 * @see #getParamList()
+	 * @param value the new value of the '<em>Extend Body</em>' reference.
+	 * @see #getExtendBody()
 	 * @generated
 	 */
-	void setParamList(CompositeNode value);
+	void setExtendBody(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Private</b></em>' reference.
+	 * Returns the value of the '<em><b>Return Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Private</em>' reference isn't clear,
+	 * If the meaning of the '<em>Return 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>Private</em>' reference.
-	 * @see #setPrivate(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Private()
+	 * @return the value of the '<em>Return Type</em>' reference.
+	 * @see #setReturnType(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ReturnType()
 	 * @model
 	 * @generated
 	 */
-	LeafNode getPrivate();
+	CompositeNode getReturnType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Private</em>' reference.
-	 * @see #getPrivate()
+	 * @param value the new value of the '<em>Return Type</em>' reference.
+	 * @see #getReturnType()
 	 * @generated
 	 */
-	void setPrivate(LeafNode value);
+	void setReturnType(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Return Type</b></em>' reference.
+	 * Returns the value of the '<em><b>Created Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Return Type</em>' reference isn't clear,
+	 * If the meaning of the '<em>Created Name</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Type</em>' reference.
-	 * @see #setReturnType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ReturnType()
+	 * @return the value of the '<em>Created Name</em>' reference.
+	 * @see #setCreatedName(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_CreatedName()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getReturnType();
+	CompositeNode getCreatedName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreatedName <em>Created Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Type</em>' reference.
-	 * @see #getReturnType()
+	 * @param value the new value of the '<em>Created Name</em>' reference.
+	 * @see #getCreatedName()
 	 * @generated
 	 */
-	void setReturnType(CompositeNode value);
+	void setCreatedName(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Java Return Type</b></em>' reference.
+	 * Returns the value of the '<em><b>Private</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Java Return Type</em>' reference isn't clear,
+	 * If the meaning of the '<em>Private</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Java Return Type</em>' reference.
-	 * @see #setJavaReturnType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaReturnType()
+	 * @return the value of the '<em>Private</em>' reference.
+	 * @see #setPrivate(LeafNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Private()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getJavaReturnType();
+	LeafNode getPrivate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Return Type</em>' reference.
-	 * @see #getJavaReturnType()
+	 * @param value the new value of the '<em>Private</em>' reference.
+	 * @see #getPrivate()
 	 * @generated
 	 */
-	void setJavaReturnType(CompositeNode value);
+	void setPrivate(LeafNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Create</b></em>' reference.
+	 * Returns the value of the '<em><b>Java Call</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Create</em>' reference isn't clear,
+	 * If the meaning of the '<em>Java Call</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Create</em>' reference.
-	 * @see #setCreate(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Create()
+	 * @return the value of the '<em>Java Call</em>' reference.
+	 * @see #setJavaCall(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaCall()
 	 * @model
 	 * @generated
 	 */
-	LeafNode getCreate();
+	CompositeNode getJavaCall();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getJavaCall <em>Java Call</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Create</em>' reference.
-	 * @see #getCreate()
+	 * @param value the new value of the '<em>Java Call</em>' reference.
+	 * @see #getJavaCall()
 	 * @generated
 	 */
-	void setCreate(LeafNode value);
+	void setJavaCall(CompositeNode value);
 
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' reference.
@@ -174,14 +174,14 @@ public interface ExtensionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' reference.
 	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Name()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Name()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' reference.
@@ -191,30 +191,30 @@ public interface ExtensionNode extends CompositeNode {
 	void setName(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Java Name</b></em>' reference.
+	 * Returns the value of the '<em><b>Create</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Java Name</em>' reference isn't clear,
+	 * If the meaning of the '<em>Create</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Java Name</em>' reference.
-	 * @see #setJavaName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_JavaName()
+	 * @return the value of the '<em>Create</em>' reference.
+	 * @see #setCreate(LeafNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Create()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getJavaName();
+	LeafNode getCreate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Java Name</em>' reference.
-	 * @see #getJavaName()
+	 * @param value the new value of the '<em>Create</em>' reference.
+	 * @see #getCreate()
 	 * @generated
 	 */
-	void setJavaName(CompositeNode value);
+	void setCreate(LeafNode value);
 
 	/**
 	 * Returns the value of the '<em><b>Cached</b></em>' reference.
@@ -226,14 +226,14 @@ public interface ExtensionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Cached</em>' reference.
 	 * @see #setCached(LeafNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Cached()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_Cached()
 	 * @model
 	 * @generated
 	 */
 	LeafNode getCached();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Cached</em>' reference.
@@ -243,29 +243,29 @@ public interface ExtensionNode extends CompositeNode {
 	void setCached(LeafNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Extend Body</b></em>' reference.
+	 * Returns the value of the '<em><b>Param List</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Extend Body</em>' reference isn't clear,
+	 * If the meaning of the '<em>Param List</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Extend Body</em>' reference.
-	 * @see #setExtendBody(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ExtendBody()
+	 * @return the value of the '<em>Param List</em>' reference.
+	 * @see #setParamList(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getExtensionNode_ParamList()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getExtendBody();
+	CompositeNode getParamList();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extend Body</em>' reference.
-	 * @see #getExtendBody()
+	 * @param value the new value of the '<em>Param List</em>' reference.
+	 * @see #getParamList()
 	 * @generated
 	 */
-	void setExtendBody(CompositeNode value);
+	void setParamList(CompositeNode value);
 
 } // ExtensionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FeatureCallNode.java
index a041b7ac..f5731a6f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FeatureCallNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FeatureCallNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FeatureCallNode.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: FeatureCallNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,13 +16,13 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode()
  * @model
  * @generated
  */
@@ -37,14 +37,14 @@ public interface FeatureCallNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Param List</em>' reference.
 	 * @see #setParamList(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_ParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_ParamList()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getParamList();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Param List</em>' reference.
@@ -63,14 +63,14 @@ public interface FeatureCallNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' reference.
 	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Name()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Name()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' reference.
@@ -89,14 +89,14 @@ public interface FeatureCallNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFeatureCallNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FileNode.java
index 60618892..47e86413 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FileNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: FileNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getImports <em>Imports</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getDeclarations <em>Declarations</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getDeclarations <em>Declarations</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getImports <em>Imports</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface FileNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Declarations</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileNode_Declarations()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileNode_Declarations()
 	 * @model
 	 * @generated
 	 */
@@ -54,7 +54,7 @@ public interface FileNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Imports</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileNode_Imports()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileNode_Imports()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FileStatementNode.java
index 1794f953..fb036449 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/FileStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/FileStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileStatementNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: FileStatementNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,13 +16,13 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileStatementNode()
  * @model
  * @generated
  */
@@ -37,14 +37,14 @@ public interface FileStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
@@ -63,14 +63,14 @@ public interface FileStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' reference.
 	 * @see #setIdentifier(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Identifier()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_Identifier()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' reference.
@@ -89,14 +89,14 @@ public interface FileStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name Expression</em>' reference.
 	 * @see #setNameExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_NameExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getFileStatementNode_NameExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getNameExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ForeachStatementNode.java
index 015cc611..6d286fc7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ForeachStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ForeachStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ForeachStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ForeachStatementNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,15 +16,15 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode()
  * @model
  * @generated
  */
@@ -39,14 +39,14 @@ public interface ForeachStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Iterator</em>' reference.
 	 * @see #setIterator(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Iterator()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Iterator()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getIterator();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Iterator</em>' reference.
@@ -65,14 +65,14 @@ public interface ForeachStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Identifier</em>' reference.
 	 * @see #setIdentifier(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Identifier()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Identifier()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getIdentifier();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Identifier</em>' reference.
@@ -91,14 +91,14 @@ public interface ForeachStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
@@ -117,14 +117,14 @@ public interface ForeachStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>For Expression</em>' reference.
 	 * @see #setForExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_ForExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_ForExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getForExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>For Expression</em>' reference.
@@ -143,14 +143,14 @@ public interface ForeachStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Separator Expression</em>' reference.
 	 * @see #setSeparatorExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_SeparatorExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getForeachStatementNode_SeparatorExpression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSeparatorExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Separator Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/GlobalVarExpressionNode.java
index 927b5fbb..6573f3c7 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/GlobalVarExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/GlobalVarExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: GlobalVarExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getGlobalVarExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getGlobalVarExpressionNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IdentifierNode.java
index 717eace8..5bfb561d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IdentifierNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IdentifierNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdentifierNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: IdentifierNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIdentifierNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIdentifierNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IfExpressionNode.java
index 872cbed0..2e48c716 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IfExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: IfExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,43 +16,43 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode()
  * @model
  * @generated
  */
 public interface IfExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Then</b></em>' reference.
+	 * Returns the value of the '<em><b>Condition0</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Then</em>' reference isn't clear,
+	 * If the meaning of the '<em>Condition0</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Then</em>' reference.
-	 * @see #setThen(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Then()
+	 * @return the value of the '<em>Condition0</em>' reference.
+	 * @see #setCondition0(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition0()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getThen();
+	CompositeNode getCondition0();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Then</em>' reference.
-	 * @see #getThen()
+	 * @param value the new value of the '<em>Condition0</em>' reference.
+	 * @see #getCondition0()
 	 * @generated
 	 */
-	void setThen(CompositeNode value);
+	void setCondition0(CompositeNode value);
 
 	/**
 	 * Returns the value of the '<em><b>Else</b></em>' reference.
@@ -64,14 +64,14 @@ public interface IfExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Else</em>' reference.
 	 * @see #setElse(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Else()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Else()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getElse();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Else</em>' reference.
@@ -81,30 +81,30 @@ public interface IfExpressionNode extends CompositeNode {
 	void setElse(CompositeNode value);
 
 	/**
-	 * Returns the value of the '<em><b>Condition0</b></em>' reference.
+	 * Returns the value of the '<em><b>Then</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Condition0</em>' reference isn't clear,
+	 * If the meaning of the '<em>Then</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Condition0</em>' reference.
-	 * @see #setCondition0(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition0()
+	 * @return the value of the '<em>Then</em>' reference.
+	 * @see #setThen(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Then()
 	 * @model
 	 * @generated
 	 */
-	CompositeNode getCondition0();
+	CompositeNode getThen();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Condition0</em>' reference.
-	 * @see #getCondition0()
+	 * @param value the new value of the '<em>Then</em>' reference.
+	 * @see #getThen()
 	 * @generated
 	 */
-	void setCondition0(CompositeNode value);
+	void setThen(CompositeNode value);
 
 	/**
 	 * Returns the value of the '<em><b>Condition1</b></em>' reference.
@@ -116,14 +116,14 @@ public interface IfExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Condition1</em>' reference.
 	 * @see #setCondition1(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition1()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfExpressionNode_Condition1()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getCondition1();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Condition1</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IfStatementNode.java
index 3327ff26..6296b937 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/IfStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/IfStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: IfStatementNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,14 +18,14 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfStatementNode()
  * @model
  * @generated
  */
@@ -40,7 +40,7 @@ public interface IfStatementNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Else Ifs</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_ElseIfs()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_ElseIfs()
 	 * @model
 	 * @generated
 	 */
@@ -56,14 +56,14 @@ public interface IfStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
@@ -82,14 +82,14 @@ public interface IfStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Else</em>' reference.
 	 * @see #setElse(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Else()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Else()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getElse();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Else</em>' reference.
@@ -108,14 +108,14 @@ public interface IfStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getIfStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ImpliesExpressionNode.java
index 6c7d1ade..d49e6ee9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImpliesExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ImpliesExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImpliesExpressionNode.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ImpliesExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface ImpliesExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_Nexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_Nexts()
 	 * @model
 	 * @generated
 	 */
@@ -54,14 +54,14 @@ public interface ImpliesExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImpliesExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ImportNode.java
index f266d31b..70c145a9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ImportNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ImportNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImportNode.java,v 1.3 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: ImportNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,12 +16,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getType <em>Type</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImportNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImportNode()
  * @model
  * @generated
  */
@@ -36,14 +36,14 @@ public interface ImportNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Namespace</em>' reference.
 	 * @see #setNamespace(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImportNode_Namespace()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImportNode_Namespace()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getNamespace();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Namespace</em>' reference.
@@ -62,14 +62,14 @@ public interface ImportNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Type</em>' reference.
 	 * @see #setType(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getImportNode_Type()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getImportNode_Type()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getType <em>Type</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getType <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Type</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/InfixExpressionNode.java
index 1c0e8f44..612d7ce9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/InfixExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/InfixExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: InfixExpressionNode.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: InfixExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,33 +18,17 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode()
  * @model
  * @generated
  */
 public interface InfixExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Calls</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Calls</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>Calls</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Calls()
-	 * @model
-	 * @generated
-	 */
-	EList<CompositeNode> getCalls();
-
-	/**
 	 * Returns the value of the '<em><b>Target</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -54,14 +38,14 @@ public interface InfixExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target</em>' reference.
 	 * @see #setTarget(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Target()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Target()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getTarget();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Target</em>' reference.
@@ -70,4 +54,20 @@ public interface InfixExpressionNode extends CompositeNode {
 	 */
 	void setTarget(CompositeNode value);
 
+	/**
+	 * Returns the value of the '<em><b>Calls</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Calls</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>Calls</em>' reference list.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getInfixExpressionNode_Calls()
+	 * @model
+	 * @generated
+	 */
+	EList<CompositeNode> getCalls();
+
 } // InfixExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/JavaCallNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/JavaCallNode.java
new file mode 100644
index 00000000..bf2c6455
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/JavaCallNode.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaCallNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
+
+import org.eclipse.tmf.common.node.CompositeNode;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Java Call Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaReturnType <em>Java Return Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaName <em>Java Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getJavaCallNode()
+ * @model
+ * @generated
+ */
+public interface JavaCallNode extends CompositeNode {
+	/**
+	 * Returns the value of the '<em><b>Java Return Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Java Return 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>Java Return Type</em>' reference.
+	 * @see #setJavaReturnType(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getJavaCallNode_JavaReturnType()
+	 * @model
+	 * @generated
+	 */
+	CompositeNode getJavaReturnType();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaReturnType <em>Java Return Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Java Return Type</em>' reference.
+	 * @see #getJavaReturnType()
+	 * @generated
+	 */
+	void setJavaReturnType(CompositeNode value);
+
+	/**
+	 * Returns the value of the '<em><b>Java Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Java Name</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Java Name</em>' reference.
+	 * @see #setJavaName(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getJavaCallNode_JavaName()
+	 * @model
+	 * @generated
+	 */
+	CompositeNode getJavaName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaName <em>Java Name</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Java Name</em>' reference.
+	 * @see #getJavaName()
+	 * @generated
+	 */
+	void setJavaName(CompositeNode value);
+
+} // JavaCallNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/JavaTypeNode.java
index 0d8ddeec..ef94c6d6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/JavaTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/JavaTypeNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JavaTypeNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: JavaTypeNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getJavaTypeNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getJavaTypeNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/LetExpressionNode.java
index 914698b4..647dc381 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/LetExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: LetExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getLetExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getLetExpressionNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/LetStatementNode.java
index 4acbe2cc..869c42f6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/LetStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/LetStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetStatementNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: LetStatementNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,13 +16,13 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getLetStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getLetStatementNode()
  * @model
  * @generated
  */
@@ -37,14 +37,14 @@ public interface LetStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
@@ -63,14 +63,14 @@ public interface LetStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' reference.
 	 * @see #setName(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Name()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Name()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getName <em>Name</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getName <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' reference.
@@ -89,14 +89,14 @@ public interface LetStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getLetStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ListLiteralNode.java
index 0a57455f..a7975f3d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ListLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ListLiteralNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ListLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ListLiteralNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,11 +18,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getListLiteralNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getListLiteralNode()
  * @model
  * @generated
  */
@@ -37,7 +37,7 @@ public interface ListLiteralNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Elements</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getListLiteralNode_Elements()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getListLiteralNode_Elements()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/MultiplicativeExpressionNode.java
index 4673484c..8c648a1a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/MultiplicativeExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/MultiplicativeExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MultiplicativeExpressionNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,33 +18,17 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode()
  * @model
  * @generated
  */
 public interface MultiplicativeExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Nexts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nexts</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>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_Nexts()
-	 * @model
-	 * @generated
-	 */
-	EList<CompositeNode> getNexts();
-
-	/**
 	 * Returns the value of the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -54,14 +38,14 @@ public interface MultiplicativeExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
@@ -70,4 +54,20 @@ public interface MultiplicativeExpressionNode extends CompositeNode {
 	 */
 	void setFirst(CompositeNode value);
 
+	/**
+	 * Returns the value of the '<em><b>Nexts</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nexts</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>Nexts</em>' reference list.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getMultiplicativeExpressionNode_Nexts()
+	 * @model
+	 * @generated
+	 */
+	EList<CompositeNode> getNexts();
+
 } // MultiplicativeExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/NullLiteralNode.java
index 2cd682e8..4ccf1675 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NullLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/NullLiteralNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NullLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: NullLiteralNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getNullLiteralNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getNullLiteralNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/NumberLiteralNode.java
index 1492514b..7a1e2009 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/NumberLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/NumberLiteralNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NumberLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: NumberLiteralNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getNumberLiteralNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getNumberLiteralNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/OrExpressionNode.java
index e7e7f0d0..6ba14d09 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/OrExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/OrExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: OrExpressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: OrExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,33 +18,17 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode()
  * @model
  * @generated
  */
 public interface OrExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Nexts</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nexts</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>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_Nexts()
-	 * @model
-	 * @generated
-	 */
-	EList<CompositeNode> getNexts();
-
-	/**
 	 * Returns the value of the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -54,14 +38,14 @@ public interface OrExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
@@ -70,4 +54,20 @@ public interface OrExpressionNode extends CompositeNode {
 	 */
 	void setFirst(CompositeNode value);
 
+	/**
+	 * Returns the value of the '<em><b>Nexts</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.tmf.common.node.CompositeNode}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Nexts</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>Nexts</em>' reference list.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getOrExpressionNode_Nexts()
+	 * @model
+	 * @generated
+	 */
+	EList<CompositeNode> getNexts();
+
 } // OrExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ParameterListNode.java
index 55cf96eb..e71fe54f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParameterListNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ParameterListNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParameterListNode.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ParameterListNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,11 +18,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParameterListNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getParameterListNode()
  * @model
  * @generated
  */
@@ -37,7 +37,7 @@ public interface ParameterListNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Params</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParameterListNode_Params()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getParameterListNode_Params()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ParanthesizedExpressionNode.java
index da6b0fb0..c34bf710 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ParanthesizedExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ParanthesizedExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParanthesizedExpressionNode.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface ParanthesizedExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getParanthesizedExpressionNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/PointcutNode.java
index 060c20b1..05dc250d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/PointcutNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/PointcutNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PointcutNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: PointcutNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getPointcutNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getPointcutNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ProtectStatementNode.java
index 84555f06..894ba349 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/ProtectStatementNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/ProtectStatementNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProtectStatementNode.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ProtectStatementNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,14 +16,14 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode()
  * @model
  * @generated
  */
@@ -38,14 +38,14 @@ public interface ProtectStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence</em>' reference.
 	 * @see #setSequence(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Sequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Sequence()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getSequence();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence</em>' reference.
@@ -64,14 +64,14 @@ public interface ProtectStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Cend</em>' reference.
 	 * @see #setCend(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cend()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cend()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getCend();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Cend</em>' reference.
@@ -90,14 +90,14 @@ public interface ProtectStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' reference.
 	 * @see #setId(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Id()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Id()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' reference.
@@ -116,14 +116,14 @@ public interface ProtectStatementNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Cstart</em>' reference.
 	 * @see #setCstart(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cstart()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getProtectStatementNode_Cstart()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getCstart();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Cstart</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/RelationalExpressionNode.java
index 73a59c67..1a0fee6c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/RelationalExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/RelationalExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RelationalExpressionNode.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: RelationalExpressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface RelationalExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nexts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Nexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_Nexts()
 	 * @model
 	 * @generated
 	 */
@@ -54,14 +54,14 @@ public interface RelationalExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>First</em>' reference.
 	 * @see #setFirst(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_First()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getRelationalExpressionNode_First()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getFirst();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>First</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SequenceNode.java
index 156a9f8f..be9655de 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SequenceNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SequenceNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SequenceNode.java,v 1.5 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: SequenceNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,12 +18,12 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getStatements <em>Statements</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getTextSequences <em>Text Sequences</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getTextSequences <em>Text Sequences</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getStatements <em>Statements</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSequenceNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSequenceNode()
  * @model
  * @generated
  */
@@ -38,7 +38,7 @@ public interface SequenceNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Text Sequences</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSequenceNode_TextSequences()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSequenceNode_TextSequences()
 	 * @model
 	 * @generated
 	 */
@@ -54,7 +54,7 @@ public interface SequenceNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Statements</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSequenceNode_Statements()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSequenceNode_Statements()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SimpleTypeNode.java
index 7bca12f4..e2d350db 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SimpleTypeNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SimpleTypeNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SimpleTypeNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: SimpleTypeNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,11 +18,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode()
  * @model
  * @generated
  */
@@ -37,7 +37,7 @@ public interface SimpleTypeNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Names</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode_Names()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSimpleTypeNode_Names()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/StringLiteralNode.java
index ec436f97..299ec4ca 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/StringLiteralNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/StringLiteralNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: StringLiteralNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: StringLiteralNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getStringLiteralNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getStringLiteralNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SwitchExpressionNode.java
index ebcb318e..b6b808d8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/SwitchExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/SwitchExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SwitchExpressionNode.java,v 1.4 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: SwitchExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,44 +18,18 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode()
  * @model
  * @generated
  */
 public interface SwitchExpressionNode extends CompositeNode {
 	/**
-	 * Returns the value of the '<em><b>Default</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default</em>' reference.
-	 * @see #setDefault(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Default()
-	 * @model
-	 * @generated
-	 */
-	CompositeNode getDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default</em>' reference.
-	 * @see #getDefault()
-	 * @generated
-	 */
-	void setDefault(CompositeNode value);
-
-	/**
 	 * Returns the value of the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -65,14 +39,14 @@ public interface SwitchExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Expression</em>' reference.
 	 * @see #setExpression(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Expression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Expression()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getExpression();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Expression</em>' reference.
@@ -91,10 +65,36 @@ public interface SwitchExpressionNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Cases</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Cases()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Cases()
 	 * @model
 	 * @generated
 	 */
 	EList<CompositeNode> getCases();
 
+	/**
+	 * Returns the value of the '<em><b>Default</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Default</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Default</em>' reference.
+	 * @see #setDefault(CompositeNode)
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getSwitchExpressionNode_Default()
+	 * @model
+	 * @generated
+	 */
+	CompositeNode getDefault();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Default</em>' reference.
+	 * @see #getDefault()
+	 * @generated
+	 */
+	void setDefault(CompositeNode value);
+
 } // SwitchExpressionNode
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Test_expressionNode.java
index 5fd559a5..f1662627 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Test_expressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Test_expressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Test_expressionNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: Test_expressionNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTest_expressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getTest_expressionNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/TextNode.java
index 7774df59..bb3fce46 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/TextNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextNode.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: TextNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -14,7 +14,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTextNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getTextNode()
  * @model
  * @generated
  */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/TextSequenceNode.java
index df821000..0b14a477 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/TextSequenceNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/TextSequenceNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextSequenceNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: TextSequenceNode.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.common.util.EList;
 
@@ -18,11 +18,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode()
  * @model
  * @generated
  */
@@ -37,7 +37,7 @@ public interface TextSequenceNode extends CompositeNode {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Texts</em>' reference list.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode_Texts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getTextSequenceNode_Texts()
 	 * @model
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/UnaryExpressionNode.java
index b9594172..b7b625b5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/UnaryExpressionNode.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/UnaryExpressionNode.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UnaryExpressionNode.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: UnaryExpressionNode.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
@@ -16,11 +16,11 @@ import org.eclipse.tmf.common.node.CompositeNode;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getUnaryExpressionNode()
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getUnaryExpressionNode()
  * @model
  * @generated
  */
@@ -35,14 +35,14 @@ public interface UnaryExpressionNode extends CompositeNode {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Operand</em>' reference.
 	 * @see #setOperand(CompositeNode)
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#getUnaryExpressionNode_Operand()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#getUnaryExpressionNode_Operand()
 	 * @model
 	 * @generated
 	 */
 	CompositeNode getOperand();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}' reference.
+	 * Sets the value of the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Operand</em>' reference.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Xpand3nodeFactory.java
index 2094c752..07dcc2e0 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodeFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Xpand3nodeFactory.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodeFactory.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: Xpand3nodeFactory.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory;
  * 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.xpand3.internal.parser.xpand3node.Xpand3nodePackage
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage
  * @generated
  */
 public interface Xpand3nodeFactory extends EFactory {
@@ -23,7 +23,7 @@ public interface Xpand3nodeFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	Xpand3nodeFactory eINSTANCE = org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodeFactoryImpl.init();
+	Xpand3nodeFactory eINSTANCE = org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodeFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>File Node</em>'.
@@ -224,6 +224,15 @@ public interface Xpand3nodeFactory extends EFactory {
 	ExtensionNode createExtensionNode();
 
 	/**
+	 * Returns a new object of class '<em>Java Call Node</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Java Call Node</em>'.
+	 * @generated
+	 */
+	JavaCallNode createJavaCallNode();
+
+	/**
 	 * Returns a new object of class '<em>Java Type Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Xpand3nodePackage.java
index 63ad3b41..1761fdb2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/Xpand3nodePackage.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/Xpand3nodePackage.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodePackage.java,v 1.7 2008/03/17 10:55:26 jkohnlein Exp $
+ * $Id: Xpand3nodePackage.java,v 1.1 2008/03/17 14:39:11 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
@@ -23,7 +23,7 @@ import org.eclipse.tmf.common.node.NodePackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodeFactory
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodeFactory
  * @model kind="package"
  * @generated
  */
@@ -58,14 +58,14 @@ public interface Xpand3nodePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	Xpand3nodePackage eINSTANCE = org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl.init();
+	Xpand3nodePackage eINSTANCE = org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl <em>File Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl <em>File Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileNode()
 	 * @generated
 	 */
 	int FILE_NODE = 0;
@@ -89,22 +89,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int FILE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Imports</b></em>' reference list.
+	 * The feature id for the '<em><b>Declarations</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FILE_NODE__IMPORTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int FILE_NODE__DECLARATIONS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Declarations</b></em>' reference list.
+	 * The feature id for the '<em><b>Imports</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FILE_NODE__DECLARATIONS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int FILE_NODE__IMPORTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>File Node</em>' class.
@@ -116,11 +116,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int FILE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl <em>Import Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl <em>Import Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImportNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getImportNode()
 	 * @generated
 	 */
 	int IMPORT_NODE = 1;
@@ -144,22 +144,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int IMPORT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * The feature id for the '<em><b>Namespace</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMPORT_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int IMPORT_NODE__NAMESPACE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Namespace</b></em>' reference.
+	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMPORT_NODE__NAMESPACE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int IMPORT_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Import Node</em>' class.
@@ -171,11 +171,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int IMPORT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl <em>Extension Import Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl <em>Extension Import Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionImportNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionImportNode()
 	 * @generated
 	 */
 	int EXTENSION_IMPORT_NODE = 2;
@@ -226,11 +226,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXTENSION_IMPORT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl <em>Definition Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl <em>Definition Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionNode()
 	 * @generated
 	 */
 	int DEFINITION_NODE = 3;
@@ -254,13 +254,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DEFINITION_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int DEFINITION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Type</b></em>' reference.
@@ -272,13 +272,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DEFINITION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int DEFINITION_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Param List</b></em>' reference.
@@ -299,11 +299,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl <em>Definition Around Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl <em>Definition Around Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionAroundNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionAroundNode()
 	 * @generated
 	 */
 	int DEFINITION_AROUND_NODE = 4;
@@ -336,13 +336,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_AROUND_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Pointcut</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DEFINITION_AROUND_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int DEFINITION_AROUND_NODE__POINTCUT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Param List</b></em>' reference.
@@ -354,13 +354,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_AROUND_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Pointcut</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DEFINITION_AROUND_NODE__POINTCUT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int DEFINITION_AROUND_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Definition Around Node</em>' class.
@@ -372,11 +372,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int DEFINITION_AROUND_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl <em>Sequence Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl <em>Sequence Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSequenceNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSequenceNode()
 	 * @generated
 	 */
 	int SEQUENCE_NODE = 5;
@@ -400,22 +400,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int SEQUENCE_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Statements</b></em>' reference list.
+	 * The feature id for the '<em><b>Text Sequences</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SEQUENCE_NODE__STATEMENTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int SEQUENCE_NODE__TEXT_SEQUENCES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Text Sequences</b></em>' reference list.
+	 * The feature id for the '<em><b>Statements</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SEQUENCE_NODE__TEXT_SEQUENCES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int SEQUENCE_NODE__STATEMENTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Sequence Node</em>' class.
@@ -427,11 +427,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int SEQUENCE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl <em>Text Sequence Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextSequenceNodeImpl <em>Text Sequence Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextSequenceNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextSequenceNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextSequenceNode()
 	 * @generated
 	 */
 	int TEXT_SEQUENCE_NODE = 6;
@@ -473,11 +473,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int TEXT_SEQUENCE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextNodeImpl <em>Text Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextNodeImpl <em>Text Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.TextNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextNode()
 	 * @generated
 	 */
 	int TEXT_NODE = 7;
@@ -510,11 +510,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int TEXT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ErrorStatementNodeImpl <em>Error Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ErrorStatementNodeImpl <em>Error Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ErrorStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getErrorStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ErrorStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getErrorStatementNode()
 	 * @generated
 	 */
 	int ERROR_STATEMENT_NODE = 8;
@@ -556,11 +556,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int ERROR_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl <em>Expand Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl <em>Expand Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpandStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpandStatementNode()
 	 * @generated
 	 */
 	int EXPAND_STATEMENT_NODE = 9;
@@ -593,40 +593,40 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXPAND_STATEMENT_NODE__SEPARATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Param List</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPAND_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int EXPAND_STATEMENT_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>For Expression</b></em>' reference.
+	 * The feature id for the '<em><b>For Each Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Param List</b></em>' reference.
+	 * The feature id for the '<em><b>For Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPAND_STATEMENT_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int EXPAND_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>For Each Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+	int EXPAND_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>Expand Statement Node</em>' class.
@@ -638,11 +638,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXPAND_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl <em>Expression Stmt Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpressionStmtNodeImpl <em>Expression Stmt Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionStmtNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpressionStmtNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionStmtNode()
 	 * @generated
 	 */
 	int EXPRESSION_STMT_NODE = 10;
@@ -684,11 +684,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXPRESSION_STMT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl <em>File Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl <em>File Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileStatementNode()
 	 * @generated
 	 */
 	int FILE_STATEMENT_NODE = 11;
@@ -748,11 +748,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int FILE_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl <em>Foreach Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl <em>Foreach Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getForeachStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getForeachStatementNode()
 	 * @generated
 	 */
 	int FOREACH_STATEMENT_NODE = 12;
@@ -776,31 +776,31 @@ public interface Xpand3nodePackage extends EPackage {
 	int FOREACH_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Separator Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Iterator</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int FOREACH_STATEMENT_NODE__ITERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Identifier</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FOREACH_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int FOREACH_STATEMENT_NODE__IDENTIFIER = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Iterator</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FOREACH_STATEMENT_NODE__ITERATOR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int FOREACH_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>For Expression</b></em>' reference.
@@ -812,13 +812,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int FOREACH_STATEMENT_NODE__FOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' reference.
+	 * The feature id for the '<em><b>Separator Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FOREACH_STATEMENT_NODE__IDENTIFIER = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+	int FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of structural features of the '<em>Foreach Statement Node</em>' class.
@@ -830,11 +830,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int FOREACH_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl <em>If Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl <em>If Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfStatementNode()
 	 * @generated
 	 */
 	int IF_STATEMENT_NODE = 13;
@@ -858,40 +858,40 @@ public interface Xpand3nodePackage extends EPackage {
 	int IF_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Else</b></em>' reference.
+	 * The feature id for the '<em><b>Else Ifs</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_STATEMENT_NODE__ELSE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int IF_STATEMENT_NODE__ELSE_IFS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Else Ifs</b></em>' reference list.
+	 * The feature id for the '<em><b>Else</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_STATEMENT_NODE__ELSE_IFS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int IF_STATEMENT_NODE__ELSE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>If Statement Node</em>' class.
@@ -903,11 +903,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int IF_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl <em>Else If Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl <em>Else If Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseIfStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseIfStatementNode()
 	 * @generated
 	 */
 	int ELSE_IF_STATEMENT_NODE = 14;
@@ -931,22 +931,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int ELSE_IF_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELSE_IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int ELSE_IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int ELSE_IF_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int ELSE_IF_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Else If Statement Node</em>' class.
@@ -958,11 +958,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int ELSE_IF_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseStatementNodeImpl <em>Else Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseStatementNodeImpl <em>Else Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseStatementNode()
 	 * @generated
 	 */
 	int ELSE_STATEMENT_NODE = 15;
@@ -1004,11 +1004,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int ELSE_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl <em>Let Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl <em>Let Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetStatementNode()
 	 * @generated
 	 */
 	int LET_STATEMENT_NODE = 16;
@@ -1032,22 +1032,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int LET_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int LET_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int LET_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int LET_STATEMENT_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int LET_STATEMENT_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Sequence</b></em>' reference.
@@ -1068,11 +1068,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int LET_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl <em>Protect Statement Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl <em>Protect Statement Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getProtectStatementNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getProtectStatementNode()
 	 * @generated
 	 */
 	int PROTECT_STATEMENT_NODE = 17;
@@ -1096,40 +1096,40 @@ public interface Xpand3nodePackage extends EPackage {
 	int PROTECT_STATEMENT_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Cstart</b></em>' reference.
+	 * The feature id for the '<em><b>Sequence</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROTECT_STATEMENT_NODE__CSTART = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int PROTECT_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Sequence</b></em>' reference.
+	 * The feature id for the '<em><b>Cend</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROTECT_STATEMENT_NODE__SEQUENCE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int PROTECT_STATEMENT_NODE__CEND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Cend</b></em>' reference.
+	 * The feature id for the '<em><b>Id</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROTECT_STATEMENT_NODE__CEND = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int PROTECT_STATEMENT_NODE__ID = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' reference.
+	 * The feature id for the '<em><b>Cstart</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int PROTECT_STATEMENT_NODE__ID = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int PROTECT_STATEMENT_NODE__CSTART = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Protect Statement Node</em>' class.
@@ -1141,11 +1141,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int PROTECT_STATEMENT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl <em>Check Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl <em>Check Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCheckNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCheckNode()
 	 * @generated
 	 */
 	int CHECK_NODE = 18;
@@ -1169,58 +1169,58 @@ public interface Xpand3nodePackage extends EPackage {
 	int CHECK_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Error</b></em>' reference.
+	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__ERROR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int CHECK_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Warning</b></em>' reference.
+	 * The feature id for the '<em><b>Error</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__WARNING = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int CHECK_NODE__ERROR = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * The feature id for the '<em><b>Message</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int CHECK_NODE__MESSAGE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Constraint</b></em>' reference.
+	 * The feature id for the '<em><b>If Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__CONSTRAINT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int CHECK_NODE__IF_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>If Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Warning</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__IF_EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+	int CHECK_NODE__WARNING = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Message</b></em>' reference.
+	 * The feature id for the '<em><b>Constraint</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHECK_NODE__MESSAGE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
+	int CHECK_NODE__CONSTRAINT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Check Node</em>' class.
@@ -1232,11 +1232,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int CHECK_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAroundNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AroundNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAroundNode()
 	 * @generated
 	 */
 	int AROUND_NODE = 19;
@@ -1269,11 +1269,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int AROUND_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.PointcutNodeImpl <em>Pointcut Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.PointcutNodeImpl <em>Pointcut Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.PointcutNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getPointcutNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.PointcutNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getPointcutNode()
 	 * @generated
 	 */
 	int POINTCUT_NODE = 20;
@@ -1306,11 +1306,11 @@ public interface Xpand3nodePackage extends EPackage {
 	int POINTCUT_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl <em>Extension Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl <em>Extension Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionNode()
 	 * @generated
 	 */
 	int EXTENSION_NODE = 21;
@@ -1343,76 +1343,76 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXTENSION_NODE__EXTEND_BODY = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Java Name</b></em>' reference.
+	 * The feature id for the '<em><b>Return Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Param List</b></em>' reference.
+	 * The feature id for the '<em><b>Created Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int EXTENSION_NODE__CREATED_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Create</b></em>' reference.
+	 * The feature id for the '<em><b>Private</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Java Call</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
+	int EXTENSION_NODE__JAVA_CALL = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Return Type</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
+	int EXTENSION_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 5;
 
 	/**
-	 * The feature id for the '<em><b>Private</b></em>' reference.
+	 * The feature id for the '<em><b>Create</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__PRIVATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6;
+	int EXTENSION_NODE__CREATE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Java Return Type</b></em>' reference.
+	 * The feature id for the '<em><b>Cached</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7;
+	int EXTENSION_NODE__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Cached</b></em>' reference.
+	 * The feature id for the '<em><b>Param List</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EXTENSION_NODE__CACHED = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8;
+	int EXTENSION_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 8;
 
 	/**
 	 * The number of structural features of the '<em>Extension Node</em>' class.
@@ -1424,14 +1424,69 @@ public interface Xpand3nodePackage extends EPackage {
 	int EXTENSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 9;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl <em>Java Call Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaTypeNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaCallNode()
 	 * @generated
 	 */
-	int JAVA_TYPE_NODE = 22;
+	int JAVA_CALL_NODE = 22;
+
+	/**
+	 * The feature id for the '<em><b>Alias</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_CALL_NODE__ALIAS = NodePackage.COMPOSITE_NODE__ALIAS;
+
+	/**
+	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_CALL_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
+
+	/**
+	 * The feature id for the '<em><b>Java Return Type</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_CALL_NODE__JAVA_RETURN_TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Java Name</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_CALL_NODE__JAVA_NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Java Call Node</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int JAVA_CALL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaTypeNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaTypeNode()
+	 * @generated
+	 */
+	int JAVA_TYPE_NODE = 23;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1461,14 +1516,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int JAVA_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.Test_expressionNodeImpl <em>Test expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Test_expressionNodeImpl <em>Test expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Test_expressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTest_expressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Test_expressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTest_expressionNode()
 	 * @generated
 	 */
-	int TEST_EXPRESSION_NODE = 23;
+	int TEST_EXPRESSION_NODE = 24;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1498,14 +1553,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int TEST_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode()
 	 * @generated
 	 */
-	int LET_EXPRESSION_NODE = 24;
+	int LET_EXPRESSION_NODE = 25;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1535,14 +1590,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int LET_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode()
 	 * @generated
 	 */
-	int CASTED_EXPRESSION_NODE = 25;
+	int CASTED_EXPRESSION_NODE = 26;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1590,14 +1645,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int CASTED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode()
 	 * @generated
 	 */
-	int CHAIN_EXPRESSION_NODE = 26;
+	int CHAIN_EXPRESSION_NODE = 27;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1618,22 +1673,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int CHAIN_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>First</b></em>' reference.
+	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHAIN_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int CHAIN_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
+	 * The feature id for the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CHAIN_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int CHAIN_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Chain Expression Node</em>' class.
@@ -1645,14 +1700,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int CHAIN_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfExpressionNode()
 	 * @generated
 	 */
-	int IF_EXPRESSION_NODE = 27;
+	int IF_EXPRESSION_NODE = 28;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1673,13 +1728,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int IF_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Condition1</b></em>' reference.
+	 * The feature id for the '<em><b>Condition0</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_EXPRESSION_NODE__CONDITION1 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int IF_EXPRESSION_NODE__CONDITION0 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Else</b></em>' reference.
@@ -1700,13 +1755,13 @@ public interface Xpand3nodePackage extends EPackage {
 	int IF_EXPRESSION_NODE__THEN = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Condition0</b></em>' reference.
+	 * The feature id for the '<em><b>Condition1</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IF_EXPRESSION_NODE__CONDITION0 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
+	int IF_EXPRESSION_NODE__CONDITION1 = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>If Expression Node</em>' class.
@@ -1718,14 +1773,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int IF_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSwitchExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSwitchExpressionNode()
 	 * @generated
 	 */
-	int SWITCH_EXPRESSION_NODE = 28;
+	int SWITCH_EXPRESSION_NODE = 29;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1746,22 +1801,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int SWITCH_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Cases</b></em>' reference list.
+	 * The feature id for the '<em><b>Expression</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SWITCH_EXPRESSION_NODE__CASES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int SWITCH_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Expression</b></em>' reference.
+	 * The feature id for the '<em><b>Cases</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SWITCH_EXPRESSION_NODE__EXPRESSION = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int SWITCH_EXPRESSION_NODE__CASES = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Default</b></em>' reference.
@@ -1782,14 +1837,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int SWITCH_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCasePartNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCasePartNode()
 	 * @generated
 	 */
-	int CASE_PART_NODE = 29;
+	int CASE_PART_NODE = 30;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1837,14 +1892,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int CASE_PART_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getOrExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getOrExpressionNode()
 	 * @generated
 	 */
-	int OR_EXPRESSION_NODE = 30;
+	int OR_EXPRESSION_NODE = 31;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1865,22 +1920,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int OR_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
+	 * The feature id for the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OR_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int OR_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>First</b></em>' reference.
+	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int OR_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int OR_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Or Expression Node</em>' class.
@@ -1892,14 +1947,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int OR_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode()
 	 * @generated
 	 */
-	int AND_EXPRESSION_NODE = 31;
+	int AND_EXPRESSION_NODE = 32;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1920,22 +1975,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int AND_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
+	 * The feature id for the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int AND_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int AND_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>First</b></em>' reference.
+	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int AND_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int AND_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>And Expression Node</em>' class.
@@ -1947,14 +2002,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int AND_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode()
 	 * @generated
 	 */
-	int IMPLIES_EXPRESSION_NODE = 32;
+	int IMPLIES_EXPRESSION_NODE = 33;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -1975,22 +2030,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int IMPLIES_EXPRESSION_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>First</b></em>' reference.
+	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMPLIES_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int IMPLIES_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Nexts</b></em>' reference list.
+	 * The feature id for the '<em><b>First</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int IMPLIES_EXPRESSION_NODE__NEXTS = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int IMPLIES_EXPRESSION_NODE__FIRST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Implies Expression Node</em>' class.
@@ -2002,14 +2057,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int IMPLIES_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode()
 	 * @generated
 	 */
-	int RELATIONAL_EXPRESSION_NODE = 33;
+	int RELATIONAL_EXPRESSION_NODE = 34;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2057,14 +2112,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int RELATIONAL_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
 	 * @generated
 	 */
-	int ADDITIVE_EXPRESSION_NODE = 34;
+	int ADDITIVE_EXPRESSION_NODE = 35;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2112,14 +2167,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int ADDITIVE_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl <em>Multiplicative Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl <em>Multiplicative Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
 	 * @generated
 	 */
-	int MULTIPLICATIVE_EXPRESSION_NODE = 35;
+	int MULTIPLICATIVE_EXPRESSION_NODE = 36;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2167,14 +2222,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int MULTIPLICATIVE_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl <em>Unary Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.UnaryExpressionNodeImpl <em>Unary Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.UnaryExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
 	 * @generated
 	 */
-	int UNARY_EXPRESSION_NODE = 36;
+	int UNARY_EXPRESSION_NODE = 37;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2213,14 +2268,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int UNARY_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl <em>Infix Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl <em>Infix Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
 	 * @generated
 	 */
-	int INFIX_EXPRESSION_NODE = 37;
+	int INFIX_EXPRESSION_NODE = 38;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2268,14 +2323,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int INFIX_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.StringLiteralNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
 	 * @generated
 	 */
-	int STRING_LITERAL_NODE = 38;
+	int STRING_LITERAL_NODE = 39;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2305,14 +2360,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int STRING_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl <em>Paranthesized Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl <em>Paranthesized Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
 	 * @generated
 	 */
-	int PARANTHESIZED_EXPRESSION_NODE = 39;
+	int PARANTHESIZED_EXPRESSION_NODE = 40;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2351,14 +2406,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int PARANTHESIZED_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.GlobalVarExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
 	 * @generated
 	 */
-	int GLOBAL_VAR_EXPRESSION_NODE = 40;
+	int GLOBAL_VAR_EXPRESSION_NODE = 41;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2388,14 +2443,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int GLOBAL_VAR_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl <em>Feature Call Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl <em>Feature Call Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
 	 * @generated
 	 */
-	int FEATURE_CALL_NODE = 41;
+	int FEATURE_CALL_NODE = 42;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2416,31 +2471,31 @@ public interface Xpand3nodePackage extends EPackage {
 	int FEATURE_CALL_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' reference.
+	 * The feature id for the '<em><b>Param List</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_CALL_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Param List</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_CALL_NODE__PARAM_LIST = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Type</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int FEATURE_CALL_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
+	int FEATURE_CALL_NODE__TYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Feature Call Node</em>' class.
@@ -2452,14 +2507,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int FEATURE_CALL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ListLiteralNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
 	 * @generated
 	 */
-	int LIST_LITERAL_NODE = 42;
+	int LIST_LITERAL_NODE = 43;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2498,14 +2553,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int LIST_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ConstructorCallNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
 	 * @generated
 	 */
-	int CONSTRUCTOR_CALL_NODE = 43;
+	int CONSTRUCTOR_CALL_NODE = 44;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2535,14 +2590,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int CONSTRUCTOR_CALL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanLiteralNodeImpl <em>Boolean Literal Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.BooleanLiteralNodeImpl <em>Boolean Literal Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanLiteralNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.BooleanLiteralNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
 	 * @generated
 	 */
-	int BOOLEAN_LITERAL_NODE = 44;
+	int BOOLEAN_LITERAL_NODE = 45;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2572,14 +2627,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int BOOLEAN_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.NullLiteralNodeImpl <em>Null Literal Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NullLiteralNodeImpl <em>Null Literal Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.NullLiteralNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NullLiteralNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
 	 * @generated
 	 */
-	int NULL_LITERAL_NODE = 45;
+	int NULL_LITERAL_NODE = 46;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2609,14 +2664,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int NULL_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.NumberLiteralNodeImpl <em>Number Literal Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NumberLiteralNodeImpl <em>Number Literal Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.NumberLiteralNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NumberLiteralNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
 	 * @generated
 	 */
-	int NUMBER_LITERAL_NODE = 46;
+	int NUMBER_LITERAL_NODE = 47;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2646,14 +2701,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int NUMBER_LITERAL_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl <em>Collection Expression Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl <em>Collection Expression Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
 	 * @generated
 	 */
-	int COLLECTION_EXPRESSION_NODE = 47;
+	int COLLECTION_EXPRESSION_NODE = 48;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2710,14 +2765,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int COLLECTION_EXPRESSION_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterListNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
 	 * @generated
 	 */
-	int DECLARED_PARAMETER_LIST_NODE = 48;
+	int DECLARED_PARAMETER_LIST_NODE = 49;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2756,14 +2811,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int DECLARED_PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
 	 * @generated
 	 */
-	int DECLARED_PARAMETER_NODE = 49;
+	int DECLARED_PARAMETER_NODE = 50;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2784,22 +2839,22 @@ public interface Xpand3nodePackage extends EPackage {
 	int DECLARED_PARAMETER_NODE__CHILDREN = NodePackage.COMPOSITE_NODE__CHILDREN;
 
 	/**
-	 * The feature id for the '<em><b>Ptype</b></em>' reference.
+	 * The feature id for the '<em><b>Name</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
+	int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
+	 * The feature id for the '<em><b>Ptype</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DECLARED_PARAMETER_NODE__NAME = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
+	int DECLARED_PARAMETER_NODE__PTYPE = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Declared Parameter Node</em>' class.
@@ -2811,14 +2866,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int DECLARED_PARAMETER_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParameterListNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
 	 * @generated
 	 */
-	int PARAMETER_LIST_NODE = 50;
+	int PARAMETER_LIST_NODE = 51;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2857,14 +2912,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int PARAMETER_LIST_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
 	 * @generated
 	 */
-	int COLLECTION_TYPE_NODE = 51;
+	int COLLECTION_TYPE_NODE = 52;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2912,14 +2967,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int COLLECTION_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SimpleTypeNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
 	 * @generated
 	 */
-	int SIMPLE_TYPE_NODE = 52;
+	int SIMPLE_TYPE_NODE = 53;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2958,14 +3013,14 @@ public interface Xpand3nodePackage extends EPackage {
 	int SIMPLE_TYPE_NODE_FEATURE_COUNT = NodePackage.COMPOSITE_NODE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IdentifierNodeImpl
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
 	 * @generated
 	 */
-	int IDENTIFIER_NODE = 53;
+	int IDENTIFIER_NODE = 54;
 
 	/**
 	 * The feature id for the '<em><b>Alias</b></em>' attribute.
@@ -2996,1685 +3051,1717 @@ public interface Xpand3nodePackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode <em>File Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode <em>File Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>File Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode
 	 * @generated
 	 */
 	EClass getFileNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getDeclarations <em>Declarations</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getDeclarations <em>Declarations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Declarations</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getDeclarations()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getDeclarations()
 	 * @see #getFileNode()
 	 * @generated
 	 */
 	EReference getFileNode_Declarations();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getImports <em>Imports</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getImports <em>Imports</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Imports</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileNode#getImports()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode#getImports()
 	 * @see #getFileNode()
 	 * @generated
 	 */
 	EReference getFileNode_Imports();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode <em>Import Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode <em>Import Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Import Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImportNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode
 	 * @generated
 	 */
 	EClass getImportNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getNamespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Namespace</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getNamespace()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getNamespace()
 	 * @see #getImportNode()
 	 * @generated
 	 */
 	EReference getImportNode_Namespace();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImportNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode#getType()
 	 * @see #getImportNode()
 	 * @generated
 	 */
 	EReference getImportNode_Type();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode <em>Extension Import Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode <em>Extension Import Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Extension Import Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode
 	 * @generated
 	 */
 	EClass getExtensionImportNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getType()
 	 * @see #getExtensionImportNode()
 	 * @generated
 	 */
 	EReference getExtensionImportNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getNamespace <em>Namespace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Namespace</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode#getNamespace()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode#getNamespace()
 	 * @see #getExtensionImportNode()
 	 * @generated
 	 */
 	EReference getExtensionImportNode_Namespace();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode <em>Definition Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode <em>Definition Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Definition Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode
 	 * @generated
 	 */
 	EClass getDefinitionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getName()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getName()
 	 * @see #getDefinitionNode()
 	 * @generated
 	 */
 	EReference getDefinitionNode_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getType()
 	 * @see #getDefinitionNode()
 	 * @generated
 	 */
 	EReference getDefinitionNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getSequence()
 	 * @see #getDefinitionNode()
 	 * @generated
 	 */
 	EReference getDefinitionNode_Sequence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getParamList <em>Param List</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Param List</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode#getParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode#getParamList()
 	 * @see #getDefinitionNode()
 	 * @generated
 	 */
 	EReference getDefinitionNode_ParamList();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode <em>Definition Around Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode <em>Definition Around Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Definition Around Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode
 	 * @generated
 	 */
 	EClass getDefinitionAroundNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getType()
 	 * @see #getDefinitionAroundNode()
 	 * @generated
 	 */
 	EReference getDefinitionAroundNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getPointcut <em>Pointcut</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Pointcut</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getPointcut()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getPointcut()
 	 * @see #getDefinitionAroundNode()
 	 * @generated
 	 */
 	EReference getDefinitionAroundNode_Pointcut();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getParamList <em>Param List</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Param List</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getParamList()
 	 * @see #getDefinitionAroundNode()
 	 * @generated
 	 */
 	EReference getDefinitionAroundNode_ParamList();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode#getSequence()
 	 * @see #getDefinitionAroundNode()
 	 * @generated
 	 */
 	EReference getDefinitionAroundNode_Sequence();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode <em>Sequence Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode <em>Sequence Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Sequence Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode
 	 * @generated
 	 */
 	EClass getSequenceNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getTextSequences <em>Text Sequences</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getTextSequences <em>Text Sequences</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Text Sequences</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getTextSequences()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getTextSequences()
 	 * @see #getSequenceNode()
 	 * @generated
 	 */
 	EReference getSequenceNode_TextSequences();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getStatements <em>Statements</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getStatements <em>Statements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Statements</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode#getStatements()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode#getStatements()
 	 * @see #getSequenceNode()
 	 * @generated
 	 */
 	EReference getSequenceNode_Statements();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode <em>Text Sequence Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode <em>Text Sequence Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Text Sequence Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode
 	 * @generated
 	 */
 	EClass getTextSequenceNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode#getTexts <em>Texts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Texts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode#getTexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode#getTexts()
 	 * @see #getTextSequenceNode()
 	 * @generated
 	 */
 	EReference getTextSequenceNode_Texts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextNode <em>Text Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode <em>Text Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Text Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.TextNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode
 	 * @generated
 	 */
 	EClass getTextNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode <em>Error Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode <em>Error Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Error Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode
 	 * @generated
 	 */
 	EClass getErrorStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode#getExpression()
 	 * @see #getErrorStatementNode()
 	 * @generated
 	 */
 	EReference getErrorStatementNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode <em>Expand Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode <em>Expand Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Expand Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode
 	 * @generated
 	 */
 	EClass getExpandStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getSeparator <em>Separator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Separator</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getSeparator()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getSeparator()
 	 * @see #getExpandStatementNode()
 	 * @generated
 	 */
 	EReference getExpandStatementNode_Separator();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getParamList <em>Param List</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Param List</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getParamList()
 	 * @see #getExpandStatementNode()
 	 * @generated
 	 */
 	EReference getExpandStatementNode_ParamList();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForEachExpression <em>For Each Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>For Each Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForEachExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForEachExpression()
 	 * @see #getExpandStatementNode()
 	 * @generated
 	 */
 	EReference getExpandStatementNode_ForEachExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForExpression <em>For Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>For Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getForExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getForExpression()
 	 * @see #getExpandStatementNode()
 	 * @generated
 	 */
 	EReference getExpandStatementNode_ForExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode#getName()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode#getName()
 	 * @see #getExpandStatementNode()
 	 * @generated
 	 */
 	EReference getExpandStatementNode_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode <em>Expression Stmt Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode <em>Expression Stmt Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Expression Stmt Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode
 	 * @generated
 	 */
 	EClass getExpressionStmtNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode#getExpression()
 	 * @see #getExpressionStmtNode()
 	 * @generated
 	 */
 	EReference getExpressionStmtNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode <em>File Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode <em>File Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>File Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode
 	 * @generated
 	 */
 	EClass getFileStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getSequence()
 	 * @see #getFileStatementNode()
 	 * @generated
 	 */
 	EReference getFileStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Identifier</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getIdentifier()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getIdentifier()
 	 * @see #getFileStatementNode()
 	 * @generated
 	 */
 	EReference getFileStatementNode_Identifier();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getNameExpression <em>Name Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode#getNameExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode#getNameExpression()
 	 * @see #getFileStatementNode()
 	 * @generated
 	 */
 	EReference getFileStatementNode_NameExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode <em>Foreach Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode <em>Foreach Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Foreach Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode
 	 * @generated
 	 */
 	EClass getForeachStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIterator <em>Iterator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Iterator</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIterator()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIterator()
 	 * @see #getForeachStatementNode()
 	 * @generated
 	 */
 	EReference getForeachStatementNode_Iterator();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Identifier</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getIdentifier()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getIdentifier()
 	 * @see #getForeachStatementNode()
 	 * @generated
 	 */
 	EReference getForeachStatementNode_Identifier();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSequence()
 	 * @see #getForeachStatementNode()
 	 * @generated
 	 */
 	EReference getForeachStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getForExpression <em>For Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>For Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getForExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getForExpression()
 	 * @see #getForeachStatementNode()
 	 * @generated
 	 */
 	EReference getForeachStatementNode_ForExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSeparatorExpression <em>Separator Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Separator Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode#getSeparatorExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode#getSeparatorExpression()
 	 * @see #getForeachStatementNode()
 	 * @generated
 	 */
 	EReference getForeachStatementNode_SeparatorExpression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode <em>If Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode <em>If Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>If Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode
 	 * @generated
 	 */
 	EClass getIfStatementNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElseIfs <em>Else Ifs</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Else Ifs</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElseIfs()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElseIfs()
 	 * @see #getIfStatementNode()
 	 * @generated
 	 */
 	EReference getIfStatementNode_ElseIfs();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getExpression()
 	 * @see #getIfStatementNode()
 	 * @generated
 	 */
 	EReference getIfStatementNode_Expression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElse <em>Else</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Else</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getElse()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getElse()
 	 * @see #getIfStatementNode()
 	 * @generated
 	 */
 	EReference getIfStatementNode_Else();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode#getSequence()
 	 * @see #getIfStatementNode()
 	 * @generated
 	 */
 	EReference getIfStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode <em>Else If Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode <em>Else If Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Else If Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode
 	 * @generated
 	 */
 	EClass getElseIfStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getSequence()
 	 * @see #getElseIfStatementNode()
 	 * @generated
 	 */
 	EReference getElseIfStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode#getExpression()
 	 * @see #getElseIfStatementNode()
 	 * @generated
 	 */
 	EReference getElseIfStatementNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode <em>Else Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode <em>Else Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Else Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode
 	 * @generated
 	 */
 	EClass getElseStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode#getSequence()
 	 * @see #getElseStatementNode()
 	 * @generated
 	 */
 	EReference getElseStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode <em>Let Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode <em>Let Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Let Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode
 	 * @generated
 	 */
 	EClass getLetStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getExpression()
 	 * @see #getLetStatementNode()
 	 * @generated
 	 */
 	EReference getLetStatementNode_Expression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getName()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getName()
 	 * @see #getLetStatementNode()
 	 * @generated
 	 */
 	EReference getLetStatementNode_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode#getSequence()
 	 * @see #getLetStatementNode()
 	 * @generated
 	 */
 	EReference getLetStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode <em>Protect Statement Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode <em>Protect Statement Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Protect Statement Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode
 	 * @generated
 	 */
 	EClass getProtectStatementNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getSequence <em>Sequence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Sequence</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getSequence()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getSequence()
 	 * @see #getProtectStatementNode()
 	 * @generated
 	 */
 	EReference getProtectStatementNode_Sequence();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCend <em>Cend</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Cend</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCend()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCend()
 	 * @see #getProtectStatementNode()
 	 * @generated
 	 */
 	EReference getProtectStatementNode_Cend();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Id</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getId()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getId()
 	 * @see #getProtectStatementNode()
 	 * @generated
 	 */
 	EReference getProtectStatementNode_Id();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCstart <em>Cstart</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Cstart</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode#getCstart()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode#getCstart()
 	 * @see #getProtectStatementNode()
 	 * @generated
 	 */
 	EReference getProtectStatementNode_Cstart();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode <em>Check Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode <em>Check Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Check Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode
 	 * @generated
 	 */
 	EClass getCheckNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getType()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError <em>Error</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getError <em>Error</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Error</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getError()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getError()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_Error();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage <em>Message</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getMessage <em>Message</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Message</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getMessage()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getMessage()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_Message();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getIfExpression <em>If Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>If Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getIfExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getIfExpression()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_IfExpression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getWarning <em>Warning</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Warning</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getWarning()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getWarning()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_Warning();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getConstraint <em>Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Constraint</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CheckNode#getConstraint()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode#getConstraint()
 	 * @see #getCheckNode()
 	 * @generated
 	 */
 	EReference getCheckNode_Constraint();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AroundNode <em>Around Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode <em>Around Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Around Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AroundNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode
 	 * @generated
 	 */
 	EClass getAroundNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode <em>Pointcut Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode <em>Pointcut Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Pointcut Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode
 	 * @generated
 	 */
 	EClass getPointcutNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode <em>Extension Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode <em>Extension Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Extension Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode
 	 * @generated
 	 */
 	EClass getExtensionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Param List</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getParamList()
+	 * @return the meta object for the reference '<em>Extend Body</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getExtendBody()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_ParamList();
+	EReference getExtensionNode_ExtendBody();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Private</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getPrivate()
+	 * @return the meta object for the reference '<em>Return Type</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getReturnType()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_Private();
+	EReference getExtensionNode_ReturnType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType <em>Return Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreatedName <em>Created Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Return Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getReturnType()
+	 * @return the meta object for the reference '<em>Created Name</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreatedName()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_ReturnType();
+	EReference getExtensionNode_CreatedName();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType <em>Java Return Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getPrivate <em>Private</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Java Return Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaReturnType()
+	 * @return the meta object for the reference '<em>Private</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getPrivate()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_JavaReturnType();
+	EReference getExtensionNode_Private();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getJavaCall <em>Java Call</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Create</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCreate()
+	 * @return the meta object for the reference '<em>Java Call</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getJavaCall()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_Create();
+	EReference getExtensionNode_JavaCall();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getName()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getName()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
 	EReference getExtensionNode_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName <em>Java Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreate <em>Create</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Java Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getJavaName()
+	 * @return the meta object for the reference '<em>Create</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCreate()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_JavaName();
+	EReference getExtensionNode_Create();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCached <em>Cached</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Cached</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getCached()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getCached()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
 	EReference getExtensionNode_Cached();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody <em>Extend Body</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getParamList <em>Param List</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Extend Body</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode#getExtendBody()
+	 * @return the meta object for the reference '<em>Param List</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode#getParamList()
 	 * @see #getExtensionNode()
 	 * @generated
 	 */
-	EReference getExtensionNode_ExtendBody();
+	EReference getExtensionNode_ParamList();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode <em>Java Call Node</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Java Call Node</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode
+	 * @generated
+	 */
+	EClass getJavaCallNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode <em>Java Type Node</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaReturnType <em>Java Return Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Java Return Type</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaReturnType()
+	 * @see #getJavaCallNode()
+	 * @generated
+	 */
+	EReference getJavaCallNode_JavaReturnType();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaName <em>Java Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Java Name</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode#getJavaName()
+	 * @see #getJavaCallNode()
+	 * @generated
+	 */
+	EReference getJavaCallNode_JavaName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode <em>Java Type Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Java Type Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode
 	 * @generated
 	 */
 	EClass getJavaTypeNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode <em>Test expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode <em>Test expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Test expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode
 	 * @generated
 	 */
 	EClass getTest_expressionNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode <em>Let Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode <em>Let Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Let Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode
 	 * @generated
 	 */
 	EClass getLetExpressionNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode <em>Casted Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode <em>Casted Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Casted Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode
 	 * @generated
 	 */
 	EClass getCastedExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getTarget()
+	 * @return the meta object for the reference '<em>Type</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getType()
 	 * @see #getCastedExpressionNode()
 	 * @generated
 	 */
-	EReference getCastedExpressionNode_Target();
+	EReference getCastedExpressionNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode#getType()
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode#getTarget()
 	 * @see #getCastedExpressionNode()
 	 * @generated
 	 */
-	EReference getCastedExpressionNode_Type();
+	EReference getCastedExpressionNode_Target();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode <em>Chain Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode <em>Chain Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Chain Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode
 	 * @generated
 	 */
 	EClass getChainExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getNexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getNexts()
 	 * @see #getChainExpressionNode()
 	 * @generated
 	 */
 	EReference getChainExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode#getFirst()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode#getFirst()
 	 * @see #getChainExpressionNode()
 	 * @generated
 	 */
 	EReference getChainExpressionNode_First();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode <em>If Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode <em>If Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>If Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode
 	 * @generated
 	 */
 	EClass getIfExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Then</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getThen()
+	 * @return the meta object for the reference '<em>Condition0</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition0()
 	 * @see #getIfExpressionNode()
 	 * @generated
 	 */
-	EReference getIfExpressionNode_Then();
+	EReference getIfExpressionNode_Condition0();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getElse <em>Else</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Else</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getElse()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getElse()
 	 * @see #getIfExpressionNode()
 	 * @generated
 	 */
 	EReference getIfExpressionNode_Else();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0 <em>Condition0</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getThen <em>Then</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Condition0</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition0()
+	 * @return the meta object for the reference '<em>Then</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getThen()
 	 * @see #getIfExpressionNode()
 	 * @generated
 	 */
-	EReference getIfExpressionNode_Condition0();
+	EReference getIfExpressionNode_Then();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition1 <em>Condition1</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Condition1</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode#getCondition1()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode#getCondition1()
 	 * @see #getIfExpressionNode()
 	 * @generated
 	 */
 	EReference getIfExpressionNode_Condition1();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode <em>Switch Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode <em>Switch Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Switch Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode
 	 * @generated
 	 */
 	EClass getSwitchExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getDefault()
+	 * @return the meta object for the reference '<em>Expression</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getExpression()
 	 * @see #getSwitchExpressionNode()
 	 * @generated
 	 */
-	EReference getSwitchExpressionNode_Default();
+	EReference getSwitchExpressionNode_Expression();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getExpression()
+	 * @return the meta object for the reference list '<em>Cases</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getCases()
 	 * @see #getSwitchExpressionNode()
 	 * @generated
 	 */
-	EReference getSwitchExpressionNode_Expression();
+	EReference getSwitchExpressionNode_Cases();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases <em>Cases</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getDefault <em>Default</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Cases</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode#getCases()
+	 * @return the meta object for the reference '<em>Default</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode#getDefault()
 	 * @see #getSwitchExpressionNode()
 	 * @generated
 	 */
-	EReference getSwitchExpressionNode_Cases();
+	EReference getSwitchExpressionNode_Default();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode <em>Case Part Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode <em>Case Part Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Case Part Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode
 	 * @generated
 	 */
 	EClass getCasePartNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getCondition <em>Condition</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Condition</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getCondition()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getCondition()
 	 * @see #getCasePartNode()
 	 * @generated
 	 */
 	EReference getCasePartNode_Condition();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode#getExpression()
 	 * @see #getCasePartNode()
 	 * @generated
 	 */
 	EReference getCasePartNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode <em>Or Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode <em>Or Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Or Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode
 	 * @generated
 	 */
 	EClass getOrExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getNexts()
+	 * @return the meta object for the reference '<em>First</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getFirst()
 	 * @see #getOrExpressionNode()
 	 * @generated
 	 */
-	EReference getOrExpressionNode_Nexts();
+	EReference getOrExpressionNode_First();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode#getFirst()
+	 * @return the meta object for the reference list '<em>Nexts</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode#getNexts()
 	 * @see #getOrExpressionNode()
 	 * @generated
 	 */
-	EReference getOrExpressionNode_First();
+	EReference getOrExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode <em>And Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode <em>And Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>And Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode
 	 * @generated
 	 */
 	EClass getAndExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getFirst()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getFirst()
 	 * @see #getAndExpressionNode()
 	 * @generated
 	 */
 	EReference getAndExpressionNode_First();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode#getNexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode#getNexts()
 	 * @see #getAndExpressionNode()
 	 * @generated
 	 */
 	EReference getAndExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode <em>Implies Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode <em>Implies Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Implies Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode
 	 * @generated
 	 */
 	EClass getImpliesExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getNexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getNexts()
 	 * @see #getImpliesExpressionNode()
 	 * @generated
 	 */
 	EReference getImpliesExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode#getFirst()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode#getFirst()
 	 * @see #getImpliesExpressionNode()
 	 * @generated
 	 */
 	EReference getImpliesExpressionNode_First();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode <em>Relational Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode <em>Relational Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Relational Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode
 	 * @generated
 	 */
 	EClass getRelationalExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getNexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getNexts()
 	 * @see #getRelationalExpressionNode()
 	 * @generated
 	 */
 	EReference getRelationalExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode#getFirst()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode#getFirst()
 	 * @see #getRelationalExpressionNode()
 	 * @generated
 	 */
 	EReference getRelationalExpressionNode_First();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Additive Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode
 	 * @generated
 	 */
 	EClass getAdditiveExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getNexts()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getNexts()
 	 * @see #getAdditiveExpressionNode()
 	 * @generated
 	 */
 	EReference getAdditiveExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode#getFirst()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode#getFirst()
 	 * @see #getAdditiveExpressionNode()
 	 * @generated
 	 */
 	EReference getAdditiveExpressionNode_First();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode <em>Multiplicative Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode <em>Multiplicative Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Multiplicative Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode
 	 * @generated
 	 */
 	EClass getMultiplicativeExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Nexts</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getNexts()
+	 * @return the meta object for the reference '<em>First</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getFirst()
 	 * @see #getMultiplicativeExpressionNode()
 	 * @generated
 	 */
-	EReference getMultiplicativeExpressionNode_Nexts();
+	EReference getMultiplicativeExpressionNode_First();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst <em>First</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getNexts <em>Nexts</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>First</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode#getFirst()
+	 * @return the meta object for the reference list '<em>Nexts</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode#getNexts()
 	 * @see #getMultiplicativeExpressionNode()
 	 * @generated
 	 */
-	EReference getMultiplicativeExpressionNode_First();
+	EReference getMultiplicativeExpressionNode_Nexts();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode <em>Unary Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode <em>Unary Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Unary Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode
 	 * @generated
 	 */
 	EClass getUnaryExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode#getOperand <em>Operand</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Operand</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode#getOperand()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode#getOperand()
 	 * @see #getUnaryExpressionNode()
 	 * @generated
 	 */
 	EReference getUnaryExpressionNode_Operand();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode <em>Infix Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode <em>Infix Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Infix Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode
 	 * @generated
 	 */
 	EClass getInfixExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Calls</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getCalls()
+	 * @return the meta object for the reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getTarget()
 	 * @see #getInfixExpressionNode()
 	 * @generated
 	 */
-	EReference getInfixExpressionNode_Calls();
+	EReference getInfixExpressionNode_Target();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget <em>Target</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getCalls <em>Calls</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode#getTarget()
+	 * @return the meta object for the reference list '<em>Calls</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode#getCalls()
 	 * @see #getInfixExpressionNode()
 	 * @generated
 	 */
-	EReference getInfixExpressionNode_Target();
+	EReference getInfixExpressionNode_Calls();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode <em>String Literal Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode <em>String Literal Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>String Literal Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode
 	 * @generated
 	 */
 	EClass getStringLiteralNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode <em>Paranthesized Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode <em>Paranthesized Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Paranthesized Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode
 	 * @generated
 	 */
 	EClass getParanthesizedExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode#getExpression()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode#getExpression()
 	 * @see #getParanthesizedExpressionNode()
 	 * @generated
 	 */
 	EReference getParanthesizedExpressionNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode <em>Global Var Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode <em>Global Var Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Global Var Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode
 	 * @generated
 	 */
 	EClass getGlobalVarExpressionNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode <em>Feature Call Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode <em>Feature Call Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Feature Call Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode
 	 * @generated
 	 */
 	EClass getFeatureCallNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getParamList <em>Param List</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Param List</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getParamList()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getParamList()
 	 * @see #getFeatureCallNode()
 	 * @generated
 	 */
 	EReference getFeatureCallNode_ParamList();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getName()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getName()
 	 * @see #getFeatureCallNode()
 	 * @generated
 	 */
 	EReference getFeatureCallNode_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode#getType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode#getType()
 	 * @see #getFeatureCallNode()
 	 * @generated
 	 */
 	EReference getFeatureCallNode_Type();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode <em>List Literal Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode <em>List Literal Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>List Literal Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode
 	 * @generated
 	 */
 	EClass getListLiteralNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode#getElements <em>Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Elements</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode#getElements()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode#getElements()
 	 * @see #getListLiteralNode()
 	 * @generated
 	 */
 	EReference getListLiteralNode_Elements();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode <em>Constructor Call Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode <em>Constructor Call Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Constructor Call Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode
 	 * @generated
 	 */
 	EClass getConstructorCallNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode <em>Boolean Literal Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode <em>Boolean Literal Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Boolean Literal Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode
 	 * @generated
 	 */
 	EClass getBooleanLiteralNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode <em>Null Literal Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode <em>Null Literal Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Null Literal Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode
 	 * @generated
 	 */
 	EClass getNullLiteralNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode <em>Number Literal Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode <em>Number Literal Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Number Literal Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode
 	 * @generated
 	 */
 	EClass getNumberLiteralNode();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode <em>Collection Expression Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode <em>Collection Expression Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Collection Expression Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode
 	 * @generated
 	 */
 	EClass getCollectionExpressionNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getVariable <em>Variable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Variable</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getVariable()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getVariable()
 	 * @see #getCollectionExpressionNode()
 	 * @generated
 	 */
 	EReference getCollectionExpressionNode_Variable();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Expression</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getExpression()
+	 * @return the meta object for the reference '<em>Type</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getType()
 	 * @see #getCollectionExpressionNode()
 	 * @generated
 	 */
-	EReference getCollectionExpressionNode_Expression();
+	EReference getCollectionExpressionNode_Type();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType <em>Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getExpression <em>Expression</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode#getType()
+	 * @return the meta object for the reference '<em>Expression</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode#getExpression()
 	 * @see #getCollectionExpressionNode()
 	 * @generated
 	 */
-	EReference getCollectionExpressionNode_Type();
+	EReference getCollectionExpressionNode_Expression();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode <em>Declared Parameter List Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode <em>Declared Parameter List Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Declared Parameter List Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode
 	 * @generated
 	 */
 	EClass getDeclaredParameterListNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode#getParams <em>Params</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Params</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode#getParams()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode#getParams()
 	 * @see #getDeclaredParameterListNode()
 	 * @generated
 	 */
 	EReference getDeclaredParameterListNode_Params();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode <em>Declared Parameter Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode <em>Declared Parameter Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Declared Parameter Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode
 	 * @generated
 	 */
 	EClass getDeclaredParameterNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Ptype</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getPtype()
+	 * @return the meta object for the reference '<em>Name</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getName()
 	 * @see #getDeclaredParameterNode()
 	 * @generated
 	 */
-	EReference getDeclaredParameterNode_Ptype();
+	EReference getDeclaredParameterNode_Name();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName <em>Name</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getPtype <em>Ptype</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode#getName()
+	 * @return the meta object for the reference '<em>Ptype</em>'.
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode#getPtype()
 	 * @see #getDeclaredParameterNode()
 	 * @generated
 	 */
-	EReference getDeclaredParameterNode_Name();
+	EReference getDeclaredParameterNode_Ptype();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode <em>Parameter List Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode <em>Parameter List Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Parameter List Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode
 	 * @generated
 	 */
 	EClass getParameterListNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode#getParams <em>Params</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Params</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode#getParams()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode#getParams()
 	 * @see #getParameterListNode()
 	 * @generated
 	 */
 	EReference getParameterListNode_Params();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode <em>Collection Type Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode <em>Collection Type Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Collection Type Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode
 	 * @generated
 	 */
 	EClass getCollectionTypeNode();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getCollectionType <em>Collection Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Collection Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getCollectionType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getCollectionType()
 	 * @see #getCollectionTypeNode()
 	 * @generated
 	 */
 	EReference getCollectionTypeNode_CollectionType();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getElementType <em>Element Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Element Type</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode#getElementType()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode#getElementType()
 	 * @see #getCollectionTypeNode()
 	 * @generated
 	 */
 	EReference getCollectionTypeNode_ElementType();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode <em>Simple Type Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode <em>Simple Type Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Simple Type Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode
 	 * @generated
 	 */
 	EClass getSimpleTypeNode();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode#getNames <em>Names</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the reference list '<em>Names</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode#getNames()
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode#getNames()
 	 * @see #getSimpleTypeNode()
 	 * @generated
 	 */
 	EReference getSimpleTypeNode_Names();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode <em>Identifier Node</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode <em>Identifier Node</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Identifier Node</em>'.
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode
 	 * @generated
 	 */
 	EClass getIdentifierNode();
@@ -4702,11 +4789,11 @@ public interface Xpand3nodePackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl <em>File Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl <em>File Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileNode()
 		 * @generated
 		 */
 		EClass FILE_NODE = eINSTANCE.getFileNode();
@@ -4728,11 +4815,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference FILE_NODE__IMPORTS = eINSTANCE.getFileNode_Imports();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl <em>Import Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl <em>Import Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImportNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getImportNode()
 		 * @generated
 		 */
 		EClass IMPORT_NODE = eINSTANCE.getImportNode();
@@ -4754,11 +4841,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference IMPORT_NODE__TYPE = eINSTANCE.getImportNode_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl <em>Extension Import Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl <em>Extension Import Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionImportNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionImportNode()
 		 * @generated
 		 */
 		EClass EXTENSION_IMPORT_NODE = eINSTANCE.getExtensionImportNode();
@@ -4780,11 +4867,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference EXTENSION_IMPORT_NODE__NAMESPACE = eINSTANCE.getExtensionImportNode_Namespace();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl <em>Definition Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl <em>Definition Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionNode()
 		 * @generated
 		 */
 		EClass DEFINITION_NODE = eINSTANCE.getDefinitionNode();
@@ -4822,11 +4909,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference DEFINITION_NODE__PARAM_LIST = eINSTANCE.getDefinitionNode_ParamList();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl <em>Definition Around Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl <em>Definition Around Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionAroundNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDefinitionAroundNode()
 		 * @generated
 		 */
 		EClass DEFINITION_AROUND_NODE = eINSTANCE.getDefinitionAroundNode();
@@ -4864,11 +4951,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference DEFINITION_AROUND_NODE__SEQUENCE = eINSTANCE.getDefinitionAroundNode_Sequence();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl <em>Sequence Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl <em>Sequence Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSequenceNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSequenceNode()
 		 * @generated
 		 */
 		EClass SEQUENCE_NODE = eINSTANCE.getSequenceNode();
@@ -4890,11 +4977,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference SEQUENCE_NODE__STATEMENTS = eINSTANCE.getSequenceNode_Statements();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl <em>Text Sequence Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextSequenceNodeImpl <em>Text Sequence Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextSequenceNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextSequenceNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextSequenceNode()
 		 * @generated
 		 */
 		EClass TEXT_SEQUENCE_NODE = eINSTANCE.getTextSequenceNode();
@@ -4908,21 +4995,21 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference TEXT_SEQUENCE_NODE__TEXTS = eINSTANCE.getTextSequenceNode_Texts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextNodeImpl <em>Text Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextNodeImpl <em>Text Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.TextNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTextNode()
 		 * @generated
 		 */
 		EClass TEXT_NODE = eINSTANCE.getTextNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ErrorStatementNodeImpl <em>Error Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ErrorStatementNodeImpl <em>Error Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ErrorStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getErrorStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ErrorStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getErrorStatementNode()
 		 * @generated
 		 */
 		EClass ERROR_STATEMENT_NODE = eINSTANCE.getErrorStatementNode();
@@ -4936,11 +5023,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference ERROR_STATEMENT_NODE__EXPRESSION = eINSTANCE.getErrorStatementNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl <em>Expand Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl <em>Expand Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpandStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpandStatementNode()
 		 * @generated
 		 */
 		EClass EXPAND_STATEMENT_NODE = eINSTANCE.getExpandStatementNode();
@@ -4986,11 +5073,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference EXPAND_STATEMENT_NODE__NAME = eINSTANCE.getExpandStatementNode_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl <em>Expression Stmt Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpressionStmtNodeImpl <em>Expression Stmt Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionStmtNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpressionStmtNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExpressionStmtNode()
 		 * @generated
 		 */
 		EClass EXPRESSION_STMT_NODE = eINSTANCE.getExpressionStmtNode();
@@ -5004,11 +5091,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference EXPRESSION_STMT_NODE__EXPRESSION = eINSTANCE.getExpressionStmtNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl <em>File Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl <em>File Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFileStatementNode()
 		 * @generated
 		 */
 		EClass FILE_STATEMENT_NODE = eINSTANCE.getFileStatementNode();
@@ -5038,11 +5125,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference FILE_STATEMENT_NODE__NAME_EXPRESSION = eINSTANCE.getFileStatementNode_NameExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl <em>Foreach Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl <em>Foreach Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getForeachStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getForeachStatementNode()
 		 * @generated
 		 */
 		EClass FOREACH_STATEMENT_NODE = eINSTANCE.getForeachStatementNode();
@@ -5088,11 +5175,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION = eINSTANCE.getForeachStatementNode_SeparatorExpression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl <em>If Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl <em>If Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfStatementNode()
 		 * @generated
 		 */
 		EClass IF_STATEMENT_NODE = eINSTANCE.getIfStatementNode();
@@ -5130,11 +5217,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference IF_STATEMENT_NODE__SEQUENCE = eINSTANCE.getIfStatementNode_Sequence();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl <em>Else If Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl <em>Else If Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseIfStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseIfStatementNode()
 		 * @generated
 		 */
 		EClass ELSE_IF_STATEMENT_NODE = eINSTANCE.getElseIfStatementNode();
@@ -5156,11 +5243,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference ELSE_IF_STATEMENT_NODE__EXPRESSION = eINSTANCE.getElseIfStatementNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseStatementNodeImpl <em>Else Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseStatementNodeImpl <em>Else Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getElseStatementNode()
 		 * @generated
 		 */
 		EClass ELSE_STATEMENT_NODE = eINSTANCE.getElseStatementNode();
@@ -5174,11 +5261,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference ELSE_STATEMENT_NODE__SEQUENCE = eINSTANCE.getElseStatementNode_Sequence();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl <em>Let Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl <em>Let Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetStatementNode()
 		 * @generated
 		 */
 		EClass LET_STATEMENT_NODE = eINSTANCE.getLetStatementNode();
@@ -5208,11 +5295,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference LET_STATEMENT_NODE__SEQUENCE = eINSTANCE.getLetStatementNode_Sequence();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl <em>Protect Statement Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl <em>Protect Statement Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getProtectStatementNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getProtectStatementNode()
 		 * @generated
 		 */
 		EClass PROTECT_STATEMENT_NODE = eINSTANCE.getProtectStatementNode();
@@ -5250,11 +5337,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference PROTECT_STATEMENT_NODE__CSTART = eINSTANCE.getProtectStatementNode_Cstart();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl <em>Check Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl <em>Check Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCheckNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCheckNode()
 		 * @generated
 		 */
 		EClass CHECK_NODE = eINSTANCE.getCheckNode();
@@ -5308,74 +5395,74 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference CHECK_NODE__CONSTRAINT = eINSTANCE.getCheckNode_Constraint();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AroundNodeImpl <em>Around Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AroundNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAroundNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AroundNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAroundNode()
 		 * @generated
 		 */
 		EClass AROUND_NODE = eINSTANCE.getAroundNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.PointcutNodeImpl <em>Pointcut Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.PointcutNodeImpl <em>Pointcut Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.PointcutNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getPointcutNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.PointcutNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getPointcutNode()
 		 * @generated
 		 */
 		EClass POINTCUT_NODE = eINSTANCE.getPointcutNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl <em>Extension Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl <em>Extension Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getExtensionNode()
 		 * @generated
 		 */
 		EClass EXTENSION_NODE = eINSTANCE.getExtensionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Param List</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Extend Body</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__PARAM_LIST = eINSTANCE.getExtensionNode_ParamList();
+		EReference EXTENSION_NODE__EXTEND_BODY = eINSTANCE.getExtensionNode_ExtendBody();
 
 		/**
-		 * The meta object literal for the '<em><b>Private</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Return Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__PRIVATE = eINSTANCE.getExtensionNode_Private();
+		EReference EXTENSION_NODE__RETURN_TYPE = eINSTANCE.getExtensionNode_ReturnType();
 
 		/**
-		 * The meta object literal for the '<em><b>Return Type</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Created Name</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__RETURN_TYPE = eINSTANCE.getExtensionNode_ReturnType();
+		EReference EXTENSION_NODE__CREATED_NAME = eINSTANCE.getExtensionNode_CreatedName();
 
 		/**
-		 * The meta object literal for the '<em><b>Java Return Type</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Private</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__JAVA_RETURN_TYPE = eINSTANCE.getExtensionNode_JavaReturnType();
+		EReference EXTENSION_NODE__PRIVATE = eINSTANCE.getExtensionNode_Private();
 
 		/**
-		 * The meta object literal for the '<em><b>Create</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Java Call</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__CREATE = eINSTANCE.getExtensionNode_Create();
+		EReference EXTENSION_NODE__JAVA_CALL = eINSTANCE.getExtensionNode_JavaCall();
 
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' reference feature.
@@ -5386,12 +5473,12 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference EXTENSION_NODE__NAME = eINSTANCE.getExtensionNode_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Java Name</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Create</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__JAVA_NAME = eINSTANCE.getExtensionNode_JavaName();
+		EReference EXTENSION_NODE__CREATE = eINSTANCE.getExtensionNode_Create();
 
 		/**
 		 * The meta object literal for the '<em><b>Cached</b></em>' reference feature.
@@ -5402,75 +5489,101 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference EXTENSION_NODE__CACHED = eINSTANCE.getExtensionNode_Cached();
 
 		/**
-		 * The meta object literal for the '<em><b>Extend Body</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Param List</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTENSION_NODE__EXTEND_BODY = eINSTANCE.getExtensionNode_ExtendBody();
+		EReference EXTENSION_NODE__PARAM_LIST = eINSTANCE.getExtensionNode_ParamList();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl <em>Java Call Node</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaCallNode()
+		 * @generated
+		 */
+		EClass JAVA_CALL_NODE = eINSTANCE.getJavaCallNode();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Return Type</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference JAVA_CALL_NODE__JAVA_RETURN_TYPE = eINSTANCE.getJavaCallNode_JavaReturnType();
+
+		/**
+		 * The meta object literal for the '<em><b>Java Name</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference JAVA_CALL_NODE__JAVA_NAME = eINSTANCE.getJavaCallNode_JavaName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaTypeNodeImpl <em>Java Type Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.JavaTypeNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaTypeNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaTypeNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getJavaTypeNode()
 		 * @generated
 		 */
 		EClass JAVA_TYPE_NODE = eINSTANCE.getJavaTypeNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.Test_expressionNodeImpl <em>Test expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Test_expressionNodeImpl <em>Test expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Test_expressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getTest_expressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Test_expressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getTest_expressionNode()
 		 * @generated
 		 */
 		EClass TEST_EXPRESSION_NODE = eINSTANCE.getTest_expressionNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetExpressionNodeImpl <em>Let Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.LetExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getLetExpressionNode()
 		 * @generated
 		 */
 		EClass LET_EXPRESSION_NODE = eINSTANCE.getLetExpressionNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl <em>Casted Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCastedExpressionNode()
 		 * @generated
 		 */
 		EClass CASTED_EXPRESSION_NODE = eINSTANCE.getCastedExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference CASTED_EXPRESSION_NODE__TARGET = eINSTANCE.getCastedExpressionNode_Target();
+		EReference CASTED_EXPRESSION_NODE__TYPE = eINSTANCE.getCastedExpressionNode_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference CASTED_EXPRESSION_NODE__TYPE = eINSTANCE.getCastedExpressionNode_Type();
+		EReference CASTED_EXPRESSION_NODE__TARGET = eINSTANCE.getCastedExpressionNode_Target();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl <em>Chain Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getChainExpressionNode()
 		 * @generated
 		 */
 		EClass CHAIN_EXPRESSION_NODE = eINSTANCE.getChainExpressionNode();
@@ -5492,22 +5605,22 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference CHAIN_EXPRESSION_NODE__FIRST = eINSTANCE.getChainExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl <em>If Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIfExpressionNode()
 		 * @generated
 		 */
 		EClass IF_EXPRESSION_NODE = eINSTANCE.getIfExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Then</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Condition0</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference IF_EXPRESSION_NODE__THEN = eINSTANCE.getIfExpressionNode_Then();
+		EReference IF_EXPRESSION_NODE__CONDITION0 = eINSTANCE.getIfExpressionNode_Condition0();
 
 		/**
 		 * The meta object literal for the '<em><b>Else</b></em>' reference feature.
@@ -5518,12 +5631,12 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference IF_EXPRESSION_NODE__ELSE = eINSTANCE.getIfExpressionNode_Else();
 
 		/**
-		 * The meta object literal for the '<em><b>Condition0</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Then</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference IF_EXPRESSION_NODE__CONDITION0 = eINSTANCE.getIfExpressionNode_Condition0();
+		EReference IF_EXPRESSION_NODE__THEN = eINSTANCE.getIfExpressionNode_Then();
 
 		/**
 		 * The meta object literal for the '<em><b>Condition1</b></em>' reference feature.
@@ -5534,45 +5647,45 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference IF_EXPRESSION_NODE__CONDITION1 = eINSTANCE.getIfExpressionNode_Condition1();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl <em>Switch Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSwitchExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSwitchExpressionNode()
 		 * @generated
 		 */
 		EClass SWITCH_EXPRESSION_NODE = eINSTANCE.getSwitchExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Default</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Expression</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference SWITCH_EXPRESSION_NODE__DEFAULT = eINSTANCE.getSwitchExpressionNode_Default();
+		EReference SWITCH_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getSwitchExpressionNode_Expression();
 
 		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Cases</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference SWITCH_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getSwitchExpressionNode_Expression();
+		EReference SWITCH_EXPRESSION_NODE__CASES = eINSTANCE.getSwitchExpressionNode_Cases();
 
 		/**
-		 * The meta object literal for the '<em><b>Cases</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Default</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference SWITCH_EXPRESSION_NODE__CASES = eINSTANCE.getSwitchExpressionNode_Cases();
+		EReference SWITCH_EXPRESSION_NODE__DEFAULT = eINSTANCE.getSwitchExpressionNode_Default();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl <em>Case Part Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCasePartNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCasePartNode()
 		 * @generated
 		 */
 		EClass CASE_PART_NODE = eINSTANCE.getCasePartNode();
@@ -5594,37 +5707,37 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference CASE_PART_NODE__EXPRESSION = eINSTANCE.getCasePartNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl <em>Or Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getOrExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getOrExpressionNode()
 		 * @generated
 		 */
 		EClass OR_EXPRESSION_NODE = eINSTANCE.getOrExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>First</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference OR_EXPRESSION_NODE__NEXTS = eINSTANCE.getOrExpressionNode_Nexts();
+		EReference OR_EXPRESSION_NODE__FIRST = eINSTANCE.getOrExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '<em><b>First</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference OR_EXPRESSION_NODE__FIRST = eINSTANCE.getOrExpressionNode_First();
+		EReference OR_EXPRESSION_NODE__NEXTS = eINSTANCE.getOrExpressionNode_Nexts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl <em>And Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAndExpressionNode()
 		 * @generated
 		 */
 		EClass AND_EXPRESSION_NODE = eINSTANCE.getAndExpressionNode();
@@ -5646,11 +5759,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference AND_EXPRESSION_NODE__NEXTS = eINSTANCE.getAndExpressionNode_Nexts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl <em>Implies Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getImpliesExpressionNode()
 		 * @generated
 		 */
 		EClass IMPLIES_EXPRESSION_NODE = eINSTANCE.getImpliesExpressionNode();
@@ -5672,11 +5785,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference IMPLIES_EXPRESSION_NODE__FIRST = eINSTANCE.getImpliesExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl <em>Relational Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getRelationalExpressionNode()
 		 * @generated
 		 */
 		EClass RELATIONAL_EXPRESSION_NODE = eINSTANCE.getRelationalExpressionNode();
@@ -5698,11 +5811,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference RELATIONAL_EXPRESSION_NODE__FIRST = eINSTANCE.getRelationalExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl <em>Additive Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getAdditiveExpressionNode()
 		 * @generated
 		 */
 		EClass ADDITIVE_EXPRESSION_NODE = eINSTANCE.getAdditiveExpressionNode();
@@ -5724,37 +5837,37 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference ADDITIVE_EXPRESSION_NODE__FIRST = eINSTANCE.getAdditiveExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl <em>Multiplicative Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl <em>Multiplicative Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getMultiplicativeExpressionNode()
 		 * @generated
 		 */
 		EClass MULTIPLICATIVE_EXPRESSION_NODE = eINSTANCE.getMultiplicativeExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>First</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = eINSTANCE.getMultiplicativeExpressionNode_Nexts();
+		EReference MULTIPLICATIVE_EXPRESSION_NODE__FIRST = eINSTANCE.getMultiplicativeExpressionNode_First();
 
 		/**
-		 * The meta object literal for the '<em><b>First</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Nexts</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MULTIPLICATIVE_EXPRESSION_NODE__FIRST = eINSTANCE.getMultiplicativeExpressionNode_First();
+		EReference MULTIPLICATIVE_EXPRESSION_NODE__NEXTS = eINSTANCE.getMultiplicativeExpressionNode_Nexts();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl <em>Unary Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.UnaryExpressionNodeImpl <em>Unary Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.UnaryExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getUnaryExpressionNode()
 		 * @generated
 		 */
 		EClass UNARY_EXPRESSION_NODE = eINSTANCE.getUnaryExpressionNode();
@@ -5768,47 +5881,47 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference UNARY_EXPRESSION_NODE__OPERAND = eINSTANCE.getUnaryExpressionNode_Operand();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl <em>Infix Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl <em>Infix Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getInfixExpressionNode()
 		 * @generated
 		 */
 		EClass INFIX_EXPRESSION_NODE = eINSTANCE.getInfixExpressionNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Calls</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference INFIX_EXPRESSION_NODE__CALLS = eINSTANCE.getInfixExpressionNode_Calls();
+		EReference INFIX_EXPRESSION_NODE__TARGET = eINSTANCE.getInfixExpressionNode_Target();
 
 		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Calls</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference INFIX_EXPRESSION_NODE__TARGET = eINSTANCE.getInfixExpressionNode_Target();
+		EReference INFIX_EXPRESSION_NODE__CALLS = eINSTANCE.getInfixExpressionNode_Calls();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.StringLiteralNodeImpl <em>String Literal Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.StringLiteralNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.StringLiteralNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getStringLiteralNode()
 		 * @generated
 		 */
 		EClass STRING_LITERAL_NODE = eINSTANCE.getStringLiteralNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl <em>Paranthesized Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl <em>Paranthesized Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getParanthesizedExpressionNode()
 		 * @generated
 		 */
 		EClass PARANTHESIZED_EXPRESSION_NODE = eINSTANCE.getParanthesizedExpressionNode();
@@ -5822,21 +5935,21 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference PARANTHESIZED_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getParanthesizedExpressionNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.GlobalVarExpressionNodeImpl <em>Global Var Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.GlobalVarExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.GlobalVarExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getGlobalVarExpressionNode()
 		 * @generated
 		 */
 		EClass GLOBAL_VAR_EXPRESSION_NODE = eINSTANCE.getGlobalVarExpressionNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl <em>Feature Call Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl <em>Feature Call Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getFeatureCallNode()
 		 * @generated
 		 */
 		EClass FEATURE_CALL_NODE = eINSTANCE.getFeatureCallNode();
@@ -5866,11 +5979,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference FEATURE_CALL_NODE__TYPE = eINSTANCE.getFeatureCallNode_Type();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ListLiteralNodeImpl <em>List Literal Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ListLiteralNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getListLiteralNode()
 		 * @generated
 		 */
 		EClass LIST_LITERAL_NODE = eINSTANCE.getListLiteralNode();
@@ -5884,51 +5997,51 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference LIST_LITERAL_NODE__ELEMENTS = eINSTANCE.getListLiteralNode_Elements();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ConstructorCallNodeImpl <em>Constructor Call Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ConstructorCallNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ConstructorCallNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getConstructorCallNode()
 		 * @generated
 		 */
 		EClass CONSTRUCTOR_CALL_NODE = eINSTANCE.getConstructorCallNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanLiteralNodeImpl <em>Boolean Literal Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.BooleanLiteralNodeImpl <em>Boolean Literal Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.BooleanLiteralNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.BooleanLiteralNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getBooleanLiteralNode()
 		 * @generated
 		 */
 		EClass BOOLEAN_LITERAL_NODE = eINSTANCE.getBooleanLiteralNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.NullLiteralNodeImpl <em>Null Literal Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NullLiteralNodeImpl <em>Null Literal Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.NullLiteralNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NullLiteralNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getNullLiteralNode()
 		 * @generated
 		 */
 		EClass NULL_LITERAL_NODE = eINSTANCE.getNullLiteralNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.NumberLiteralNodeImpl <em>Number Literal Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NumberLiteralNodeImpl <em>Number Literal Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.NumberLiteralNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.NumberLiteralNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getNumberLiteralNode()
 		 * @generated
 		 */
 		EClass NUMBER_LITERAL_NODE = eINSTANCE.getNumberLiteralNode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl <em>Collection Expression Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl <em>Collection Expression Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionExpressionNode()
 		 * @generated
 		 */
 		EClass COLLECTION_EXPRESSION_NODE = eINSTANCE.getCollectionExpressionNode();
@@ -5942,27 +6055,27 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference COLLECTION_EXPRESSION_NODE__VARIABLE = eINSTANCE.getCollectionExpressionNode_Variable();
 
 		/**
-		 * The meta object literal for the '<em><b>Expression</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference COLLECTION_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getCollectionExpressionNode_Expression();
+		EReference COLLECTION_EXPRESSION_NODE__TYPE = eINSTANCE.getCollectionExpressionNode_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Expression</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference COLLECTION_EXPRESSION_NODE__TYPE = eINSTANCE.getCollectionExpressionNode_Type();
+		EReference COLLECTION_EXPRESSION_NODE__EXPRESSION = eINSTANCE.getCollectionExpressionNode_Expression();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterListNodeImpl <em>Declared Parameter List Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterListNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterListNode()
 		 * @generated
 		 */
 		EClass DECLARED_PARAMETER_LIST_NODE = eINSTANCE.getDeclaredParameterListNode();
@@ -5976,37 +6089,37 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference DECLARED_PARAMETER_LIST_NODE__PARAMS = eINSTANCE.getDeclaredParameterListNode_Params();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl <em>Declared Parameter Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getDeclaredParameterNode()
 		 * @generated
 		 */
 		EClass DECLARED_PARAMETER_NODE = eINSTANCE.getDeclaredParameterNode();
 
 		/**
-		 * The meta object literal for the '<em><b>Ptype</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Name</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DECLARED_PARAMETER_NODE__PTYPE = eINSTANCE.getDeclaredParameterNode_Ptype();
+		EReference DECLARED_PARAMETER_NODE__NAME = eINSTANCE.getDeclaredParameterNode_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Ptype</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DECLARED_PARAMETER_NODE__NAME = eINSTANCE.getDeclaredParameterNode_Name();
+		EReference DECLARED_PARAMETER_NODE__PTYPE = eINSTANCE.getDeclaredParameterNode_Ptype();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParameterListNodeImpl <em>Parameter List Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParameterListNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getParameterListNode()
 		 * @generated
 		 */
 		EClass PARAMETER_LIST_NODE = eINSTANCE.getParameterListNode();
@@ -6020,11 +6133,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference PARAMETER_LIST_NODE__PARAMS = eINSTANCE.getParameterListNode_Params();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl <em>Collection Type Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getCollectionTypeNode()
 		 * @generated
 		 */
 		EClass COLLECTION_TYPE_NODE = eINSTANCE.getCollectionTypeNode();
@@ -6046,11 +6159,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference COLLECTION_TYPE_NODE__ELEMENT_TYPE = eINSTANCE.getCollectionTypeNode_ElementType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SimpleTypeNodeImpl <em>Simple Type Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SimpleTypeNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getSimpleTypeNode()
 		 * @generated
 		 */
 		EClass SIMPLE_TYPE_NODE = eINSTANCE.getSimpleTypeNode();
@@ -6064,11 +6177,11 @@ public interface Xpand3nodePackage extends EPackage {
 		EReference SIMPLE_TYPE_NODE__NAMES = eINSTANCE.getSimpleTypeNode_Names();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IdentifierNodeImpl <em>Identifier Node</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.IdentifierNodeImpl
-		 * @see org.eclipse.xpand3.internal.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IdentifierNodeImpl
+		 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.Xpand3nodePackageImpl#getIdentifierNode()
 		 * @generated
 		 */
 		EClass IDENTIFIER_NODE = eINSTANCE.getIdentifierNode();
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
index 4060ed94..bfa42a8c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AdditiveExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AdditiveExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: AdditiveExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AdditiveExpressionNodeImpl#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AndExpressionNodeImpl.java
index 153c08db..030ede8f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AndExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AndExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AndExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: AndExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.AndExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.AndExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpressionNode {
 	/**
-	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
+	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getNexts()
+	 * @see #getFirst()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> nexts;
+	protected CompositeNode first;
 
 	/**
-	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
+	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFirst()
+	 * @see #getNexts()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode first;
+	protected EList<CompositeNode> nexts;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -138,11 +138,11 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
-				return getNexts();
 			case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST:
 				if (resolve) return getFirst();
 				return basicGetFirst();
+			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
+				return getNexts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,13 +156,13 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				getNexts().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
-			case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -175,12 +175,12 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
-				getNexts().clear();
-				return;
 			case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST:
 				setFirst((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
+				getNexts().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,10 +193,10 @@ public class AndExpressionNodeImpl extends CompositeNodeImpl implements AndExpre
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
-				return nexts != null && !nexts.isEmpty();
 			case Xpand3nodePackage.AND_EXPRESSION_NODE__FIRST:
 				return first != null;
+			case Xpand3nodePackage.AND_EXPRESSION_NODE__NEXTS:
+				return nexts != null && !nexts.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AroundNodeImpl.java
index 65ae9c28..e36c029d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/AroundNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/AroundNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AroundNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: AroundNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.AroundNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
index 930b5158..74c03e1b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/BooleanLiteralNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BooleanLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: BooleanLiteralNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CasePartNodeImpl.java
index 1bf29d21..d3ee7f43 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CasePartNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CasePartNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CasePartNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: CasePartNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl#getCondition <em>Condition</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CasePartNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CasePartNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CastedExpressionNodeImpl.java
index 2dc8cf3d..0cac1710 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CastedExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CastedExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CastedExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: CastedExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CastedExpressionNodeImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CastedExpressionNodeImpl#getTarget <em>Target</em>}</li>
  * </ul>
  * </p>
  *
@@ -79,16 +79,16 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getTarget() {
-		if (target != null && target.eIsProxy()) {
-			InternalEObject oldTarget = (InternalEObject)target;
-			target = (CompositeNode)eResolveProxy(oldTarget);
-			if (target != oldTarget) {
+	public CompositeNode getType() {
+		if (type != null && type.eIsProxy()) {
+			InternalEObject oldType = (InternalEObject)type;
+			type = (CompositeNode)eResolveProxy(oldType);
+			if (type != oldType) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET, oldTarget, target));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type));
 			}
 		}
-		return target;
+		return type;
 	}
 
 	/**
@@ -96,8 +96,8 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetTarget() {
-		return target;
+	public CompositeNode basicGetType() {
+		return type;
 	}
 
 	/**
@@ -105,11 +105,11 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setTarget(CompositeNode newTarget) {
-		CompositeNode oldTarget = target;
-		target = newTarget;
+	public void setType(CompositeNode newType) {
+		CompositeNode oldType = type;
+		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET, oldTarget, target));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type));
 	}
 
 	/**
@@ -117,16 +117,16 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getType() {
-		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (CompositeNode)eResolveProxy(oldType);
-			if (type != oldType) {
+	public CompositeNode getTarget() {
+		if (target != null && target.eIsProxy()) {
+			InternalEObject oldTarget = (InternalEObject)target;
+			target = (CompositeNode)eResolveProxy(oldTarget);
+			if (target != oldTarget) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET, oldTarget, target));
 			}
 		}
-		return type;
+		return target;
 	}
 
 	/**
@@ -134,8 +134,8 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetType() {
-		return type;
+	public CompositeNode basicGetTarget() {
+		return target;
 	}
 
 	/**
@@ -143,11 +143,11 @@ public class CastedExpressionNodeImpl extends CompositeNodeImpl implements Caste
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setType(CompositeNode newType) {
-		CompositeNode oldType = type;
-		type = newType;
+	public void setTarget(CompositeNode newTarget) {
+		CompositeNode oldTarget = target;
+		target = newTarget;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.CASTED_EXPRESSION_NODE__TARGET, oldTarget, target));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ChainExpressionNodeImpl.java
index f7a26bcf..8be8523d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ChainExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ChainExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ChainExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ChainExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ChainExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ChainExpressionNodeImpl#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainExpressionNode {
 	/**
-	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
+	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFirst()
+	 * @see #getNexts()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode first;
+	protected EList<CompositeNode> nexts;
 
 	/**
-	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
+	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getNexts()
+	 * @see #getFirst()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> nexts;
+	protected CompositeNode first;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -138,11 +138,11 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS:
+				return getNexts();
 			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
 				if (resolve) return getFirst();
 				return basicGetFirst();
-			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS:
-				return getNexts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,13 +156,13 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				getNexts().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
+			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -175,12 +175,12 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				return;
+			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,10 +193,10 @@ public class ChainExpressionNodeImpl extends CompositeNodeImpl implements ChainE
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
-				return first != null;
 			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__NEXTS:
 				return nexts != null && !nexts.isEmpty();
+			case Xpand3nodePackage.CHAIN_EXPRESSION_NODE__FIRST:
+				return first != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CheckNodeImpl.java
index 401c2e1c..c5267c33 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CheckNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CheckNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CheckNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: CheckNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.LeafNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.CheckNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,12 +28,12 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getError <em>Error</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getWarning <em>Warning</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getConstraint <em>Constraint</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getIfExpression <em>If Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CheckNodeImpl#getMessage <em>Message</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getError <em>Error</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getMessage <em>Message</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getIfExpression <em>If Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getWarning <em>Warning</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CheckNodeImpl#getConstraint <em>Constraint</em>}</li>
  * </ul>
  * </p>
  *
@@ -41,64 +41,64 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode {
 	/**
-	 * The cached value of the '{@link #getError() <em>Error</em>}' reference.
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getError()
+	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
-	protected LeafNode error;
+	protected CompositeNode type;
 
 	/**
-	 * The cached value of the '{@link #getWarning() <em>Warning</em>}' reference.
+	 * The cached value of the '{@link #getError() <em>Error</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getWarning()
+	 * @see #getError()
 	 * @generated
 	 * @ordered
 	 */
-	protected LeafNode warning;
+	protected LeafNode error;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+	 * The cached value of the '{@link #getMessage() <em>Message</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getType()
+	 * @see #getMessage()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode type;
+	protected CompositeNode message;
 
 	/**
-	 * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference.
+	 * The cached value of the '{@link #getIfExpression() <em>If Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConstraint()
+	 * @see #getIfExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode constraint;
+	protected CompositeNode ifExpression;
 
 	/**
-	 * The cached value of the '{@link #getIfExpression() <em>If Expression</em>}' reference.
+	 * The cached value of the '{@link #getWarning() <em>Warning</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getIfExpression()
+	 * @see #getWarning()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode ifExpression;
+	protected LeafNode warning;
 
 	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' reference.
+	 * The cached value of the '{@link #getConstraint() <em>Constraint</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMessage()
+	 * @see #getConstraint()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode message;
+	protected CompositeNode constraint;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -355,24 +355,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case Xpand3nodePackage.CHECK_NODE__TYPE:
+				if (resolve) return getType();
+				return basicGetType();
 			case Xpand3nodePackage.CHECK_NODE__ERROR:
 				if (resolve) return getError();
 				return basicGetError();
+			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
+				if (resolve) return getMessage();
+				return basicGetMessage();
+			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
+				if (resolve) return getIfExpression();
+				return basicGetIfExpression();
 			case Xpand3nodePackage.CHECK_NODE__WARNING:
 				if (resolve) return getWarning();
 				return basicGetWarning();
-			case Xpand3nodePackage.CHECK_NODE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
 			case Xpand3nodePackage.CHECK_NODE__CONSTRAINT:
 				if (resolve) return getConstraint();
 				return basicGetConstraint();
-			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
-				if (resolve) return getIfExpression();
-				return basicGetIfExpression();
-			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
-				if (resolve) return getMessage();
-				return basicGetMessage();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -385,24 +385,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case Xpand3nodePackage.CHECK_NODE__TYPE:
+				setType((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.CHECK_NODE__ERROR:
 				setError((LeafNode)newValue);
 				return;
+			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
+				setMessage((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
+				setIfExpression((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.CHECK_NODE__WARNING:
 				setWarning((LeafNode)newValue);
 				return;
-			case Xpand3nodePackage.CHECK_NODE__TYPE:
-				setType((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.CHECK_NODE__CONSTRAINT:
 				setConstraint((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
-				setIfExpression((CompositeNode)newValue);
-				return;
-			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
-				setMessage((CompositeNode)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -415,24 +415,24 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
+			case Xpand3nodePackage.CHECK_NODE__TYPE:
+				setType((CompositeNode)null);
+				return;
 			case Xpand3nodePackage.CHECK_NODE__ERROR:
 				setError((LeafNode)null);
 				return;
+			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
+				setMessage((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
+				setIfExpression((CompositeNode)null);
+				return;
 			case Xpand3nodePackage.CHECK_NODE__WARNING:
 				setWarning((LeafNode)null);
 				return;
-			case Xpand3nodePackage.CHECK_NODE__TYPE:
-				setType((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.CHECK_NODE__CONSTRAINT:
 				setConstraint((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
-				setIfExpression((CompositeNode)null);
-				return;
-			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
-				setMessage((CompositeNode)null);
-				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -445,18 +445,18 @@ public class CheckNodeImpl extends CompositeNodeImpl implements CheckNode {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
+			case Xpand3nodePackage.CHECK_NODE__TYPE:
+				return type != null;
 			case Xpand3nodePackage.CHECK_NODE__ERROR:
 				return error != null;
+			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
+				return message != null;
+			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
+				return ifExpression != null;
 			case Xpand3nodePackage.CHECK_NODE__WARNING:
 				return warning != null;
-			case Xpand3nodePackage.CHECK_NODE__TYPE:
-				return type != null;
 			case Xpand3nodePackage.CHECK_NODE__CONSTRAINT:
 				return constraint != null;
-			case Xpand3nodePackage.CHECK_NODE__IF_EXPRESSION:
-				return ifExpression != null;
-			case Xpand3nodePackage.CHECK_NODE__MESSAGE:
-				return message != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CollectionExpressionNodeImpl.java
index f9bb3c41..a7ffc5e4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CollectionExpressionNodeImpl.java
@@ -2,20 +2,23 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: CollectionExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
 import org.eclipse.tmf.common.node.CompositeNode;
+
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -24,9 +27,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getVariable <em>Variable</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionExpressionNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionExpressionNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,6 +45,7 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * @ordered
 	 */
 	protected CompositeNode variable;
+
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -51,6 +55,7 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * @ordered
 	 */
 	protected CompositeNode type;
+
 	/**
 	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -123,16 +128,16 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (CompositeNode)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
+	public CompositeNode getType() {
+		if (type != null && type.eIsProxy()) {
+			InternalEObject oldType = (InternalEObject)type;
+			type = (CompositeNode)eResolveProxy(oldType);
+			if (type != oldType) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type));
 			}
 		}
-		return expression;
+		return type;
 	}
 
 	/**
@@ -140,8 +145,8 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetExpression() {
-		return expression;
+	public CompositeNode basicGetType() {
+		return type;
 	}
 
 	/**
@@ -149,11 +154,11 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setExpression(CompositeNode newExpression) {
-		CompositeNode oldExpression = expression;
-		expression = newExpression;
+	public void setType(CompositeNode newType) {
+		CompositeNode oldType = type;
+		type = newType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type));
 	}
 
 	/**
@@ -161,16 +166,16 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getType() {
-		if (type != null && type.eIsProxy()) {
-			InternalEObject oldType = (InternalEObject)type;
-			type = (CompositeNode)eResolveProxy(oldType);
-			if (type != oldType) {
+	public CompositeNode getExpression() {
+		if (expression != null && expression.eIsProxy()) {
+			InternalEObject oldExpression = (InternalEObject)expression;
+			expression = (CompositeNode)eResolveProxy(oldExpression);
+			if (expression != oldExpression) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
 			}
 		}
-		return type;
+		return expression;
 	}
 
 	/**
@@ -178,8 +183,8 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetType() {
-		return type;
+	public CompositeNode basicGetExpression() {
+		return expression;
 	}
 
 	/**
@@ -187,11 +192,11 @@ public class CollectionExpressionNodeImpl extends CompositeNodeImpl implements C
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setType(CompositeNode newType) {
-		CompositeNode oldType = type;
-		type = newType;
+	public void setExpression(CompositeNode newExpression) {
+		CompositeNode oldExpression = expression;
+		expression = newExpression;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__TYPE, oldType, type));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.COLLECTION_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CollectionTypeNodeImpl.java
index a38ed548..25309264 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/CollectionTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/CollectionTypeNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionTypeNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: CollectionTypeNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.LeafNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,8 +28,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl#getCollectionType <em>Collection Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.CollectionTypeNodeImpl#getElementType <em>Element Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl#getCollectionType <em>Collection Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.CollectionTypeNodeImpl#getElementType <em>Element Type</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ConstructorCallNodeImpl.java
index 24fc5570..01933bf4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ConstructorCallNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ConstructorCallNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConstructorCallNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ConstructorCallNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
index 5acff42a..28b96a53 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DeclaredParameterListNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterListNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterListNodeImpl#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterListNodeImpl#getParams <em>Params</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
index 7451ee59..212dbf02 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DeclaredParameterNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterNodeImpl.java,v 1.5 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getPtype <em>Ptype</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DeclaredParameterNodeImpl#getPtype <em>Ptype</em>}</li>
  * </ul>
  * </p>
  *
@@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements DeclaredParameterNode {
 	/**
-	 * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPtype()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode ptype;
+	protected CompositeNode name;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getPtype() <em>Ptype</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getPtype()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode ptype;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -79,16 +79,16 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getPtype() {
-		if (ptype != null && ptype.eIsProxy()) {
-			InternalEObject oldPtype = (InternalEObject)ptype;
-			ptype = (CompositeNode)eResolveProxy(oldPtype);
-			if (ptype != oldPtype) {
+	public CompositeNode getName() {
+		if (name != null && name.eIsProxy()) {
+			InternalEObject oldName = (InternalEObject)name;
+			name = (CompositeNode)eResolveProxy(oldName);
+			if (name != oldName) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
 			}
 		}
-		return ptype;
+		return name;
 	}
 
 	/**
@@ -96,8 +96,8 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetPtype() {
-		return ptype;
+	public CompositeNode basicGetName() {
+		return name;
 	}
 
 	/**
@@ -105,11 +105,11 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setPtype(CompositeNode newPtype) {
-		CompositeNode oldPtype = ptype;
-		ptype = newPtype;
+	public void setName(CompositeNode newName) {
+		CompositeNode oldName = name;
+		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
 	}
 
 	/**
@@ -117,16 +117,16 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getName() {
-		if (name != null && name.eIsProxy()) {
-			InternalEObject oldName = (InternalEObject)name;
-			name = (CompositeNode)eResolveProxy(oldName);
-			if (name != oldName) {
+	public CompositeNode getPtype() {
+		if (ptype != null && ptype.eIsProxy()) {
+			InternalEObject oldPtype = (InternalEObject)ptype;
+			ptype = (CompositeNode)eResolveProxy(oldPtype);
+			if (ptype != oldPtype) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
 			}
 		}
-		return name;
+		return ptype;
 	}
 
 	/**
@@ -134,8 +134,8 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetName() {
-		return name;
+	public CompositeNode basicGetPtype() {
+		return ptype;
 	}
 
 	/**
@@ -143,11 +143,11 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setName(CompositeNode newName) {
-		CompositeNode oldName = name;
-		name = newName;
+	public void setPtype(CompositeNode newPtype) {
+		CompositeNode oldPtype = ptype;
+		ptype = newPtype;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE, oldPtype, ptype));
 	}
 
 	/**
@@ -158,12 +158,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
-				if (resolve) return getPtype();
-				return basicGetPtype();
 			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
 				if (resolve) return getName();
 				return basicGetName();
+			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+				if (resolve) return getPtype();
+				return basicGetPtype();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -176,12 +176,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
-				setPtype((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
 				setName((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+				setPtype((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -194,12 +194,12 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
-				setPtype((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
 				setName((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+				setPtype((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,10 +212,10 @@ public class DeclaredParameterNodeImpl extends CompositeNodeImpl implements Decl
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
-				return ptype != null;
 			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__NAME:
 				return name != null;
+			case Xpand3nodePackage.DECLARED_PARAMETER_NODE__PTYPE:
+				return ptype != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DefinitionAroundNodeImpl.java
index 9ab71735..c5864530 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionAroundNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DefinitionAroundNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionAroundNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: DefinitionAroundNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionAroundNodeImpl#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl#getPointcut <em>Pointcut</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionAroundNodeImpl#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
@@ -48,14 +48,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 	protected CompositeNode type;
 
 	/**
-	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
+	 * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSequence()
+	 * @see #getPointcut()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode sequence;
+	protected CompositeNode pointcut;
 
 	/**
 	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
@@ -68,14 +68,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 	protected CompositeNode paramList;
 
 	/**
-	 * The cached value of the '{@link #getPointcut() <em>Pointcut</em>}' reference.
+	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPointcut()
+	 * @see #getSequence()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode pointcut;
+	protected CompositeNode sequence;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -259,15 +259,15 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE:
 				if (resolve) return getType();
 				return basicGetType();
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
-				if (resolve) return getSequence();
-				return basicGetSequence();
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
-				if (resolve) return getParamList();
-				return basicGetParamList();
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
 				if (resolve) return getPointcut();
 				return basicGetPointcut();
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
+				if (resolve) return getParamList();
+				return basicGetParamList();
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
+				if (resolve) return getSequence();
+				return basicGetSequence();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -283,14 +283,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE:
 				setType((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
-				setSequence((CompositeNode)newValue);
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
+				setPointcut((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
 				setParamList((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
-				setPointcut((CompositeNode)newValue);
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
+				setSequence((CompositeNode)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -307,14 +307,14 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE:
 				setType((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
-				setSequence((CompositeNode)null);
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
+				setPointcut((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
 				setParamList((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
-				setPointcut((CompositeNode)null);
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
+				setSequence((CompositeNode)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -330,12 +330,12 @@ public class DefinitionAroundNodeImpl extends CompositeNodeImpl implements Defin
 		switch (featureID) {
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__TYPE:
 				return type != null;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
-				return sequence != null;
-			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
-				return paramList != null;
 			case Xpand3nodePackage.DEFINITION_AROUND_NODE__POINTCUT:
 				return pointcut != null;
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__PARAM_LIST:
+				return paramList != null;
+			case Xpand3nodePackage.DEFINITION_AROUND_NODE__SEQUENCE:
+				return sequence != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DefinitionNodeImpl.java
index 044dd793..3025e803 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/DefinitionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/DefinitionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: DefinitionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.DefinitionNodeImpl#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.DefinitionNodeImpl#getParamList <em>Param List</em>}</li>
  * </ul>
  * </p>
  *
@@ -38,14 +38,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionNode {
 	/**
-	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSequence()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode sequence;
+	protected CompositeNode name;
 
 	/**
 	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
@@ -58,14 +58,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN
 	protected CompositeNode type;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getSequence()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode sequence;
 
 	/**
 	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
@@ -256,15 +256,15 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
-				if (resolve) return getSequence();
-				return basicGetSequence();
-			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
 			case Xpand3nodePackage.DEFINITION_NODE__NAME:
 				if (resolve) return getName();
 				return basicGetName();
+			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
+				if (resolve) return getType();
+				return basicGetType();
+			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
+				if (resolve) return getSequence();
+				return basicGetSequence();
 			case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST:
 				if (resolve) return getParamList();
 				return basicGetParamList();
@@ -280,14 +280,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
-				setSequence((CompositeNode)newValue);
+			case Xpand3nodePackage.DEFINITION_NODE__NAME:
+				setName((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
 				setType((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.DEFINITION_NODE__NAME:
-				setName((CompositeNode)newValue);
+			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
+				setSequence((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST:
 				setParamList((CompositeNode)newValue);
@@ -304,14 +304,14 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
-				setSequence((CompositeNode)null);
+			case Xpand3nodePackage.DEFINITION_NODE__NAME:
+				setName((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
 				setType((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.DEFINITION_NODE__NAME:
-				setName((CompositeNode)null);
+			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
+				setSequence((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST:
 				setParamList((CompositeNode)null);
@@ -328,12 +328,12 @@ public class DefinitionNodeImpl extends CompositeNodeImpl implements DefinitionN
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
-				return sequence != null;
-			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
-				return type != null;
 			case Xpand3nodePackage.DEFINITION_NODE__NAME:
 				return name != null;
+			case Xpand3nodePackage.DEFINITION_NODE__TYPE:
+				return type != null;
+			case Xpand3nodePackage.DEFINITION_NODE__SEQUENCE:
+				return sequence != null;
 			case Xpand3nodePackage.DEFINITION_NODE__PARAM_LIST:
 				return paramList != null;
 		}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ElseIfStatementNodeImpl.java
index cdaebe79..1f33c2bf 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseIfStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ElseIfStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseIfStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ElseIfStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseIfStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseIfStatementNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIfStatementNode {
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
+	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getExpression()
+	 * @see #getSequence()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode expression;
+	protected CompositeNode sequence;
 
 	/**
-	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSequence()
+	 * @see #getExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode sequence;
+	protected CompositeNode expression;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,12 +158,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
 			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE:
 				if (resolve) return getSequence();
 				return basicGetSequence();
+			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
+				if (resolve) return getExpression();
+				return basicGetExpression();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -176,12 +176,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
-				setExpression((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
+				setExpression((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -194,12 +194,12 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
-				setExpression((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
+				setExpression((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,10 +212,10 @@ public class ElseIfStatementNodeImpl extends CompositeNodeImpl implements ElseIf
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
-				return expression != null;
 			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__SEQUENCE:
 				return sequence != null;
+			case Xpand3nodePackage.ELSE_IF_STATEMENT_NODE__EXPRESSION:
+				return expression != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ElseStatementNodeImpl.java
index 34df00e4..ae417dd3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ElseStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ElseStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ElseStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ElseStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ElseStatementNodeImpl#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ErrorStatementNodeImpl.java
index 00a315f0..f65aa516 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ErrorStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ErrorStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ErrorStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ErrorStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ErrorStatementNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ErrorStatementNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExpandStatementNodeImpl.java
index 1899809f..a556bcf5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpandStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExpandStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpandStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ExpandStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,11 +27,11 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getSeparator <em>Separator</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getForExpression <em>For Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpandStatementNodeImpl#getForEachExpression <em>For Each Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl#getForEachExpression <em>For Each Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl#getForExpression <em>For Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpandStatementNodeImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
@@ -49,44 +49,44 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand
 	protected CompositeNode separator;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getParamList()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode paramList;
 
 	/**
-	 * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference.
+	 * The cached value of the '{@link #getForEachExpression() <em>For Each Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getForExpression()
+	 * @see #getForEachExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode forExpression;
+	protected CompositeNode forEachExpression;
 
 	/**
-	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+	 * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getParamList()
+	 * @see #getForExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode paramList;
+	protected CompositeNode forExpression;
 
 	/**
-	 * The cached value of the '{@link #getForEachExpression() <em>For Each Expression</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getForEachExpression()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode forEachExpression;
+	protected CompositeNode name;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -308,18 +308,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR:
 				if (resolve) return getSeparator();
 				return basicGetSeparator();
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
-				if (resolve) return getName();
-				return basicGetName();
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
-				if (resolve) return getForExpression();
-				return basicGetForExpression();
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST:
 				if (resolve) return getParamList();
 				return basicGetParamList();
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION:
 				if (resolve) return getForEachExpression();
 				return basicGetForEachExpression();
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
+				if (resolve) return getForExpression();
+				return basicGetForExpression();
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
+				if (resolve) return getName();
+				return basicGetName();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -335,18 +335,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR:
 				setSeparator((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
-				setName((CompositeNode)newValue);
-				return;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
-				setForExpression((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST:
 				setParamList((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION:
 				setForEachExpression((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
+				setForExpression((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
+				setName((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -362,18 +362,18 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR:
 				setSeparator((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
-				setName((CompositeNode)null);
-				return;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
-				setForExpression((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST:
 				setParamList((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION:
 				setForEachExpression((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
+				setForExpression((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
+				setName((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -388,14 +388,14 @@ public class ExpandStatementNodeImpl extends CompositeNodeImpl implements Expand
 		switch (featureID) {
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__SEPARATOR:
 				return separator != null;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
-				return name != null;
-			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
-				return forExpression != null;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__PARAM_LIST:
 				return paramList != null;
 			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION:
 				return forEachExpression != null;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__FOR_EXPRESSION:
+				return forExpression != null;
+			case Xpand3nodePackage.EXPAND_STATEMENT_NODE__NAME:
+				return name != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
index 4f3e5951..14bc3ddb 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExpressionStmtNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpressionStmtNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ExpressionStmtNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExpressionStmtNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExpressionStmtNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExtensionImportNodeImpl.java
index b5f70822..1c72a916 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionImportNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExtensionImportNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionImportNodeImpl.java,v 1.2 2008/03/13 08:40:02 jkohnlein Exp $
+ * $Id: ExtensionImportNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionImportNodeImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionImportNodeImpl#getNamespace <em>Namespace</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExtensionNodeImpl.java
index 7c2abbc3..c8731cde 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ExtensionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ExtensionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionNodeImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ExtensionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.LeafNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,15 +28,15 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaName <em>Java Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCreate <em>Create</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ExtensionNodeImpl#getCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getExtendBody <em>Extend Body</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getReturnType <em>Return Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getCreatedName <em>Created Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getPrivate <em>Private</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getJavaCall <em>Java Call</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getCreate <em>Create</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getCached <em>Cached</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ExtensionNodeImpl#getParamList <em>Param List</em>}</li>
  * </ul>
  * </p>
  *
@@ -54,84 +54,84 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	protected CompositeNode extendBody;
 
 	/**
-	 * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference.
+	 * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getJavaName()
+	 * @see #getReturnType()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode javaName;
+	protected CompositeNode returnType;
 
 	/**
-	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+	 * The cached value of the '{@link #getCreatedName() <em>Created Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getParamList()
+	 * @see #getCreatedName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode paramList;
+	protected CompositeNode createdName;
 
 	/**
-	 * The cached value of the '{@link #getCreate() <em>Create</em>}' reference.
+	 * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCreate()
+	 * @see #getPrivate()
 	 * @generated
 	 * @ordered
 	 */
-	protected LeafNode create;
+	protected LeafNode private_;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getJavaCall() <em>Java Call</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getJavaCall()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode javaCall;
 
 	/**
-	 * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getReturnType()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode returnType;
+	protected CompositeNode name;
 
 	/**
-	 * The cached value of the '{@link #getPrivate() <em>Private</em>}' reference.
+	 * The cached value of the '{@link #getCreate() <em>Create</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPrivate()
+	 * @see #getCreate()
 	 * @generated
 	 * @ordered
 	 */
-	protected LeafNode private_;
+	protected LeafNode create;
 
 	/**
-	 * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference.
+	 * The cached value of the '{@link #getCached() <em>Cached</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getJavaReturnType()
+	 * @see #getCached()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode javaReturnType;
+	protected LeafNode cached;
 
 	/**
-	 * The cached value of the '{@link #getCached() <em>Cached</em>}' reference.
+	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCached()
+	 * @see #getParamList()
 	 * @generated
 	 * @ordered
 	 */
-	protected LeafNode cached;
+	protected CompositeNode paramList;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -157,16 +157,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getParamList() {
-		if (paramList != null && paramList.eIsProxy()) {
-			InternalEObject oldParamList = (InternalEObject)paramList;
-			paramList = (CompositeNode)eResolveProxy(oldParamList);
-			if (paramList != oldParamList) {
+	public CompositeNode getExtendBody() {
+		if (extendBody != null && extendBody.eIsProxy()) {
+			InternalEObject oldExtendBody = (InternalEObject)extendBody;
+			extendBody = (CompositeNode)eResolveProxy(oldExtendBody);
+			if (extendBody != oldExtendBody) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
 			}
 		}
-		return paramList;
+		return extendBody;
 	}
 
 	/**
@@ -174,8 +174,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetParamList() {
-		return paramList;
+	public CompositeNode basicGetExtendBody() {
+		return extendBody;
 	}
 
 	/**
@@ -183,11 +183,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setParamList(CompositeNode newParamList) {
-		CompositeNode oldParamList = paramList;
-		paramList = newParamList;
+	public void setExtendBody(CompositeNode newExtendBody) {
+		CompositeNode oldExtendBody = extendBody;
+		extendBody = newExtendBody;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
 	}
 
 	/**
@@ -195,16 +195,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public LeafNode getPrivate() {
-		if (private_ != null && private_.eIsProxy()) {
-			InternalEObject oldPrivate = (InternalEObject)private_;
-			private_ = (LeafNode)eResolveProxy(oldPrivate);
-			if (private_ != oldPrivate) {
+	public CompositeNode getReturnType() {
+		if (returnType != null && returnType.eIsProxy()) {
+			InternalEObject oldReturnType = (InternalEObject)returnType;
+			returnType = (CompositeNode)eResolveProxy(oldReturnType);
+			if (returnType != oldReturnType) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
 			}
 		}
-		return private_;
+		return returnType;
 	}
 
 	/**
@@ -212,8 +212,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public LeafNode basicGetPrivate() {
-		return private_;
+	public CompositeNode basicGetReturnType() {
+		return returnType;
 	}
 
 	/**
@@ -221,11 +221,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setPrivate(LeafNode newPrivate) {
-		LeafNode oldPrivate = private_;
-		private_ = newPrivate;
+	public void setReturnType(CompositeNode newReturnType) {
+		CompositeNode oldReturnType = returnType;
+		returnType = newReturnType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
 	}
 
 	/**
@@ -233,16 +233,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getReturnType() {
-		if (returnType != null && returnType.eIsProxy()) {
-			InternalEObject oldReturnType = (InternalEObject)returnType;
-			returnType = (CompositeNode)eResolveProxy(oldReturnType);
-			if (returnType != oldReturnType) {
+	public CompositeNode getCreatedName() {
+		if (createdName != null && createdName.eIsProxy()) {
+			InternalEObject oldCreatedName = (InternalEObject)createdName;
+			createdName = (CompositeNode)eResolveProxy(oldCreatedName);
+			if (createdName != oldCreatedName) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME, oldCreatedName, createdName));
 			}
 		}
-		return returnType;
+		return createdName;
 	}
 
 	/**
@@ -250,8 +250,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetReturnType() {
-		return returnType;
+	public CompositeNode basicGetCreatedName() {
+		return createdName;
 	}
 
 	/**
@@ -259,11 +259,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setReturnType(CompositeNode newReturnType) {
-		CompositeNode oldReturnType = returnType;
-		returnType = newReturnType;
+	public void setCreatedName(CompositeNode newCreatedName) {
+		CompositeNode oldCreatedName = createdName;
+		createdName = newCreatedName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE, oldReturnType, returnType));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME, oldCreatedName, createdName));
 	}
 
 	/**
@@ -271,16 +271,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getJavaReturnType() {
-		if (javaReturnType != null && javaReturnType.eIsProxy()) {
-			InternalEObject oldJavaReturnType = (InternalEObject)javaReturnType;
-			javaReturnType = (CompositeNode)eResolveProxy(oldJavaReturnType);
-			if (javaReturnType != oldJavaReturnType) {
+	public LeafNode getPrivate() {
+		if (private_ != null && private_.eIsProxy()) {
+			InternalEObject oldPrivate = (InternalEObject)private_;
+			private_ = (LeafNode)eResolveProxy(oldPrivate);
+			if (private_ != oldPrivate) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
 			}
 		}
-		return javaReturnType;
+		return private_;
 	}
 
 	/**
@@ -288,8 +288,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetJavaReturnType() {
-		return javaReturnType;
+	public LeafNode basicGetPrivate() {
+		return private_;
 	}
 
 	/**
@@ -297,11 +297,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setJavaReturnType(CompositeNode newJavaReturnType) {
-		CompositeNode oldJavaReturnType = javaReturnType;
-		javaReturnType = newJavaReturnType;
+	public void setPrivate(LeafNode newPrivate) {
+		LeafNode oldPrivate = private_;
+		private_ = newPrivate;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PRIVATE, oldPrivate, private_));
 	}
 
 	/**
@@ -309,16 +309,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public LeafNode getCreate() {
-		if (create != null && create.eIsProxy()) {
-			InternalEObject oldCreate = (InternalEObject)create;
-			create = (LeafNode)eResolveProxy(oldCreate);
-			if (create != oldCreate) {
+	public CompositeNode getJavaCall() {
+		if (javaCall != null && javaCall.eIsProxy()) {
+			InternalEObject oldJavaCall = (InternalEObject)javaCall;
+			javaCall = (CompositeNode)eResolveProxy(oldJavaCall);
+			if (javaCall != oldJavaCall) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL, oldJavaCall, javaCall));
 			}
 		}
-		return create;
+		return javaCall;
 	}
 
 	/**
@@ -326,8 +326,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public LeafNode basicGetCreate() {
-		return create;
+	public CompositeNode basicGetJavaCall() {
+		return javaCall;
 	}
 
 	/**
@@ -335,11 +335,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setCreate(LeafNode newCreate) {
-		LeafNode oldCreate = create;
-		create = newCreate;
+	public void setJavaCall(CompositeNode newJavaCall) {
+		CompositeNode oldJavaCall = javaCall;
+		javaCall = newJavaCall;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL, oldJavaCall, javaCall));
 	}
 
 	/**
@@ -385,16 +385,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getJavaName() {
-		if (javaName != null && javaName.eIsProxy()) {
-			InternalEObject oldJavaName = (InternalEObject)javaName;
-			javaName = (CompositeNode)eResolveProxy(oldJavaName);
-			if (javaName != oldJavaName) {
+	public LeafNode getCreate() {
+		if (create != null && create.eIsProxy()) {
+			InternalEObject oldCreate = (InternalEObject)create;
+			create = (LeafNode)eResolveProxy(oldCreate);
+			if (create != oldCreate) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME, oldJavaName, javaName));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
 			}
 		}
-		return javaName;
+		return create;
 	}
 
 	/**
@@ -402,8 +402,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetJavaName() {
-		return javaName;
+	public LeafNode basicGetCreate() {
+		return create;
 	}
 
 	/**
@@ -411,11 +411,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setJavaName(CompositeNode newJavaName) {
-		CompositeNode oldJavaName = javaName;
-		javaName = newJavaName;
+	public void setCreate(LeafNode newCreate) {
+		LeafNode oldCreate = create;
+		create = newCreate;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME, oldJavaName, javaName));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__CREATE, oldCreate, create));
 	}
 
 	/**
@@ -461,16 +461,16 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getExtendBody() {
-		if (extendBody != null && extendBody.eIsProxy()) {
-			InternalEObject oldExtendBody = (InternalEObject)extendBody;
-			extendBody = (CompositeNode)eResolveProxy(oldExtendBody);
-			if (extendBody != oldExtendBody) {
+	public CompositeNode getParamList() {
+		if (paramList != null && paramList.eIsProxy()) {
+			InternalEObject oldParamList = (InternalEObject)paramList;
+			paramList = (CompositeNode)eResolveProxy(oldParamList);
+			if (paramList != oldParamList) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
 			}
 		}
-		return extendBody;
+		return paramList;
 	}
 
 	/**
@@ -478,8 +478,8 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetExtendBody() {
-		return extendBody;
+	public CompositeNode basicGetParamList() {
+		return paramList;
 	}
 
 	/**
@@ -487,11 +487,11 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setExtendBody(CompositeNode newExtendBody) {
-		CompositeNode oldExtendBody = extendBody;
-		extendBody = newExtendBody;
+	public void setParamList(CompositeNode newParamList) {
+		CompositeNode oldParamList = paramList;
+		paramList = newParamList;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY, oldExtendBody, extendBody));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST, oldParamList, paramList));
 	}
 
 	/**
@@ -505,30 +505,30 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 			case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
 				if (resolve) return getExtendBody();
 				return basicGetExtendBody();
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
-				if (resolve) return getJavaName();
-				return basicGetJavaName();
-			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
-				if (resolve) return getParamList();
-				return basicGetParamList();
-			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
-				if (resolve) return getCreate();
-				return basicGetCreate();
-			case Xpand3nodePackage.EXTENSION_NODE__NAME:
-				if (resolve) return getName();
-				return basicGetName();
 			case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
 				if (resolve) return getReturnType();
 				return basicGetReturnType();
+			case Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME:
+				if (resolve) return getCreatedName();
+				return basicGetCreatedName();
 			case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
 				if (resolve) return getPrivate();
 				return basicGetPrivate();
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
-				if (resolve) return getJavaReturnType();
-				return basicGetJavaReturnType();
+			case Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL:
+				if (resolve) return getJavaCall();
+				return basicGetJavaCall();
+			case Xpand3nodePackage.EXTENSION_NODE__NAME:
+				if (resolve) return getName();
+				return basicGetName();
+			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+				if (resolve) return getCreate();
+				return basicGetCreate();
 			case Xpand3nodePackage.EXTENSION_NODE__CACHED:
 				if (resolve) return getCached();
 				return basicGetCached();
+			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+				if (resolve) return getParamList();
+				return basicGetParamList();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -544,30 +544,30 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 			case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
 				setExtendBody((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
-				setJavaName((CompositeNode)newValue);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
-				setParamList((CompositeNode)newValue);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
-				setCreate((LeafNode)newValue);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__NAME:
-				setName((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
 				setReturnType((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME:
+				setCreatedName((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
 				setPrivate((LeafNode)newValue);
 				return;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
-				setJavaReturnType((CompositeNode)newValue);
+			case Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL:
+				setJavaCall((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.EXTENSION_NODE__NAME:
+				setName((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+				setCreate((LeafNode)newValue);
 				return;
 			case Xpand3nodePackage.EXTENSION_NODE__CACHED:
 				setCached((LeafNode)newValue);
 				return;
+			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+				setParamList((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -583,30 +583,30 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 			case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
 				setExtendBody((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
-				setJavaName((CompositeNode)null);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
-				setParamList((CompositeNode)null);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
-				setCreate((LeafNode)null);
-				return;
-			case Xpand3nodePackage.EXTENSION_NODE__NAME:
-				setName((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
 				setReturnType((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME:
+				setCreatedName((CompositeNode)null);
+				return;
 			case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
 				setPrivate((LeafNode)null);
 				return;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
-				setJavaReturnType((CompositeNode)null);
+			case Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL:
+				setJavaCall((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.EXTENSION_NODE__NAME:
+				setName((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+				setCreate((LeafNode)null);
 				return;
 			case Xpand3nodePackage.EXTENSION_NODE__CACHED:
 				setCached((LeafNode)null);
 				return;
+			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+				setParamList((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -621,22 +621,22 @@ public class ExtensionNodeImpl extends CompositeNodeImpl implements ExtensionNod
 		switch (featureID) {
 			case Xpand3nodePackage.EXTENSION_NODE__EXTEND_BODY:
 				return extendBody != null;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_NAME:
-				return javaName != null;
-			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
-				return paramList != null;
-			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
-				return create != null;
-			case Xpand3nodePackage.EXTENSION_NODE__NAME:
-				return name != null;
 			case Xpand3nodePackage.EXTENSION_NODE__RETURN_TYPE:
 				return returnType != null;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATED_NAME:
+				return createdName != null;
 			case Xpand3nodePackage.EXTENSION_NODE__PRIVATE:
 				return private_ != null;
-			case Xpand3nodePackage.EXTENSION_NODE__JAVA_RETURN_TYPE:
-				return javaReturnType != null;
+			case Xpand3nodePackage.EXTENSION_NODE__JAVA_CALL:
+				return javaCall != null;
+			case Xpand3nodePackage.EXTENSION_NODE__NAME:
+				return name != null;
+			case Xpand3nodePackage.EXTENSION_NODE__CREATE:
+				return create != null;
 			case Xpand3nodePackage.EXTENSION_NODE__CACHED:
 				return cached != null;
+			case Xpand3nodePackage.EXTENSION_NODE__PARAM_LIST:
+				return paramList != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FeatureCallNodeImpl.java
index 20fb015d..5b1f140a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FeatureCallNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FeatureCallNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FeatureCallNodeImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: FeatureCallNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,9 +27,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getParamList <em>Param List</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FeatureCallNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl#getParamList <em>Param List</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FeatureCallNodeImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,34 +37,34 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCallNode {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getType()
+	 * @see #getParamList()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode type;
+	protected CompositeNode paramList;
 
 	/**
-	 * The cached value of the '{@link #getParamList() <em>Param List</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getParamList()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode paramList;
+	protected CompositeNode name;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode type;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -207,15 +207,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
 			case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
 				if (resolve) return getParamList();
 				return basicGetParamList();
 			case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
 				if (resolve) return getName();
 				return basicGetName();
+			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
+				if (resolve) return getType();
+				return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -228,15 +228,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
-				setType((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
 				setParamList((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
 				setName((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
+				setType((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -249,15 +249,15 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
-				setType((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
 				setParamList((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
 				setName((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
+				setType((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -270,12 +270,12 @@ public class FeatureCallNodeImpl extends CompositeNodeImpl implements FeatureCal
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
-				return type != null;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__PARAM_LIST:
 				return paramList != null;
 			case Xpand3nodePackage.FEATURE_CALL_NODE__NAME:
 				return name != null;
+			case Xpand3nodePackage.FEATURE_CALL_NODE__TYPE:
+				return type != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FileNodeImpl.java
index fe79ddca..a979c60e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FileNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: FileNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.FileNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,8 +28,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getImports <em>Imports</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileNodeImpl#getDeclarations <em>Declarations</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl#getDeclarations <em>Declarations</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileNodeImpl#getImports <em>Imports</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class FileNodeImpl extends CompositeNodeImpl implements FileNode {
 	/**
-	 * The cached value of the '{@link #getImports() <em>Imports</em>}' reference list.
+	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getImports()
+	 * @see #getDeclarations()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> imports;
+	protected EList<CompositeNode> declarations;
 
 	/**
-	 * The cached value of the '{@link #getDeclarations() <em>Declarations</em>}' reference list.
+	 * The cached value of the '{@link #getImports() <em>Imports</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDeclarations()
+	 * @see #getImports()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> declarations;
+	protected EList<CompositeNode> imports;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -107,10 +107,10 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.FILE_NODE__IMPORTS:
-				return getImports();
 			case Xpand3nodePackage.FILE_NODE__DECLARATIONS:
 				return getDeclarations();
+			case Xpand3nodePackage.FILE_NODE__IMPORTS:
+				return getImports();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -124,14 +124,14 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.FILE_NODE__IMPORTS:
-				getImports().clear();
-				getImports().addAll((Collection<? extends CompositeNode>)newValue);
-				return;
 			case Xpand3nodePackage.FILE_NODE__DECLARATIONS:
 				getDeclarations().clear();
 				getDeclarations().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
+			case Xpand3nodePackage.FILE_NODE__IMPORTS:
+				getImports().clear();
+				getImports().addAll((Collection<? extends CompositeNode>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -144,12 +144,12 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FILE_NODE__IMPORTS:
-				getImports().clear();
-				return;
 			case Xpand3nodePackage.FILE_NODE__DECLARATIONS:
 				getDeclarations().clear();
 				return;
+			case Xpand3nodePackage.FILE_NODE__IMPORTS:
+				getImports().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -162,10 +162,10 @@ public class FileNodeImpl extends CompositeNodeImpl implements FileNode {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FILE_NODE__IMPORTS:
-				return imports != null && !imports.isEmpty();
 			case Xpand3nodePackage.FILE_NODE__DECLARATIONS:
 				return declarations != null && !declarations.isEmpty();
+			case Xpand3nodePackage.FILE_NODE__IMPORTS:
+				return imports != null && !imports.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FileStatementNodeImpl.java
index cd698a9b..80455fe4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/FileStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/FileStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileStatementNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: FileStatementNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,9 +27,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.FileStatementNodeImpl#getNameExpression <em>Name Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.FileStatementNodeImpl#getNameExpression <em>Name Expression</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ForeachStatementNodeImpl.java
index c3b056ae..b82c3f89 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ForeachStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ForeachStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ForeachStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ForeachStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,11 +27,11 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getSeparatorExpression <em>Separator Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIterator <em>Iterator</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getForExpression <em>For Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ForeachStatementNodeImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl#getIterator <em>Iterator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl#getIdentifier <em>Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl#getForExpression <em>For Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ForeachStatementNodeImpl#getSeparatorExpression <em>Separator Expression</em>}</li>
  * </ul>
  * </p>
  *
@@ -39,34 +39,34 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ForeachStatementNodeImpl extends CompositeNodeImpl implements ForeachStatementNode {
 	/**
-	 * The cached value of the '{@link #getSeparatorExpression() <em>Separator Expression</em>}' reference.
+	 * The cached value of the '{@link #getIterator() <em>Iterator</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSeparatorExpression()
+	 * @see #getIterator()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode separatorExpression;
+	protected CompositeNode iterator;
 
 	/**
-	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
+	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSequence()
+	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode sequence;
+	protected CompositeNode identifier;
 
 	/**
-	 * The cached value of the '{@link #getIterator() <em>Iterator</em>}' reference.
+	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getIterator()
+	 * @see #getSequence()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode iterator;
+	protected CompositeNode sequence;
 
 	/**
 	 * The cached value of the '{@link #getForExpression() <em>For Expression</em>}' reference.
@@ -79,14 +79,14 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea
 	protected CompositeNode forExpression;
 
 	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' reference.
+	 * The cached value of the '{@link #getSeparatorExpression() <em>Separator Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
+	 * @see #getSeparatorExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode identifier;
+	protected CompositeNode separatorExpression;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -305,21 +305,21 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
-				if (resolve) return getSeparatorExpression();
-				return basicGetSeparatorExpression();
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
-				if (resolve) return getSequence();
-				return basicGetSequence();
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
 				if (resolve) return getIterator();
 				return basicGetIterator();
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
-				if (resolve) return getForExpression();
-				return basicGetForExpression();
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
 				if (resolve) return getIdentifier();
 				return basicGetIdentifier();
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
+				if (resolve) return getSequence();
+				return basicGetSequence();
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
+				if (resolve) return getForExpression();
+				return basicGetForExpression();
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
+				if (resolve) return getSeparatorExpression();
+				return basicGetSeparatorExpression();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -332,20 +332,20 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
-				setSeparatorExpression((CompositeNode)newValue);
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
+				setIterator((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
+				setIdentifier((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
-				setIterator((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
 				setForExpression((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
-				setIdentifier((CompositeNode)newValue);
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
+				setSeparatorExpression((CompositeNode)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -359,20 +359,20 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
-				setSeparatorExpression((CompositeNode)null);
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
+				setIterator((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
+				setIdentifier((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
-				setIterator((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
 				setForExpression((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
-				setIdentifier((CompositeNode)null);
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
+				setSeparatorExpression((CompositeNode)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -386,16 +386,16 @@ public class ForeachStatementNodeImpl extends CompositeNodeImpl implements Forea
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
-				return separatorExpression != null;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
-				return sequence != null;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__ITERATOR:
 				return iterator != null;
-			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
-				return forExpression != null;
 			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__IDENTIFIER:
 				return identifier != null;
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEQUENCE:
+				return sequence != null;
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__FOR_EXPRESSION:
+				return forExpression != null;
+			case Xpand3nodePackage.FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION:
+				return separatorExpression != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
index 71346164..134b7fb8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/GlobalVarExpressionNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: GlobalVarExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IdentifierNodeImpl.java
index cc39a7da..8a8bb5ff 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IdentifierNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IdentifierNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdentifierNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: IdentifierNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IfExpressionNodeImpl.java
index efc50124..49fd50bd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IfExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: IfExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition1 <em>Condition1</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getElse <em>Else</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getThen <em>Then</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition0 <em>Condition0</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition0 <em>Condition0</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl#getElse <em>Else</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl#getThen <em>Then</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfExpressionNodeImpl#getCondition1 <em>Condition1</em>}</li>
  * </ul>
  * </p>
  *
@@ -38,14 +38,14 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpressionNode {
 	/**
-	 * The cached value of the '{@link #getCondition1() <em>Condition1</em>}' reference.
+	 * The cached value of the '{@link #getCondition0() <em>Condition0</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCondition1()
+	 * @see #getCondition0()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode condition1;
+	protected CompositeNode condition0;
 
 	/**
 	 * The cached value of the '{@link #getElse() <em>Else</em>}' reference.
@@ -68,14 +68,14 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	protected CompositeNode then;
 
 	/**
-	 * The cached value of the '{@link #getCondition0() <em>Condition0</em>}' reference.
+	 * The cached value of the '{@link #getCondition1() <em>Condition1</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCondition0()
+	 * @see #getCondition1()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode condition0;
+	protected CompositeNode condition1;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -101,16 +101,16 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getThen() {
-		if (then != null && then.eIsProxy()) {
-			InternalEObject oldThen = (InternalEObject)then;
-			then = (CompositeNode)eResolveProxy(oldThen);
-			if (then != oldThen) {
+	public CompositeNode getCondition0() {
+		if (condition0 != null && condition0.eIsProxy()) {
+			InternalEObject oldCondition0 = (InternalEObject)condition0;
+			condition0 = (CompositeNode)eResolveProxy(oldCondition0);
+			if (condition0 != oldCondition0) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0));
 			}
 		}
-		return then;
+		return condition0;
 	}
 
 	/**
@@ -118,8 +118,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetThen() {
-		return then;
+	public CompositeNode basicGetCondition0() {
+		return condition0;
 	}
 
 	/**
@@ -127,11 +127,11 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setThen(CompositeNode newThen) {
-		CompositeNode oldThen = then;
-		then = newThen;
+	public void setCondition0(CompositeNode newCondition0) {
+		CompositeNode oldCondition0 = condition0;
+		condition0 = newCondition0;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0));
 	}
 
 	/**
@@ -177,16 +177,16 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getCondition0() {
-		if (condition0 != null && condition0.eIsProxy()) {
-			InternalEObject oldCondition0 = (InternalEObject)condition0;
-			condition0 = (CompositeNode)eResolveProxy(oldCondition0);
-			if (condition0 != oldCondition0) {
+	public CompositeNode getThen() {
+		if (then != null && then.eIsProxy()) {
+			InternalEObject oldThen = (InternalEObject)then;
+			then = (CompositeNode)eResolveProxy(oldThen);
+			if (then != oldThen) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then));
 			}
 		}
-		return condition0;
+		return then;
 	}
 
 	/**
@@ -194,8 +194,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetCondition0() {
-		return condition0;
+	public CompositeNode basicGetThen() {
+		return then;
 	}
 
 	/**
@@ -203,11 +203,11 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setCondition0(CompositeNode newCondition0) {
-		CompositeNode oldCondition0 = condition0;
-		condition0 = newCondition0;
+	public void setThen(CompositeNode newThen) {
+		CompositeNode oldThen = then;
+		then = newThen;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0, oldCondition0, condition0));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.IF_EXPRESSION_NODE__THEN, oldThen, then));
 	}
 
 	/**
@@ -256,18 +256,18 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
-				if (resolve) return getCondition1();
-				return basicGetCondition1();
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
+				if (resolve) return getCondition0();
+				return basicGetCondition0();
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE:
 				if (resolve) return getElse();
 				return basicGetElse();
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN:
 				if (resolve) return getThen();
 				return basicGetThen();
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
-				if (resolve) return getCondition0();
-				return basicGetCondition0();
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
+				if (resolve) return getCondition1();
+				return basicGetCondition1();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -280,8 +280,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
-				setCondition1((CompositeNode)newValue);
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
+				setCondition0((CompositeNode)newValue);
 				return;
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE:
 				setElse((CompositeNode)newValue);
@@ -289,8 +289,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN:
 				setThen((CompositeNode)newValue);
 				return;
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
-				setCondition0((CompositeNode)newValue);
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
+				setCondition1((CompositeNode)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -304,8 +304,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
-				setCondition1((CompositeNode)null);
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
+				setCondition0((CompositeNode)null);
 				return;
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE:
 				setElse((CompositeNode)null);
@@ -313,8 +313,8 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN:
 				setThen((CompositeNode)null);
 				return;
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
-				setCondition0((CompositeNode)null);
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
+				setCondition1((CompositeNode)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -328,14 +328,14 @@ public class IfExpressionNodeImpl extends CompositeNodeImpl implements IfExpress
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
-				return condition1 != null;
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
+				return condition0 != null;
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__ELSE:
 				return else_ != null;
 			case Xpand3nodePackage.IF_EXPRESSION_NODE__THEN:
 				return then != null;
-			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION0:
-				return condition0 != null;
+			case Xpand3nodePackage.IF_EXPRESSION_NODE__CONDITION1:
+				return condition1 != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IfStatementNodeImpl.java
index b483702b..e95cb02b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/IfStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/IfStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: IfStatementNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,10 +33,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getElse <em>Else</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getElseIfs <em>Else Ifs</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.IfStatementNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl#getElseIfs <em>Else Ifs</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl#getElse <em>Else</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.IfStatementNodeImpl#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
@@ -44,44 +44,44 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatementNode {
 	/**
-	 * The cached value of the '{@link #getElse() <em>Else</em>}' reference.
+	 * The cached value of the '{@link #getElseIfs() <em>Else Ifs</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getElse()
+	 * @see #getElseIfs()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode else_;
+	protected EList<CompositeNode> elseIfs;
 
 	/**
-	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSequence()
+	 * @see #getExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode sequence;
+	protected CompositeNode expression;
 
 	/**
-	 * The cached value of the '{@link #getElseIfs() <em>Else Ifs</em>}' reference list.
+	 * The cached value of the '{@link #getElse() <em>Else</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getElseIfs()
+	 * @see #getElse()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> elseIfs;
+	protected CompositeNode else_;
 
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
+	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getExpression()
+	 * @see #getSequence()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode expression;
+	protected CompositeNode sequence;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -236,17 +236,17 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS:
+				return getElseIfs();
+			case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION:
+				if (resolve) return getExpression();
+				return basicGetExpression();
 			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
 				if (resolve) return getElse();
 				return basicGetElse();
 			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
 				if (resolve) return getSequence();
 				return basicGetSequence();
-			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS:
-				return getElseIfs();
-			case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION:
-				if (resolve) return getExpression();
-				return basicGetExpression();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -260,12 +260,6 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
-				setElse((CompositeNode)newValue);
-				return;
-			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
-				setSequence((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS:
 				getElseIfs().clear();
 				getElseIfs().addAll((Collection<? extends CompositeNode>)newValue);
@@ -273,6 +267,12 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen
 			case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION:
 				setExpression((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
+				setElse((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
+				setSequence((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -285,18 +285,18 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
-				setElse((CompositeNode)null);
-				return;
-			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
-				setSequence((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS:
 				getElseIfs().clear();
 				return;
 			case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION:
 				setExpression((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
+				setElse((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
+				setSequence((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -309,14 +309,14 @@ public class IfStatementNodeImpl extends CompositeNodeImpl implements IfStatemen
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
-				return else_ != null;
-			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
-				return sequence != null;
 			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE_IFS:
 				return elseIfs != null && !elseIfs.isEmpty();
 			case Xpand3nodePackage.IF_STATEMENT_NODE__EXPRESSION:
 				return expression != null;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__ELSE:
+				return else_ != null;
+			case Xpand3nodePackage.IF_STATEMENT_NODE__SEQUENCE:
+				return sequence != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java
index 4131fc86..2b3dc19b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ImpliesExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImpliesExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ImpliesExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImpliesExpressionNodeImpl#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements ImpliesExpressionNode {
 	/**
-	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
+	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFirst()
+	 * @see #getNexts()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode first;
+	protected EList<CompositeNode> nexts;
 
 	/**
-	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
+	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getNexts()
+	 * @see #getFirst()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> nexts;
+	protected CompositeNode first;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -138,11 +138,11 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
+			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS:
+				return getNexts();
 			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
 				if (resolve) return getFirst();
 				return basicGetFirst();
-			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS:
-				return getNexts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,13 +156,13 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				getNexts().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
+			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -175,12 +175,12 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				return;
+			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,10 +193,10 @@ public class ImpliesExpressionNodeImpl extends CompositeNodeImpl implements Impl
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
-				return first != null;
 			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__NEXTS:
 				return nexts != null && !nexts.isEmpty();
+			case Xpand3nodePackage.IMPLIES_EXPRESSION_NODE__FIRST:
+				return first != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ImportNodeImpl.java
index c7061754..294113ea 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ImportNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ImportNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImportNodeImpl.java,v 1.3 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ImportNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ImportNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,8 +27,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ImportNodeImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl#getNamespace <em>Namespace</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ImportNodeImpl#getType <em>Type</em>}</li>
  * </ul>
  * </p>
  *
@@ -36,24 +36,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode {
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getType()
+	 * @see #getNamespace()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode type;
+	protected CompositeNode namespace;
 
 	/**
-	 * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' reference.
+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getNamespace()
+	 * @see #getType()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode namespace;
+	protected CompositeNode type;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -158,12 +158,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPORT_NODE__TYPE:
-				if (resolve) return getType();
-				return basicGetType();
 			case Xpand3nodePackage.IMPORT_NODE__NAMESPACE:
 				if (resolve) return getNamespace();
 				return basicGetNamespace();
+			case Xpand3nodePackage.IMPORT_NODE__TYPE:
+				if (resolve) return getType();
+				return basicGetType();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -176,12 +176,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPORT_NODE__TYPE:
-				setType((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.IMPORT_NODE__NAMESPACE:
 				setNamespace((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.IMPORT_NODE__TYPE:
+				setType((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -194,12 +194,12 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPORT_NODE__TYPE:
-				setType((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.IMPORT_NODE__NAMESPACE:
 				setNamespace((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.IMPORT_NODE__TYPE:
+				setType((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -212,10 +212,10 @@ public class ImportNodeImpl extends CompositeNodeImpl implements ImportNode {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.IMPORT_NODE__TYPE:
-				return type != null;
 			case Xpand3nodePackage.IMPORT_NODE__NAMESPACE:
 				return namespace != null;
+			case Xpand3nodePackage.IMPORT_NODE__TYPE:
+				return type != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/InfixExpressionNodeImpl.java
index c0c15704..855410c2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/InfixExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/InfixExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: InfixExpressionNodeImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: InfixExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.InfixExpressionNodeImpl#getCalls <em>Calls</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.InfixExpressionNodeImpl#getCalls <em>Calls</em>}</li>
  * </ul>
  * </p>
  *
@@ -85,18 +85,6 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CompositeNode> getCalls() {
-		if (calls == null) {
-			calls = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS);
-		}
-		return calls;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public CompositeNode getTarget() {
 		if (target != null && target.eIsProxy()) {
 			InternalEObject oldTarget = (InternalEObject)target;
@@ -135,6 +123,18 @@ public class InfixExpressionNodeImpl extends CompositeNodeImpl implements InfixE
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<CompositeNode> getCalls() {
+		if (calls == null) {
+			calls = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.INFIX_EXPRESSION_NODE__CALLS);
+		}
+		return calls;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/JavaCallNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/JavaCallNodeImpl.java
new file mode 100644
index 00000000..9a52c0ef
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/JavaCallNodeImpl.java
@@ -0,0 +1,223 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaCallNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.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.tmf.common.node.CompositeNode;
+
+import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
+
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Java Call Node</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl#getJavaReturnType <em>Java Return Type</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.JavaCallNodeImpl#getJavaName <em>Java Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class JavaCallNodeImpl extends CompositeNodeImpl implements JavaCallNode {
+	/**
+	 * The cached value of the '{@link #getJavaReturnType() <em>Java Return Type</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJavaReturnType()
+	 * @generated
+	 * @ordered
+	 */
+	protected CompositeNode javaReturnType;
+
+	/**
+	 * The cached value of the '{@link #getJavaName() <em>Java Name</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJavaName()
+	 * @generated
+	 * @ordered
+	 */
+	protected CompositeNode javaName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected JavaCallNodeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return Xpand3nodePackage.Literals.JAVA_CALL_NODE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositeNode getJavaReturnType() {
+		if (javaReturnType != null && javaReturnType.eIsProxy()) {
+			InternalEObject oldJavaReturnType = (InternalEObject)javaReturnType;
+			javaReturnType = (CompositeNode)eResolveProxy(oldJavaReturnType);
+			if (javaReturnType != oldJavaReturnType) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+			}
+		}
+		return javaReturnType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositeNode basicGetJavaReturnType() {
+		return javaReturnType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJavaReturnType(CompositeNode newJavaReturnType) {
+		CompositeNode oldJavaReturnType = javaReturnType;
+		javaReturnType = newJavaReturnType;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE, oldJavaReturnType, javaReturnType));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositeNode getJavaName() {
+		if (javaName != null && javaName.eIsProxy()) {
+			InternalEObject oldJavaName = (InternalEObject)javaName;
+			javaName = (CompositeNode)eResolveProxy(oldJavaName);
+			if (javaName != oldJavaName) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME, oldJavaName, javaName));
+			}
+		}
+		return javaName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CompositeNode basicGetJavaName() {
+		return javaName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJavaName(CompositeNode newJavaName) {
+		CompositeNode oldJavaName = javaName;
+		javaName = newJavaName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME, oldJavaName, javaName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE:
+				if (resolve) return getJavaReturnType();
+				return basicGetJavaReturnType();
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME:
+				if (resolve) return getJavaName();
+				return basicGetJavaName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE:
+				setJavaReturnType((CompositeNode)newValue);
+				return;
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME:
+				setJavaName((CompositeNode)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE:
+				setJavaReturnType((CompositeNode)null);
+				return;
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME:
+				setJavaName((CompositeNode)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_RETURN_TYPE:
+				return javaReturnType != null;
+			case Xpand3nodePackage.JAVA_CALL_NODE__JAVA_NAME:
+				return javaName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //JavaCallNodeImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/JavaTypeNodeImpl.java
index 9c95dfb5..3b287b02 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/JavaTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/JavaTypeNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JavaTypeNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: JavaTypeNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/LetExpressionNodeImpl.java
index 130e9545..5eb5fbe4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/LetExpressionNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:02 jkohnlein Exp $
+ * $Id: LetExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/LetStatementNodeImpl.java
index abfcb318..d5474200 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/LetStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/LetStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: LetStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,9 +27,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.LetStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.LetStatementNodeImpl#getSequence <em>Sequence</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatementNode {
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
+	 * @see #getExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode name;
+	protected CompositeNode expression;
 
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
+	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getExpression()
+	 * @see #getName()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode expression;
+	protected CompositeNode name;
 
 	/**
 	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
@@ -207,12 +207,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
-				if (resolve) return getName();
-				return basicGetName();
 			case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION:
 				if (resolve) return getExpression();
 				return basicGetExpression();
+			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
+				if (resolve) return getName();
+				return basicGetName();
 			case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE:
 				if (resolve) return getSequence();
 				return basicGetSequence();
@@ -228,12 +228,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
-				setName((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION:
 				setExpression((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
+				setName((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)newValue);
 				return;
@@ -249,12 +249,12 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
-				setName((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION:
 				setExpression((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
+				setName((CompositeNode)null);
+				return;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)null);
 				return;
@@ -270,10 +270,10 @@ public class LetStatementNodeImpl extends CompositeNodeImpl implements LetStatem
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
-				return name != null;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__EXPRESSION:
 				return expression != null;
+			case Xpand3nodePackage.LET_STATEMENT_NODE__NAME:
+				return name != null;
 			case Xpand3nodePackage.LET_STATEMENT_NODE__SEQUENCE:
 				return sequence != null;
 		}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ListLiteralNodeImpl.java
index e4617ff2..84a9fe84 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ListLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ListLiteralNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ListLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ListLiteralNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ListLiteralNodeImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ListLiteralNodeImpl#getElements <em>Elements</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java
index 3c028c24..64d7335f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/MultiplicativeExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MultiplicativeExpressionNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getFirst <em>First</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.MultiplicativeExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
@@ -85,18 +85,6 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CompositeNode> getNexts() {
-		if (nexts == null) {
-			nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS);
-		}
-		return nexts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public CompositeNode getFirst() {
 		if (first != null && first.eIsProxy()) {
 			InternalEObject oldFirst = (InternalEObject)first;
@@ -135,6 +123,18 @@ public class MultiplicativeExpressionNodeImpl extends CompositeNodeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<CompositeNode> getNexts() {
+		if (nexts == null) {
+			nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.MULTIPLICATIVE_EXPRESSION_NODE__NEXTS);
+		}
+		return nexts;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/NullLiteralNodeImpl.java
index 8fce5809..2b628979 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NullLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/NullLiteralNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NullLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: NullLiteralNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/NumberLiteralNodeImpl.java
index 87b05c88..d8b0ee6a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/NumberLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/NumberLiteralNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NumberLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: NumberLiteralNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/OrExpressionNodeImpl.java
index 850406ed..3cef04f6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/OrExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/OrExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: OrExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: OrExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.OrExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.OrExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
  * </ul>
  * </p>
  *
@@ -42,24 +42,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpressionNode {
 	/**
-	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
+	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getNexts()
+	 * @see #getFirst()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> nexts;
+	protected CompositeNode first;
 
 	/**
-	 * The cached value of the '{@link #getFirst() <em>First</em>}' reference.
+	 * The cached value of the '{@link #getNexts() <em>Nexts</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFirst()
+	 * @see #getNexts()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode first;
+	protected EList<CompositeNode> nexts;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -85,18 +85,6 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CompositeNode> getNexts() {
-		if (nexts == null) {
-			nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS);
-		}
-		return nexts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public CompositeNode getFirst() {
 		if (first != null && first.eIsProxy()) {
 			InternalEObject oldFirst = (InternalEObject)first;
@@ -135,14 +123,26 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<CompositeNode> getNexts() {
+		if (nexts == null) {
+			nexts = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS);
+		}
+		return nexts;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
-				return getNexts();
 			case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST:
 				if (resolve) return getFirst();
 				return basicGetFirst();
+			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
+				return getNexts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,13 +156,13 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST:
+				setFirst((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
 				getNexts().clear();
 				getNexts().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
-			case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST:
-				setFirst((CompositeNode)newValue);
-				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -175,12 +175,12 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
-				getNexts().clear();
-				return;
 			case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST:
 				setFirst((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
+				getNexts().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,10 +193,10 @@ public class OrExpressionNodeImpl extends CompositeNodeImpl implements OrExpress
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
-				return nexts != null && !nexts.isEmpty();
 			case Xpand3nodePackage.OR_EXPRESSION_NODE__FIRST:
 				return first != null;
+			case Xpand3nodePackage.OR_EXPRESSION_NODE__NEXTS:
+				return nexts != null && !nexts.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ParameterListNodeImpl.java
index b41b7b4a..42332e8b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParameterListNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ParameterListNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParameterListNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ParameterListNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParameterListNodeImpl#getParams <em>Params</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParameterListNodeImpl#getParams <em>Params</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
index e0b6ef6c..9e192573 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ParanthesizedExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParanthesizedExpressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ParanthesizedExpressionNodeImpl#getExpression <em>Expression</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/PointcutNodeImpl.java
index 7c641510..9f851fef 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/PointcutNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/PointcutNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PointcutNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: PointcutNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ProtectStatementNodeImpl.java
index 326746e3..437210d1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/ProtectStatementNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/ProtectStatementNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProtectStatementNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: ProtectStatementNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,10 +27,10 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getCstart <em>Cstart</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getSequence <em>Sequence</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getCend <em>Cend</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.ProtectStatementNodeImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl#getSequence <em>Sequence</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl#getCend <em>Cend</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.ProtectStatementNodeImpl#getCstart <em>Cstart</em>}</li>
  * </ul>
  * </p>
  *
@@ -38,16 +38,6 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class ProtectStatementNodeImpl extends CompositeNodeImpl implements ProtectStatementNode {
 	/**
-	 * The cached value of the '{@link #getCstart() <em>Cstart</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCstart()
-	 * @generated
-	 * @ordered
-	 */
-	protected CompositeNode cstart;
-
-	/**
 	 * The cached value of the '{@link #getSequence() <em>Sequence</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -78,6 +68,16 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 	protected CompositeNode id;
 
 	/**
+	 * The cached value of the '{@link #getCstart() <em>Cstart</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCstart()
+	 * @generated
+	 * @ordered
+	 */
+	protected CompositeNode cstart;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -256,9 +256,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
-				if (resolve) return getCstart();
-				return basicGetCstart();
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE:
 				if (resolve) return getSequence();
 				return basicGetSequence();
@@ -268,6 +265,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID:
 				if (resolve) return getId();
 				return basicGetId();
+			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
+				if (resolve) return getCstart();
+				return basicGetCstart();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -280,9 +280,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
-				setCstart((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)newValue);
 				return;
@@ -292,6 +289,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID:
 				setId((CompositeNode)newValue);
 				return;
+			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
+				setCstart((CompositeNode)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -304,9 +304,6 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
-				setCstart((CompositeNode)null);
-				return;
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE:
 				setSequence((CompositeNode)null);
 				return;
@@ -316,6 +313,9 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID:
 				setId((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
+				setCstart((CompositeNode)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -328,14 +328,14 @@ public class ProtectStatementNodeImpl extends CompositeNodeImpl implements Prote
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
-				return cstart != null;
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__SEQUENCE:
 				return sequence != null;
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CEND:
 				return cend != null;
 			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__ID:
 				return id != null;
+			case Xpand3nodePackage.PROTECT_STATEMENT_NODE__CSTART:
+				return cstart != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
index 68018fbf..90315321 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/RelationalExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RelationalExpressionNodeImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +33,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.RelationalExpressionNodeImpl#getFirst <em>First</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl#getNexts <em>Nexts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.RelationalExpressionNodeImpl#getFirst <em>First</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SequenceNodeImpl.java
index 8b416bc2..1d40a24b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SequenceNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SequenceNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SequenceNodeImpl.java,v 1.5 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: SequenceNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,8 +28,8 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl#getStatements <em>Statements</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SequenceNodeImpl#getTextSequences <em>Text Sequences</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl#getTextSequences <em>Text Sequences</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SequenceNodeImpl#getStatements <em>Statements</em>}</li>
  * </ul>
  * </p>
  *
@@ -37,24 +37,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode {
 	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' reference list.
+	 * The cached value of the '{@link #getTextSequences() <em>Text Sequences</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getStatements()
+	 * @see #getTextSequences()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> statements;
+	protected EList<CompositeNode> textSequences;
 
 	/**
-	 * The cached value of the '{@link #getTextSequences() <em>Text Sequences</em>}' reference list.
+	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTextSequences()
+	 * @see #getStatements()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> textSequences;
+	protected EList<CompositeNode> statements;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -107,10 +107,10 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
-				return getStatements();
 			case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES:
 				return getTextSequences();
+			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
+				return getStatements();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -124,14 +124,14 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
-				getStatements().clear();
-				getStatements().addAll((Collection<? extends CompositeNode>)newValue);
-				return;
 			case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES:
 				getTextSequences().clear();
 				getTextSequences().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
+			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
+				getStatements().clear();
+				getStatements().addAll((Collection<? extends CompositeNode>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -144,12 +144,12 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
-				getStatements().clear();
-				return;
 			case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES:
 				getTextSequences().clear();
 				return;
+			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
+				getStatements().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -162,10 +162,10 @@ public class SequenceNodeImpl extends CompositeNodeImpl implements SequenceNode
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
-				return statements != null && !statements.isEmpty();
 			case Xpand3nodePackage.SEQUENCE_NODE__TEXT_SEQUENCES:
 				return textSequences != null && !textSequences.isEmpty();
+			case Xpand3nodePackage.SEQUENCE_NODE__STATEMENTS:
+				return statements != null && !statements.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SimpleTypeNodeImpl.java
index eb156953..cd51c60a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SimpleTypeNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SimpleTypeNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SimpleTypeNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: SimpleTypeNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SimpleTypeNodeImpl#getNames <em>Names</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SimpleTypeNodeImpl#getNames <em>Names</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/StringLiteralNodeImpl.java
index cea48628..b7289569 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/StringLiteralNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/StringLiteralNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: StringLiteralNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: StringLiteralNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SwitchExpressionNodeImpl.java
index 313d9e08..9e6331e9 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/SwitchExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/SwitchExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SwitchExpressionNodeImpl.java,v 1.4 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: SwitchExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -23,8 +23,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,9 +33,9 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getCases <em>Cases</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getExpression <em>Expression</em>}</li>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.SwitchExpressionNodeImpl#getDefault <em>Default</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl#getCases <em>Cases</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.SwitchExpressionNodeImpl#getDefault <em>Default</em>}</li>
  * </ul>
  * </p>
  *
@@ -43,24 +43,24 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  */
 public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements SwitchExpressionNode {
 	/**
-	 * The cached value of the '{@link #getCases() <em>Cases</em>}' reference list.
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCases()
+	 * @see #getExpression()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<CompositeNode> cases;
+	protected CompositeNode expression;
 
 	/**
-	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' reference.
+	 * The cached value of the '{@link #getCases() <em>Cases</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getExpression()
+	 * @see #getCases()
 	 * @generated
 	 * @ordered
 	 */
-	protected CompositeNode expression;
+	protected EList<CompositeNode> cases;
 
 	/**
 	 * The cached value of the '{@link #getDefault() <em>Default</em>}' reference.
@@ -96,16 +96,16 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getDefault() {
-		if (default_ != null && default_.eIsProxy()) {
-			InternalEObject oldDefault = (InternalEObject)default_;
-			default_ = (CompositeNode)eResolveProxy(oldDefault);
-			if (default_ != oldDefault) {
+	public CompositeNode getExpression() {
+		if (expression != null && expression.eIsProxy()) {
+			InternalEObject oldExpression = (InternalEObject)expression;
+			expression = (CompositeNode)eResolveProxy(oldExpression);
+			if (expression != oldExpression) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
 			}
 		}
-		return default_;
+		return expression;
 	}
 
 	/**
@@ -113,8 +113,8 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetDefault() {
-		return default_;
+	public CompositeNode basicGetExpression() {
+		return expression;
 	}
 
 	/**
@@ -122,11 +122,11 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setDefault(CompositeNode newDefault) {
-		CompositeNode oldDefault = default_;
-		default_ = newDefault;
+	public void setExpression(CompositeNode newExpression) {
+		CompositeNode oldExpression = expression;
+		expression = newExpression;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_));
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
 	}
 
 	/**
@@ -134,16 +134,11 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode getExpression() {
-		if (expression != null && expression.eIsProxy()) {
-			InternalEObject oldExpression = (InternalEObject)expression;
-			expression = (CompositeNode)eResolveProxy(oldExpression);
-			if (expression != oldExpression) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
-			}
+	public EList<CompositeNode> getCases() {
+		if (cases == null) {
+			cases = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES);
 		}
-		return expression;
+		return cases;
 	}
 
 	/**
@@ -151,8 +146,16 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CompositeNode basicGetExpression() {
-		return expression;
+	public CompositeNode getDefault() {
+		if (default_ != null && default_.eIsProxy()) {
+			InternalEObject oldDefault = (InternalEObject)default_;
+			default_ = (CompositeNode)eResolveProxy(oldDefault);
+			if (default_ != oldDefault) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_));
+			}
+		}
+		return default_;
 	}
 
 	/**
@@ -160,11 +163,8 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setExpression(CompositeNode newExpression) {
-		CompositeNode oldExpression = expression;
-		expression = newExpression;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION, oldExpression, expression));
+	public CompositeNode basicGetDefault() {
+		return default_;
 	}
 
 	/**
@@ -172,11 +172,11 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<CompositeNode> getCases() {
-		if (cases == null) {
-			cases = new EObjectResolvingEList<CompositeNode>(CompositeNode.class, this, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES);
-		}
-		return cases;
+	public void setDefault(CompositeNode newDefault) {
+		CompositeNode oldDefault = default_;
+		default_ = newDefault;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT, oldDefault, default_));
 	}
 
 	/**
@@ -187,11 +187,11 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
-				return getCases();
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION:
 				if (resolve) return getExpression();
 				return basicGetExpression();
+			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
+				return getCases();
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT:
 				if (resolve) return getDefault();
 				return basicGetDefault();
@@ -208,13 +208,13 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
+			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION:
+				setExpression((CompositeNode)newValue);
+				return;
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
 				getCases().clear();
 				getCases().addAll((Collection<? extends CompositeNode>)newValue);
 				return;
-			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION:
-				setExpression((CompositeNode)newValue);
-				return;
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT:
 				setDefault((CompositeNode)newValue);
 				return;
@@ -230,12 +230,12 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
-				getCases().clear();
-				return;
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION:
 				setExpression((CompositeNode)null);
 				return;
+			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
+				getCases().clear();
+				return;
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT:
 				setDefault((CompositeNode)null);
 				return;
@@ -251,10 +251,10 @@ public class SwitchExpressionNodeImpl extends CompositeNodeImpl implements Switc
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
-				return cases != null && !cases.isEmpty();
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__EXPRESSION:
 				return expression != null;
+			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__CASES:
+				return cases != null && !cases.isEmpty();
 			case Xpand3nodePackage.SWITCH_EXPRESSION_NODE__DEFAULT:
 				return default_ != null;
 		}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Test_expressionNodeImpl.java
index 538c98e3..a364d34b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Test_expressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Test_expressionNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Test_expressionNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: Test_expressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/TextNodeImpl.java
index 6059f7f8..ebc32cad 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/TextNodeImpl.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextNodeImpl.java,v 1.3 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: TextNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.TextNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/TextSequenceNodeImpl.java
index eecb39a6..b58f2e92 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/TextSequenceNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/TextSequenceNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextSequenceNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: TextSequenceNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import java.util.Collection;
 
@@ -18,8 +18,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.TextSequenceNodeImpl#getTexts <em>Texts</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.TextSequenceNodeImpl#getTexts <em>Texts</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
index 699b94ff..dd4f01b8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/UnaryExpressionNodeImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UnaryExpressionNodeImpl.java,v 1.4 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: UnaryExpressionNodeImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 
 import org.eclipse.tmf.common.node.impl.CompositeNodeImpl;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -27,7 +27,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.xpand3.internal.parser.xpand3node.impl.UnaryExpressionNodeImpl#getOperand <em>Operand</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl.UnaryExpressionNodeImpl#getOperand <em>Operand</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
index 14a4d549..fd883ea6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Xpand3nodeFactoryImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodeFactoryImpl.java,v 1.6 2008/03/13 08:40:01 jkohnlein Exp $
+ * $Id: Xpand3nodeFactoryImpl.java,v 1.1 2008/03/17 14:39:07 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.*;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -82,6 +82,7 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
 			case Xpand3nodePackage.AROUND_NODE: return createAroundNode();
 			case Xpand3nodePackage.POINTCUT_NODE: return createPointcutNode();
 			case Xpand3nodePackage.EXTENSION_NODE: return createExtensionNode();
+			case Xpand3nodePackage.JAVA_CALL_NODE: return createJavaCallNode();
 			case Xpand3nodePackage.JAVA_TYPE_NODE: return createJavaTypeNode();
 			case Xpand3nodePackage.TEST_EXPRESSION_NODE: return createTest_expressionNode();
 			case Xpand3nodePackage.LET_EXPRESSION_NODE: return createLetExpressionNode();
@@ -344,6 +345,16 @@ public class Xpand3nodeFactoryImpl extends EFactoryImpl implements Xpand3nodeFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public JavaCallNode createJavaCallNode() {
+		JavaCallNodeImpl javaCallNode = new JavaCallNodeImpl();
+		return javaCallNode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public JavaTypeNode createJavaTypeNode() {
 		JavaTypeNodeImpl javaTypeNode = new JavaTypeNodeImpl();
 		return javaTypeNode;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Xpand3nodePackageImpl.java
index 40f2e67c..96b162ea 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/impl/Xpand3nodePackageImpl.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/impl/Xpand3nodePackageImpl.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodePackageImpl.java,v 1.7 2008/03/17 10:55:27 jkohnlein Exp $
+ * $Id: Xpand3nodePackageImpl.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.impl;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
@@ -14,62 +14,63 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.tmf.common.node.NodePackage;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.AroundNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.CheckNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.FileNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ImportNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.TextNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodeFactory;
-import org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodeFactory;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -237,6 +238,13 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass javaCallNodeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass javaTypeNodeEClass = null;
 
 	/**
@@ -467,7 +475,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage#eNS_URI
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -542,7 +550,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getFileNode_Declarations() {
-		return (EReference)fileNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)fileNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -551,7 +559,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getFileNode_Imports() {
-		return (EReference)fileNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)fileNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -569,7 +577,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getImportNode_Namespace() {
-		return (EReference)importNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)importNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -578,7 +586,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getImportNode_Type() {
-		return (EReference)importNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)importNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -623,7 +631,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getDefinitionNode_Name() {
-		return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -641,7 +649,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getDefinitionNode_Sequence() {
-		return (EReference)definitionNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)definitionNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -677,7 +685,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getDefinitionAroundNode_Pointcut() {
-		return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(3);
+		return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -695,7 +703,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getDefinitionAroundNode_Sequence() {
-		return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)definitionAroundNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -713,7 +721,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getSequenceNode_TextSequences() {
-		return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -722,7 +730,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getSequenceNode_Statements() {
-		return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)sequenceNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -794,7 +802,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExpandStatementNode_ParamList() {
-		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(3);
+		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -803,7 +811,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExpandStatementNode_ForEachExpression() {
-		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(4);
+		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -812,7 +820,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExpandStatementNode_ForExpression() {
-		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -821,7 +829,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExpandStatementNode_Name() {
-		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)expandStatementNodeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -893,7 +901,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getForeachStatementNode_Iterator() {
-		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -902,7 +910,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getForeachStatementNode_Identifier() {
-		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4);
+		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -911,7 +919,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getForeachStatementNode_Sequence() {
-		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -929,7 +937,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getForeachStatementNode_SeparatorExpression() {
-		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)foreachStatementNodeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -947,7 +955,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getIfStatementNode_ElseIfs() {
-		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -956,7 +964,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getIfStatementNode_Expression() {
-		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(3);
+		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -965,7 +973,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getIfStatementNode_Else() {
-		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -974,7 +982,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getIfStatementNode_Sequence() {
-		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)ifStatementNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -992,7 +1000,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getElseIfStatementNode_Sequence() {
-		return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1001,7 +1009,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getElseIfStatementNode_Expression() {
-		return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)elseIfStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1037,7 +1045,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getLetStatementNode_Expression() {
-		return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1046,7 +1054,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getLetStatementNode_Name() {
-		return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)letStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1073,7 +1081,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getProtectStatementNode_Sequence() {
-		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1082,7 +1090,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getProtectStatementNode_Cend() {
-		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1091,7 +1099,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getProtectStatementNode_Id() {
-		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3);
+		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1100,7 +1108,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getProtectStatementNode_Cstart() {
-		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)protectStatementNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1118,7 +1126,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_Type() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1127,7 +1135,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_Error() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1136,7 +1144,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_Message() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(5);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1145,7 +1153,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_IfExpression() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(4);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1154,7 +1162,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_Warning() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -1163,7 +1171,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getCheckNode_Constraint() {
-		return (EReference)checkNodeEClass.getEStructuralFeatures().get(3);
+		return (EReference)checkNodeEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -1198,8 +1206,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_ParamList() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2);
+	public EReference getExtensionNode_ExtendBody() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1207,8 +1215,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_Private() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6);
+	public EReference getExtensionNode_ReturnType() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1216,8 +1224,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_ReturnType() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5);
+	public EReference getExtensionNode_CreatedName() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1225,8 +1233,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_JavaReturnType() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7);
+	public EReference getExtensionNode_Private() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1234,8 +1242,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_Create() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(3);
+	public EReference getExtensionNode_JavaCall() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -1244,7 +1252,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExtensionNode_Name() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(4);
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -1252,8 +1260,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_JavaName() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getExtensionNode_Create() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
@@ -1262,6 +1270,15 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getExtensionNode_Cached() {
+		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExtensionNode_ParamList() {
 		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(8);
 	}
 
@@ -1270,8 +1287,26 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExtensionNode_ExtendBody() {
-		return (EReference)extensionNodeEClass.getEStructuralFeatures().get(0);
+	public EClass getJavaCallNode() {
+		return javaCallNodeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getJavaCallNode_JavaReturnType() {
+		return (EReference)javaCallNodeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getJavaCallNode_JavaName() {
+		return (EReference)javaCallNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1315,8 +1350,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getCastedExpressionNode_Target() {
-		return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getCastedExpressionNode_Type() {
+		return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1324,8 +1359,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getCastedExpressionNode_Type() {
-		return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(0);
+	public EReference getCastedExpressionNode_Target() {
+		return (EReference)castedExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1343,7 +1378,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getChainExpressionNode_Nexts() {
-		return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1352,7 +1387,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getChainExpressionNode_First() {
-		return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)chainExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1369,8 +1404,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getIfExpressionNode_Then() {
-		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(2);
+	public EReference getIfExpressionNode_Condition0() {
+		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1387,8 +1422,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getIfExpressionNode_Condition0() {
-		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(3);
+	public EReference getIfExpressionNode_Then() {
+		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1397,7 +1432,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getIfExpressionNode_Condition1() {
-		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)ifExpressionNodeEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -1414,8 +1449,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getSwitchExpressionNode_Default() {
-		return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(2);
+	public EReference getSwitchExpressionNode_Expression() {
+		return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1423,7 +1458,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getSwitchExpressionNode_Expression() {
+	public EReference getSwitchExpressionNode_Cases() {
 		return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -1432,8 +1467,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getSwitchExpressionNode_Cases() {
-		return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(0);
+	public EReference getSwitchExpressionNode_Default() {
+		return (EReference)switchExpressionNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1477,7 +1512,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getOrExpressionNode_Nexts() {
+	public EReference getOrExpressionNode_First() {
 		return (EReference)orExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -1486,7 +1521,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getOrExpressionNode_First() {
+	public EReference getOrExpressionNode_Nexts() {
 		return (EReference)orExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -1505,7 +1540,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getAndExpressionNode_First() {
-		return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1514,7 +1549,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getAndExpressionNode_Nexts() {
-		return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)andExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1532,7 +1567,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getImpliesExpressionNode_Nexts() {
-		return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1541,7 +1576,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getImpliesExpressionNode_First() {
-		return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)impliesExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1612,8 +1647,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMultiplicativeExpressionNode_Nexts() {
-		return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getMultiplicativeExpressionNode_First() {
+		return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1621,8 +1656,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getMultiplicativeExpressionNode_First() {
-		return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(0);
+	public EReference getMultiplicativeExpressionNode_Nexts() {
+		return (EReference)multiplicativeExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1657,8 +1692,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInfixExpressionNode_Calls() {
-		return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getInfixExpressionNode_Target() {
+		return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1666,8 +1701,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getInfixExpressionNode_Target() {
-		return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(0);
+	public EReference getInfixExpressionNode_Calls() {
+		return (EReference)infixExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1721,7 +1756,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getFeatureCallNode_ParamList() {
-		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1);
+		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -1730,7 +1765,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getFeatureCallNode_Name() {
-		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2);
+		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1739,7 +1774,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * @generated
 	 */
 	public EReference getFeatureCallNode_Type() {
-		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(0);
+		return (EReference)featureCallNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1819,8 +1854,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getCollectionExpressionNode_Expression() {
-		return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(2);
+	public EReference getCollectionExpressionNode_Type() {
+		return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1828,8 +1863,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getCollectionExpressionNode_Type() {
-		return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(1);
+	public EReference getCollectionExpressionNode_Expression() {
+		return (EReference)collectionExpressionNodeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -1864,7 +1899,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getDeclaredParameterNode_Ptype() {
+	public EReference getDeclaredParameterNode_Name() {
 		return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -1873,7 +1908,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getDeclaredParameterNode_Name() {
+	public EReference getDeclaredParameterNode_Ptype() {
 		return (EReference)declaredParameterNodeEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -1978,32 +2013,32 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		// Create classes and their features
 		fileNodeEClass = createEClass(FILE_NODE);
-		createEReference(fileNodeEClass, FILE_NODE__IMPORTS);
 		createEReference(fileNodeEClass, FILE_NODE__DECLARATIONS);
+		createEReference(fileNodeEClass, FILE_NODE__IMPORTS);
 
 		importNodeEClass = createEClass(IMPORT_NODE);
-		createEReference(importNodeEClass, IMPORT_NODE__TYPE);
 		createEReference(importNodeEClass, IMPORT_NODE__NAMESPACE);
+		createEReference(importNodeEClass, IMPORT_NODE__TYPE);
 
 		extensionImportNodeEClass = createEClass(EXTENSION_IMPORT_NODE);
 		createEReference(extensionImportNodeEClass, EXTENSION_IMPORT_NODE__TYPE);
 		createEReference(extensionImportNodeEClass, EXTENSION_IMPORT_NODE__NAMESPACE);
 
 		definitionNodeEClass = createEClass(DEFINITION_NODE);
-		createEReference(definitionNodeEClass, DEFINITION_NODE__SEQUENCE);
-		createEReference(definitionNodeEClass, DEFINITION_NODE__TYPE);
 		createEReference(definitionNodeEClass, DEFINITION_NODE__NAME);
+		createEReference(definitionNodeEClass, DEFINITION_NODE__TYPE);
+		createEReference(definitionNodeEClass, DEFINITION_NODE__SEQUENCE);
 		createEReference(definitionNodeEClass, DEFINITION_NODE__PARAM_LIST);
 
 		definitionAroundNodeEClass = createEClass(DEFINITION_AROUND_NODE);
 		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__TYPE);
-		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__SEQUENCE);
-		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__PARAM_LIST);
 		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__POINTCUT);
+		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__PARAM_LIST);
+		createEReference(definitionAroundNodeEClass, DEFINITION_AROUND_NODE__SEQUENCE);
 
 		sequenceNodeEClass = createEClass(SEQUENCE_NODE);
-		createEReference(sequenceNodeEClass, SEQUENCE_NODE__STATEMENTS);
 		createEReference(sequenceNodeEClass, SEQUENCE_NODE__TEXT_SEQUENCES);
+		createEReference(sequenceNodeEClass, SEQUENCE_NODE__STATEMENTS);
 
 		textSequenceNodeEClass = createEClass(TEXT_SEQUENCE_NODE);
 		createEReference(textSequenceNodeEClass, TEXT_SEQUENCE_NODE__TEXTS);
@@ -2015,10 +2050,10 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		expandStatementNodeEClass = createEClass(EXPAND_STATEMENT_NODE);
 		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__SEPARATOR);
-		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__NAME);
-		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EXPRESSION);
 		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__PARAM_LIST);
 		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EACH_EXPRESSION);
+		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__FOR_EXPRESSION);
+		createEReference(expandStatementNodeEClass, EXPAND_STATEMENT_NODE__NAME);
 
 		expressionStmtNodeEClass = createEClass(EXPRESSION_STMT_NODE);
 		createEReference(expressionStmtNodeEClass, EXPRESSION_STMT_NODE__EXPRESSION);
@@ -2029,43 +2064,43 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		createEReference(fileStatementNodeEClass, FILE_STATEMENT_NODE__NAME_EXPRESSION);
 
 		foreachStatementNodeEClass = createEClass(FOREACH_STATEMENT_NODE);
-		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION);
-		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEQUENCE);
 		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__ITERATOR);
-		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__FOR_EXPRESSION);
 		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__IDENTIFIER);
+		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEQUENCE);
+		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__FOR_EXPRESSION);
+		createEReference(foreachStatementNodeEClass, FOREACH_STATEMENT_NODE__SEPARATOR_EXPRESSION);
 
 		ifStatementNodeEClass = createEClass(IF_STATEMENT_NODE);
-		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE);
-		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__SEQUENCE);
 		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE_IFS);
 		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__EXPRESSION);
+		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__ELSE);
+		createEReference(ifStatementNodeEClass, IF_STATEMENT_NODE__SEQUENCE);
 
 		elseIfStatementNodeEClass = createEClass(ELSE_IF_STATEMENT_NODE);
-		createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__EXPRESSION);
 		createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__SEQUENCE);
+		createEReference(elseIfStatementNodeEClass, ELSE_IF_STATEMENT_NODE__EXPRESSION);
 
 		elseStatementNodeEClass = createEClass(ELSE_STATEMENT_NODE);
 		createEReference(elseStatementNodeEClass, ELSE_STATEMENT_NODE__SEQUENCE);
 
 		letStatementNodeEClass = createEClass(LET_STATEMENT_NODE);
-		createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__NAME);
 		createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__EXPRESSION);
+		createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__NAME);
 		createEReference(letStatementNodeEClass, LET_STATEMENT_NODE__SEQUENCE);
 
 		protectStatementNodeEClass = createEClass(PROTECT_STATEMENT_NODE);
-		createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CSTART);
 		createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__SEQUENCE);
 		createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CEND);
 		createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__ID);
+		createEReference(protectStatementNodeEClass, PROTECT_STATEMENT_NODE__CSTART);
 
 		checkNodeEClass = createEClass(CHECK_NODE);
+		createEReference(checkNodeEClass, CHECK_NODE__TYPE);
 		createEReference(checkNodeEClass, CHECK_NODE__ERROR);
+		createEReference(checkNodeEClass, CHECK_NODE__MESSAGE);
+		createEReference(checkNodeEClass, CHECK_NODE__IF_EXPRESSION);
 		createEReference(checkNodeEClass, CHECK_NODE__WARNING);
-		createEReference(checkNodeEClass, CHECK_NODE__TYPE);
 		createEReference(checkNodeEClass, CHECK_NODE__CONSTRAINT);
-		createEReference(checkNodeEClass, CHECK_NODE__IF_EXPRESSION);
-		createEReference(checkNodeEClass, CHECK_NODE__MESSAGE);
 
 		aroundNodeEClass = createEClass(AROUND_NODE);
 
@@ -2073,14 +2108,18 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		extensionNodeEClass = createEClass(EXTENSION_NODE);
 		createEReference(extensionNodeEClass, EXTENSION_NODE__EXTEND_BODY);
-		createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_NAME);
-		createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST);
-		createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE);
-		createEReference(extensionNodeEClass, EXTENSION_NODE__NAME);
 		createEReference(extensionNodeEClass, EXTENSION_NODE__RETURN_TYPE);
+		createEReference(extensionNodeEClass, EXTENSION_NODE__CREATED_NAME);
 		createEReference(extensionNodeEClass, EXTENSION_NODE__PRIVATE);
-		createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_RETURN_TYPE);
+		createEReference(extensionNodeEClass, EXTENSION_NODE__JAVA_CALL);
+		createEReference(extensionNodeEClass, EXTENSION_NODE__NAME);
+		createEReference(extensionNodeEClass, EXTENSION_NODE__CREATE);
 		createEReference(extensionNodeEClass, EXTENSION_NODE__CACHED);
+		createEReference(extensionNodeEClass, EXTENSION_NODE__PARAM_LIST);
+
+		javaCallNodeEClass = createEClass(JAVA_CALL_NODE);
+		createEReference(javaCallNodeEClass, JAVA_CALL_NODE__JAVA_RETURN_TYPE);
+		createEReference(javaCallNodeEClass, JAVA_CALL_NODE__JAVA_NAME);
 
 		javaTypeNodeEClass = createEClass(JAVA_TYPE_NODE);
 
@@ -2093,18 +2132,18 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		createEReference(castedExpressionNodeEClass, CASTED_EXPRESSION_NODE__TARGET);
 
 		chainExpressionNodeEClass = createEClass(CHAIN_EXPRESSION_NODE);
-		createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__FIRST);
 		createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__NEXTS);
+		createEReference(chainExpressionNodeEClass, CHAIN_EXPRESSION_NODE__FIRST);
 
 		ifExpressionNodeEClass = createEClass(IF_EXPRESSION_NODE);
-		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION1);
+		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION0);
 		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__ELSE);
 		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__THEN);
-		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION0);
+		createEReference(ifExpressionNodeEClass, IF_EXPRESSION_NODE__CONDITION1);
 
 		switchExpressionNodeEClass = createEClass(SWITCH_EXPRESSION_NODE);
-		createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__CASES);
 		createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__EXPRESSION);
+		createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__CASES);
 		createEReference(switchExpressionNodeEClass, SWITCH_EXPRESSION_NODE__DEFAULT);
 
 		casePartNodeEClass = createEClass(CASE_PART_NODE);
@@ -2112,16 +2151,16 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		createEReference(casePartNodeEClass, CASE_PART_NODE__EXPRESSION);
 
 		orExpressionNodeEClass = createEClass(OR_EXPRESSION_NODE);
-		createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__NEXTS);
 		createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__FIRST);
+		createEReference(orExpressionNodeEClass, OR_EXPRESSION_NODE__NEXTS);
 
 		andExpressionNodeEClass = createEClass(AND_EXPRESSION_NODE);
-		createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__NEXTS);
 		createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__FIRST);
+		createEReference(andExpressionNodeEClass, AND_EXPRESSION_NODE__NEXTS);
 
 		impliesExpressionNodeEClass = createEClass(IMPLIES_EXPRESSION_NODE);
-		createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__FIRST);
 		createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__NEXTS);
+		createEReference(impliesExpressionNodeEClass, IMPLIES_EXPRESSION_NODE__FIRST);
 
 		relationalExpressionNodeEClass = createEClass(RELATIONAL_EXPRESSION_NODE);
 		createEReference(relationalExpressionNodeEClass, RELATIONAL_EXPRESSION_NODE__NEXTS);
@@ -2150,9 +2189,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		globalVarExpressionNodeEClass = createEClass(GLOBAL_VAR_EXPRESSION_NODE);
 
 		featureCallNodeEClass = createEClass(FEATURE_CALL_NODE);
-		createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__TYPE);
 		createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__PARAM_LIST);
 		createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__NAME);
+		createEReference(featureCallNodeEClass, FEATURE_CALL_NODE__TYPE);
 
 		listLiteralNodeEClass = createEClass(LIST_LITERAL_NODE);
 		createEReference(listLiteralNodeEClass, LIST_LITERAL_NODE__ELEMENTS);
@@ -2174,8 +2213,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		createEReference(declaredParameterListNodeEClass, DECLARED_PARAMETER_LIST_NODE__PARAMS);
 
 		declaredParameterNodeEClass = createEClass(DECLARED_PARAMETER_NODE);
-		createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__PTYPE);
 		createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__NAME);
+		createEReference(declaredParameterNodeEClass, DECLARED_PARAMETER_NODE__PTYPE);
 
 		parameterListNodeEClass = createEClass(PARAMETER_LIST_NODE);
 		createEReference(parameterListNodeEClass, PARAMETER_LIST_NODE__PARAMS);
@@ -2243,6 +2282,7 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		aroundNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
 		pointcutNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
 		extensionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
+		javaCallNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
 		javaTypeNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
 		test_expressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
 		letExpressionNodeEClass.getESuperTypes().add(theNodePackage.getCompositeNode());
@@ -2278,32 +2318,32 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(fileNodeEClass, FileNode.class, "FileNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFileNode_Imports(), theNodePackage.getCompositeNode(), null, "imports", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getFileNode_Declarations(), theNodePackage.getCompositeNode(), null, "declarations", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFileNode_Imports(), theNodePackage.getCompositeNode(), null, "imports", null, 0, -1, FileNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(importNodeEClass, ImportNode.class, "ImportNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImportNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getImportNode_Namespace(), theNodePackage.getCompositeNode(), null, "namespace", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getImportNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, ImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(extensionImportNodeEClass, ExtensionImportNode.class, "ExtensionImportNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getExtensionImportNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, ExtensionImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExtensionImportNode_Namespace(), theNodePackage.getCompositeNode(), null, "namespace", null, 0, 1, ExtensionImportNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(definitionNodeEClass, DefinitionNode.class, "DefinitionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefinitionNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefinitionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDefinitionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitionNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitionNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDefinitionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(definitionAroundNodeEClass, DefinitionAroundNode.class, "DefinitionAroundNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getDefinitionAroundNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefinitionAroundNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefinitionAroundNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDefinitionAroundNode_Pointcut(), theNodePackage.getCompositeNode(), null, "pointcut", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitionAroundNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitionAroundNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, DefinitionAroundNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(sequenceNodeEClass, SequenceNode.class, "SequenceNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSequenceNode_Statements(), theNodePackage.getCompositeNode(), null, "statements", null, 0, -1, SequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSequenceNode_TextSequences(), theNodePackage.getCompositeNode(), null, "textSequences", null, 0, -1, SequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSequenceNode_Statements(), theNodePackage.getCompositeNode(), null, "statements", null, 0, -1, SequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(textSequenceNodeEClass, TextSequenceNode.class, "TextSequenceNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getTextSequenceNode_Texts(), theNodePackage.getCompositeNode(), null, "texts", null, 0, -1, TextSequenceNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2315,10 +2355,10 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		initEClass(expandStatementNodeEClass, ExpandStatementNode.class, "ExpandStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getExpandStatementNode_Separator(), theNodePackage.getCompositeNode(), null, "separator", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExpandStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExpandStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExpandStatementNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExpandStatementNode_ForEachExpression(), theNodePackage.getCompositeNode(), null, "forEachExpression", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExpandStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(expressionStmtNodeEClass, ExpressionStmtNode.class, "ExpressionStmtNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getExpressionStmtNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ExpressionStmtNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2329,43 +2369,43 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		initEReference(getFileStatementNode_NameExpression(), theNodePackage.getCompositeNode(), null, "nameExpression", null, 0, 1, FileStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(foreachStatementNodeEClass, ForeachStatementNode.class, "ForeachStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getForeachStatementNode_SeparatorExpression(), theNodePackage.getCompositeNode(), null, "separatorExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getForeachStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getForeachStatementNode_Iterator(), theNodePackage.getCompositeNode(), null, "iterator", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getForeachStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getForeachStatementNode_Identifier(), theNodePackage.getCompositeNode(), null, "identifier", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForeachStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForeachStatementNode_ForExpression(), theNodePackage.getCompositeNode(), null, "forExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForeachStatementNode_SeparatorExpression(), theNodePackage.getCompositeNode(), null, "separatorExpression", null, 0, 1, ForeachStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(ifStatementNodeEClass, IfStatementNode.class, "IfStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIfStatementNode_Else(), theNodePackage.getCompositeNode(), null, "else", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIfStatementNode_ElseIfs(), theNodePackage.getCompositeNode(), null, "elseIfs", null, 0, -1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIfStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfStatementNode_Else(), theNodePackage.getCompositeNode(), null, "else", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, IfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(elseIfStatementNodeEClass, ElseIfStatementNode.class, "ElseIfStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getElseIfStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElseIfStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getElseIfStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, ElseIfStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(elseStatementNodeEClass, ElseStatementNode.class, "ElseStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getElseStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ElseStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(letStatementNodeEClass, LetStatementNode.class, "LetStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLetStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLetStatementNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLetStatementNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLetStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, LetStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(protectStatementNodeEClass, ProtectStatementNode.class, "ProtectStatementNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getProtectStatementNode_Cstart(), theNodePackage.getCompositeNode(), null, "cstart", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getProtectStatementNode_Sequence(), theNodePackage.getCompositeNode(), null, "sequence", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getProtectStatementNode_Cend(), theNodePackage.getCompositeNode(), null, "cend", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getProtectStatementNode_Id(), theNodePackage.getCompositeNode(), null, "id", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProtectStatementNode_Cstart(), theNodePackage.getCompositeNode(), null, "cstart", null, 0, 1, ProtectStatementNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(checkNodeEClass, CheckNode.class, "CheckNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCheckNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckNode_Error(), theNodePackage.getLeafNode(), null, "error", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCheckNode_Message(), theNodePackage.getCompositeNode(), null, "message", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCheckNode_IfExpression(), theNodePackage.getCompositeNode(), null, "ifExpression", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckNode_Warning(), theNodePackage.getLeafNode(), null, "warning", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCheckNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCheckNode_Constraint(), theNodePackage.getCompositeNode(), null, "constraint", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCheckNode_IfExpression(), theNodePackage.getCompositeNode(), null, "ifExpression", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCheckNode_Message(), theNodePackage.getCompositeNode(), null, "message", null, 0, 1, CheckNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(aroundNodeEClass, AroundNode.class, "AroundNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -2373,14 +2413,18 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 
 		initEClass(extensionNodeEClass, ExtensionNode.class, "ExtensionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getExtensionNode_ExtendBody(), theNodePackage.getCompositeNode(), null, "extendBody", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExtensionNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExtensionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExtensionNode_Create(), theNodePackage.getLeafNode(), null, "create", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExtensionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExtensionNode_ReturnType(), theNodePackage.getCompositeNode(), null, "returnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtensionNode_CreatedName(), theNodePackage.getCompositeNode(), null, "createdName", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExtensionNode_Private(), theNodePackage.getLeafNode(), null, "private", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExtensionNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtensionNode_JavaCall(), theNodePackage.getCompositeNode(), null, "javaCall", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtensionNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtensionNode_Create(), theNodePackage.getLeafNode(), null, "create", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getExtensionNode_Cached(), theNodePackage.getLeafNode(), null, "cached", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExtensionNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, ExtensionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(javaCallNodeEClass, JavaCallNode.class, "JavaCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getJavaCallNode_JavaReturnType(), theNodePackage.getCompositeNode(), null, "javaReturnType", null, 0, 1, JavaCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getJavaCallNode_JavaName(), theNodePackage.getCompositeNode(), null, "javaName", null, 0, 1, JavaCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(javaTypeNodeEClass, JavaTypeNode.class, "JavaTypeNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -2393,18 +2437,18 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		initEReference(getCastedExpressionNode_Target(), theNodePackage.getCompositeNode(), null, "target", null, 0, 1, CastedExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(chainExpressionNodeEClass, ChainExpressionNode.class, "ChainExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getChainExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ChainExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getChainExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, ChainExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getChainExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ChainExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(ifExpressionNodeEClass, IfExpressionNode.class, "IfExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getIfExpressionNode_Condition1(), theNodePackage.getCompositeNode(), null, "condition1", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfExpressionNode_Condition0(), theNodePackage.getCompositeNode(), null, "condition0", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIfExpressionNode_Else(), theNodePackage.getCompositeNode(), null, "else", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getIfExpressionNode_Then(), theNodePackage.getCompositeNode(), null, "then", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getIfExpressionNode_Condition0(), theNodePackage.getCompositeNode(), null, "condition0", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfExpressionNode_Condition1(), theNodePackage.getCompositeNode(), null, "condition1", null, 0, 1, IfExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(switchExpressionNodeEClass, SwitchExpressionNode.class, "SwitchExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getSwitchExpressionNode_Cases(), theNodePackage.getCompositeNode(), null, "cases", null, 0, -1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSwitchExpressionNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getSwitchExpressionNode_Cases(), theNodePackage.getCompositeNode(), null, "cases", null, 0, -1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getSwitchExpressionNode_Default(), theNodePackage.getCompositeNode(), null, "default", null, 0, 1, SwitchExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(casePartNodeEClass, CasePartNode.class, "CasePartNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2412,16 +2456,16 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		initEReference(getCasePartNode_Expression(), theNodePackage.getCompositeNode(), null, "expression", null, 0, 1, CasePartNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(orExpressionNodeEClass, OrExpressionNode.class, "OrExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOrExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, OrExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getOrExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, OrExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getOrExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, OrExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(andExpressionNodeEClass, AndExpressionNode.class, "AndExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAndExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, AndExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getAndExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, AndExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getAndExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, AndExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(impliesExpressionNodeEClass, ImpliesExpressionNode.class, "ImpliesExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getImpliesExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ImpliesExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getImpliesExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, ImpliesExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getImpliesExpressionNode_First(), theNodePackage.getCompositeNode(), null, "first", null, 0, 1, ImpliesExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(relationalExpressionNodeEClass, RelationalExpressionNode.class, "RelationalExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getRelationalExpressionNode_Nexts(), theNodePackage.getCompositeNode(), null, "nexts", null, 0, -1, RelationalExpressionNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2450,9 +2494,9 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		initEClass(globalVarExpressionNodeEClass, GlobalVarExpressionNode.class, "GlobalVarExpressionNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
 		initEClass(featureCallNodeEClass, FeatureCallNode.class, "FeatureCallNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeatureCallNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getFeatureCallNode_ParamList(), theNodePackage.getCompositeNode(), null, "paramList", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getFeatureCallNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFeatureCallNode_Type(), theNodePackage.getCompositeNode(), null, "type", null, 0, 1, FeatureCallNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(listLiteralNodeEClass, ListLiteralNode.class, "ListLiteralNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getListLiteralNode_Elements(), theNodePackage.getCompositeNode(), null, "elements", null, 0, -1, ListLiteralNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2474,8 +2518,8 @@ public class Xpand3nodePackageImpl extends EPackageImpl implements Xpand3nodePac
 		initEReference(getDeclaredParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, DeclaredParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(declaredParameterNodeEClass, DeclaredParameterNode.class, "DeclaredParameterNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDeclaredParameterNode_Ptype(), theNodePackage.getCompositeNode(), null, "ptype", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDeclaredParameterNode_Name(), theNodePackage.getCompositeNode(), null, "name", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDeclaredParameterNode_Ptype(), theNodePackage.getCompositeNode(), null, "ptype", null, 0, 1, DeclaredParameterNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(parameterListNodeEClass, ParameterListNode.class, "ParameterListNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getParameterListNode_Params(), theNodePackage.getCompositeNode(), null, "params", null, 0, -1, ParameterListNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
index e1bf8478..d85c72dd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/util/Xpand3nodeAdapterFactory.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodeAdapterFactory.java,v 1.6 2008/03/13 08:40:02 jkohnlein Exp $
+ * $Id: Xpand3nodeAdapterFactory.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.util;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
@@ -16,14 +16,14 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.Node;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.*;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.*;
 
 /**
  * <!-- 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.xpand3.internal.parser.xpand3node.Xpand3nodePackage
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage
  * @generated
  */
 public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
@@ -163,6 +163,10 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 				return createExtensionNodeAdapter();
 			}
 			@Override
+			public Adapter caseJavaCallNode(JavaCallNode object) {
+				return createJavaCallNodeAdapter();
+			}
+			@Override
 			public Adapter caseJavaTypeNode(JavaTypeNode object) {
 				return createJavaTypeNodeAdapter();
 			}
@@ -319,13 +323,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode <em>File Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode <em>File 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.xpand3.internal.parser.xpand3node.FileNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode
 	 * @generated
 	 */
 	public Adapter createFileNodeAdapter() {
@@ -333,13 +337,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode <em>Import Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode <em>Import 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.xpand3.internal.parser.xpand3node.ImportNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode
 	 * @generated
 	 */
 	public Adapter createImportNodeAdapter() {
@@ -347,13 +351,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode <em>Extension Import Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode <em>Extension Import 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.xpand3.internal.parser.xpand3node.ExtensionImportNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode
 	 * @generated
 	 */
 	public Adapter createExtensionImportNodeAdapter() {
@@ -361,13 +365,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode <em>Definition Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode <em>Definition 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.xpand3.internal.parser.xpand3node.DefinitionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode
 	 * @generated
 	 */
 	public Adapter createDefinitionNodeAdapter() {
@@ -375,13 +379,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode <em>Definition Around Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode <em>Definition Around 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.xpand3.internal.parser.xpand3node.DefinitionAroundNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode
 	 * @generated
 	 */
 	public Adapter createDefinitionAroundNodeAdapter() {
@@ -389,13 +393,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode <em>Sequence Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode <em>Sequence 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.xpand3.internal.parser.xpand3node.SequenceNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode
 	 * @generated
 	 */
 	public Adapter createSequenceNodeAdapter() {
@@ -403,13 +407,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode <em>Text Sequence Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode <em>Text Sequence 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.xpand3.internal.parser.xpand3node.TextSequenceNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode
 	 * @generated
 	 */
 	public Adapter createTextSequenceNodeAdapter() {
@@ -417,13 +421,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.TextNode <em>Text Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode <em>Text 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.xpand3.internal.parser.xpand3node.TextNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode
 	 * @generated
 	 */
 	public Adapter createTextNodeAdapter() {
@@ -431,13 +435,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode <em>Error Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode <em>Error Statement 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.xpand3.internal.parser.xpand3node.ErrorStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode
 	 * @generated
 	 */
 	public Adapter createErrorStatementNodeAdapter() {
@@ -445,13 +449,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode <em>Expand Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode <em>Expand Statement 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.xpand3.internal.parser.xpand3node.ExpandStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode
 	 * @generated
 	 */
 	public Adapter createExpandStatementNodeAdapter() {
@@ -459,13 +463,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode <em>Expression Stmt Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode <em>Expression Stmt 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.xpand3.internal.parser.xpand3node.ExpressionStmtNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode
 	 * @generated
 	 */
 	public Adapter createExpressionStmtNodeAdapter() {
@@ -473,13 +477,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode <em>File Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode <em>File Statement 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.xpand3.internal.parser.xpand3node.FileStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode
 	 * @generated
 	 */
 	public Adapter createFileStatementNodeAdapter() {
@@ -487,13 +491,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode <em>Foreach Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode <em>Foreach Statement 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.xpand3.internal.parser.xpand3node.ForeachStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode
 	 * @generated
 	 */
 	public Adapter createForeachStatementNodeAdapter() {
@@ -501,13 +505,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode <em>If Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode <em>If Statement 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.xpand3.internal.parser.xpand3node.IfStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode
 	 * @generated
 	 */
 	public Adapter createIfStatementNodeAdapter() {
@@ -515,13 +519,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode <em>Else If Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode <em>Else If Statement 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.xpand3.internal.parser.xpand3node.ElseIfStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode
 	 * @generated
 	 */
 	public Adapter createElseIfStatementNodeAdapter() {
@@ -529,13 +533,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode <em>Else Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode <em>Else Statement 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.xpand3.internal.parser.xpand3node.ElseStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode
 	 * @generated
 	 */
 	public Adapter createElseStatementNodeAdapter() {
@@ -543,13 +547,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode <em>Let Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode <em>Let Statement 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.xpand3.internal.parser.xpand3node.LetStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode
 	 * @generated
 	 */
 	public Adapter createLetStatementNodeAdapter() {
@@ -557,13 +561,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode <em>Protect Statement Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode <em>Protect Statement 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.xpand3.internal.parser.xpand3node.ProtectStatementNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode
 	 * @generated
 	 */
 	public Adapter createProtectStatementNodeAdapter() {
@@ -571,13 +575,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode <em>Check Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode <em>Check 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.xpand3.internal.parser.xpand3node.CheckNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode
 	 * @generated
 	 */
 	public Adapter createCheckNodeAdapter() {
@@ -585,13 +589,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AroundNode <em>Around Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode <em>Around 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.xpand3.internal.parser.xpand3node.AroundNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode
 	 * @generated
 	 */
 	public Adapter createAroundNodeAdapter() {
@@ -599,13 +603,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode <em>Pointcut Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode <em>Pointcut 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.xpand3.internal.parser.xpand3node.PointcutNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode
 	 * @generated
 	 */
 	public Adapter createPointcutNodeAdapter() {
@@ -613,13 +617,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode <em>Extension Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode <em>Extension 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.xpand3.internal.parser.xpand3node.ExtensionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode
 	 * @generated
 	 */
 	public Adapter createExtensionNodeAdapter() {
@@ -627,13 +631,27 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode <em>Java Type Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode <em>Java Call 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.xpand3.internal.frontend.parser.xpand3node.JavaCallNode
+	 * @generated
+	 */
+	public Adapter createJavaCallNodeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode <em>Java Type 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.xpand3.internal.parser.xpand3node.JavaTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode
 	 * @generated
 	 */
 	public Adapter createJavaTypeNodeAdapter() {
@@ -641,13 +659,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode <em>Test expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode <em>Test expression 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.xpand3.internal.parser.xpand3node.Test_expressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode
 	 * @generated
 	 */
 	public Adapter createTest_expressionNodeAdapter() {
@@ -655,13 +673,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode <em>Let Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode <em>Let Expression 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.xpand3.internal.parser.xpand3node.LetExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode
 	 * @generated
 	 */
 	public Adapter createLetExpressionNodeAdapter() {
@@ -669,13 +687,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode <em>Casted Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode <em>Casted Expression 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.xpand3.internal.parser.xpand3node.CastedExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode
 	 * @generated
 	 */
 	public Adapter createCastedExpressionNodeAdapter() {
@@ -683,13 +701,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode <em>Chain Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode <em>Chain Expression 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.xpand3.internal.parser.xpand3node.ChainExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode
 	 * @generated
 	 */
 	public Adapter createChainExpressionNodeAdapter() {
@@ -697,13 +715,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode <em>If Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode <em>If Expression 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.xpand3.internal.parser.xpand3node.IfExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode
 	 * @generated
 	 */
 	public Adapter createIfExpressionNodeAdapter() {
@@ -711,13 +729,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode <em>Switch Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode <em>Switch Expression 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.xpand3.internal.parser.xpand3node.SwitchExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode
 	 * @generated
 	 */
 	public Adapter createSwitchExpressionNodeAdapter() {
@@ -725,13 +743,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode <em>Case Part Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode <em>Case Part 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.xpand3.internal.parser.xpand3node.CasePartNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode
 	 * @generated
 	 */
 	public Adapter createCasePartNodeAdapter() {
@@ -739,13 +757,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode <em>Or Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode <em>Or Expression 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.xpand3.internal.parser.xpand3node.OrExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode
 	 * @generated
 	 */
 	public Adapter createOrExpressionNodeAdapter() {
@@ -753,13 +771,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode <em>And Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode <em>And Expression 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.xpand3.internal.parser.xpand3node.AndExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode
 	 * @generated
 	 */
 	public Adapter createAndExpressionNodeAdapter() {
@@ -767,13 +785,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode <em>Implies Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode <em>Implies Expression 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.xpand3.internal.parser.xpand3node.ImpliesExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode
 	 * @generated
 	 */
 	public Adapter createImpliesExpressionNodeAdapter() {
@@ -781,13 +799,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode <em>Relational Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode <em>Relational Expression 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.xpand3.internal.parser.xpand3node.RelationalExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode
 	 * @generated
 	 */
 	public Adapter createRelationalExpressionNodeAdapter() {
@@ -795,13 +813,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode <em>Additive Expression 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.xpand3.internal.parser.xpand3node.AdditiveExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode
 	 * @generated
 	 */
 	public Adapter createAdditiveExpressionNodeAdapter() {
@@ -809,13 +827,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode <em>Multiplicative Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode <em>Multiplicative Expression 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.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode
 	 * @generated
 	 */
 	public Adapter createMultiplicativeExpressionNodeAdapter() {
@@ -823,13 +841,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode <em>Unary Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode <em>Unary Expression 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.xpand3.internal.parser.xpand3node.UnaryExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode
 	 * @generated
 	 */
 	public Adapter createUnaryExpressionNodeAdapter() {
@@ -837,13 +855,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode <em>Infix Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode <em>Infix Expression 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.xpand3.internal.parser.xpand3node.InfixExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode
 	 * @generated
 	 */
 	public Adapter createInfixExpressionNodeAdapter() {
@@ -851,13 +869,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode <em>String Literal Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode <em>String Literal 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.xpand3.internal.parser.xpand3node.StringLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode
 	 * @generated
 	 */
 	public Adapter createStringLiteralNodeAdapter() {
@@ -865,13 +883,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode <em>Paranthesized Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode <em>Paranthesized Expression 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.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode
 	 * @generated
 	 */
 	public Adapter createParanthesizedExpressionNodeAdapter() {
@@ -879,13 +897,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode <em>Global Var Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode <em>Global Var Expression 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.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode
 	 * @generated
 	 */
 	public Adapter createGlobalVarExpressionNodeAdapter() {
@@ -893,13 +911,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode <em>Feature Call Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode <em>Feature Call 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.xpand3.internal.parser.xpand3node.FeatureCallNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode
 	 * @generated
 	 */
 	public Adapter createFeatureCallNodeAdapter() {
@@ -907,13 +925,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode <em>List Literal Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode <em>List Literal 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.xpand3.internal.parser.xpand3node.ListLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode
 	 * @generated
 	 */
 	public Adapter createListLiteralNodeAdapter() {
@@ -921,13 +939,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode <em>Constructor Call Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode <em>Constructor Call 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.xpand3.internal.parser.xpand3node.ConstructorCallNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode
 	 * @generated
 	 */
 	public Adapter createConstructorCallNodeAdapter() {
@@ -935,13 +953,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode <em>Boolean Literal Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode <em>Boolean Literal 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.xpand3.internal.parser.xpand3node.BooleanLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode
 	 * @generated
 	 */
 	public Adapter createBooleanLiteralNodeAdapter() {
@@ -949,13 +967,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode <em>Null Literal Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode <em>Null Literal 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.xpand3.internal.parser.xpand3node.NullLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode
 	 * @generated
 	 */
 	public Adapter createNullLiteralNodeAdapter() {
@@ -963,13 +981,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode <em>Number Literal Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode <em>Number Literal 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.xpand3.internal.parser.xpand3node.NumberLiteralNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode
 	 * @generated
 	 */
 	public Adapter createNumberLiteralNodeAdapter() {
@@ -977,13 +995,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode <em>Collection Expression Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode <em>Collection Expression 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.xpand3.internal.parser.xpand3node.CollectionExpressionNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode
 	 * @generated
 	 */
 	public Adapter createCollectionExpressionNodeAdapter() {
@@ -991,13 +1009,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode <em>Declared Parameter List Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode <em>Declared Parameter List 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.xpand3.internal.parser.xpand3node.DeclaredParameterListNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode
 	 * @generated
 	 */
 	public Adapter createDeclaredParameterListNodeAdapter() {
@@ -1005,13 +1023,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode <em>Declared Parameter Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode <em>Declared Parameter 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.xpand3.internal.parser.xpand3node.DeclaredParameterNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode
 	 * @generated
 	 */
 	public Adapter createDeclaredParameterNodeAdapter() {
@@ -1019,13 +1037,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode <em>Parameter List Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode <em>Parameter List 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.xpand3.internal.parser.xpand3node.ParameterListNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode
 	 * @generated
 	 */
 	public Adapter createParameterListNodeAdapter() {
@@ -1033,13 +1051,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode <em>Collection Type Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode <em>Collection Type 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.xpand3.internal.parser.xpand3node.CollectionTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode
 	 * @generated
 	 */
 	public Adapter createCollectionTypeNodeAdapter() {
@@ -1047,13 +1065,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode <em>Simple Type Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode <em>Simple Type 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.xpand3.internal.parser.xpand3node.SimpleTypeNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode
 	 * @generated
 	 */
 	public Adapter createSimpleTypeNodeAdapter() {
@@ -1061,13 +1079,13 @@ public class Xpand3nodeAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode <em>Identifier Node</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode <em>Identifier 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.xpand3.internal.parser.xpand3node.IdentifierNode
+	 * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode
 	 * @generated
 	 */
 	public Adapter createIdentifierNodeAdapter() {
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/util/Xpand3nodeSwitch.java
index 25805951..68af2fd4 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/util/Xpand3nodeSwitch.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/util/Xpand3nodeSwitch.java
@@ -2,9 +2,9 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Xpand3nodeSwitch.java,v 1.6 2008/03/13 08:40:02 jkohnlein Exp $
+ * $Id: Xpand3nodeSwitch.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.util;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.util;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.Node;
 
-import org.eclipse.xpand3.internal.parser.xpand3node.*;
+import org.eclipse.xpand3.internal.frontend.parser.xpand3node.*;
 
 /**
  * <!-- begin-user-doc -->
@@ -26,7 +26,7 @@ import org.eclipse.xpand3.internal.parser.xpand3node.*;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.internal.parser.xpand3node.Xpand3nodePackage
+ * @see org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage
  * @generated
  */
 public class Xpand3nodeSwitch<T> {
@@ -266,6 +266,14 @@ public class Xpand3nodeSwitch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case Xpand3nodePackage.JAVA_CALL_NODE: {
+				JavaCallNode javaCallNode = (JavaCallNode)theEObject;
+				T result = caseJavaCallNode(javaCallNode);
+				if (result == null) result = caseCompositeNode(javaCallNode);
+				if (result == null) result = caseNode(javaCallNode);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case Xpand3nodePackage.JAVA_TYPE_NODE: {
 				JavaTypeNode javaTypeNode = (JavaTypeNode)theEObject;
 				T result = caseJavaTypeNode(javaTypeNode);
@@ -857,6 +865,21 @@ public class Xpand3nodeSwitch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Java Call 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>Java Call Node</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseJavaCallNode(JavaCallNode object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Java Type Node</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
index 39de4c4d..5808d301 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AdditiveExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AdditiveExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: AdditiveExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.AdditiveExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AdditiveExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AndExpressionNodeValidator.java
index e7fca90f..c65e77a2 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AndExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AndExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AndExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: AndExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.AndExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AndExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AroundNodeValidator.java
index de0a985c..883bf1c8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/AroundNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/AroundNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: AroundNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: AroundNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.AroundNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.AroundNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
index 1931d792..838272db 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/BooleanLiteralNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: BooleanLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: BooleanLiteralNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.BooleanLiteralNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.BooleanLiteralNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CasePartNodeValidator.java
index d30e19fc..bd0279b6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CasePartNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CasePartNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CasePartNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CasePartNodeValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.CasePartNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CasePartNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CastedExpressionNodeValidator.java
index 9d384a20..0aa8a1b3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CastedExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CastedExpressionNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CastedExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CastedExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.CastedExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CastedExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -17,6 +17,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface CastedExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateTarget(CompositeNode value);
 	boolean validateType(CompositeNode value);
+	boolean validateTarget(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ChainExpressionNodeValidator.java
index f90fd8dc..711751ea 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ChainExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ChainExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ChainExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: ChainExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ChainExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ChainExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CheckNodeValidator.java
index 5301b522..b57e40c6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CheckNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CheckNodeValidator.java
@@ -2,15 +2,15 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CheckNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: CheckNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.CheckNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CheckNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,15 +19,9 @@ public interface CheckNodeValidator {
 	boolean validate();
 
 	boolean validateType(CompositeNode value);
-
 	boolean validateError(LeafNode value);
 	boolean validateMessage(CompositeNode value);
-
 	boolean validateIfExpression(CompositeNode value);
-
 	boolean validateWarning(LeafNode value);
-
 	boolean validateConstraint(CompositeNode value);
-
-	boolean validateCheckExpression(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
index 0683c2b1..f24d7481 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CollectionExpressionNodeValidator.java
@@ -2,15 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CollectionExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
-
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,9 +18,6 @@ public interface CollectionExpressionNodeValidator {
 	boolean validate();
 
 	boolean validateVariable(CompositeNode value);
-
-	boolean validateExpression(CompositeNode value);
-
 	boolean validateType(CompositeNode value);
-
+	boolean validateExpression(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CollectionTypeNodeValidator.java
index 643e89c3..9ca43e76 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/CollectionTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/CollectionTypeNodeValidator.java
@@ -2,15 +2,15 @@
  * <copyright>
  * </copyright>
  *
- * $Id: CollectionTypeNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: CollectionTypeNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.CollectionTypeNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.CollectionTypeNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ConstructorCallNodeValidator.java
index c02d58a7..f42f765f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ConstructorCallNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ConstructorCallNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConstructorCallNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ConstructorCallNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ConstructorCallNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ConstructorCallNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
index c4e9a61f..e0494422 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DeclaredParameterListNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterListNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: DeclaredParameterListNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterListNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterListNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
index 795281e2..e1979fa1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DeclaredParameterNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DeclaredParameterNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: DeclaredParameterNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DeclaredParameterNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DeclaredParameterNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -17,6 +17,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface DeclaredParameterNodeValidator {
 	boolean validate();
 
-	boolean validatePtype(CompositeNode value);
 	boolean validateName(CompositeNode value);
+	boolean validatePtype(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
index 5229fb72..6f066d03 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DefinitionAroundNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionAroundNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: DefinitionAroundNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionAroundNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionAroundNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DefinitionNodeValidator.java
index 9c9f103d..b2b1c64b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/DefinitionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/DefinitionNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: DefinitionNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: DefinitionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.DefinitionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.DefinitionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
index 57fc9345..86672077 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ElseIfStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseIfStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ElseIfStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ElseIfStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseIfStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ElseStatementNodeValidator.java
index 0db55fd3..ca535ca8 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ElseStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ElseStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ElseStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: ElseStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ElseStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ElseStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ErrorStatementNodeValidator.java
index d4aebc25..e7015c9c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ErrorStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ErrorStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ErrorStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: ErrorStatementNodeValidator.java,v 1.1 2008/03/17 14:39:08 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ErrorStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ErrorStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExpandStatementNodeValidator.java
index 5286b943..3937b28f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpandStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExpandStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpandStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ExpandStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExpandStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpandStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
index 77ebbe94..e3af676d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExpressionStmtNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExpressionStmtNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ExpressionStmtNodeValidator.java,v 1.1 2008/03/17 14:39:08 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExpressionStmtNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExpressionStmtNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExtensionImportNodeValidator.java
index 8a6e2083..c07ebda5 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionImportNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExtensionImportNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionImportNodeValidator.java,v 1.2 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ExtensionImportNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionImportNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionImportNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExtensionNodeValidator.java
index 2aa8ad14..a506f87c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ExtensionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ExtensionNodeValidator.java
@@ -2,15 +2,15 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ExtensionNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: ExtensionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 import org.eclipse.tmf.common.node.LeafNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ExtensionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ExtensionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -18,13 +18,13 @@ import org.eclipse.tmf.common.node.LeafNode;
 public interface ExtensionNodeValidator {
 	boolean validate();
 
-	boolean validateParamList(CompositeNode value);
-	boolean validatePrivate(LeafNode value);
+	boolean validateExtendBody(CompositeNode value);
 	boolean validateReturnType(CompositeNode value);
-	boolean validateJavaReturnType(CompositeNode value);
-	boolean validateCreate(LeafNode value);
+	boolean validateCreatedName(CompositeNode value);
+	boolean validatePrivate(LeafNode value);
+	boolean validateJavaCall(CompositeNode value);
 	boolean validateName(CompositeNode value);
-	boolean validateJavaName(CompositeNode value);
+	boolean validateCreate(LeafNode value);
 	boolean validateCached(LeafNode value);
-	boolean validateExtendBody(CompositeNode value);
+	boolean validateParamList(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FeatureCallNodeValidator.java
index 2ab6c102..7a806131 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FeatureCallNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FeatureCallNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FeatureCallNodeValidator.java,v 1.5 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: FeatureCallNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.FeatureCallNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FeatureCallNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FileNodeValidator.java
index 2ea08178..77c9539d 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FileNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: FileNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.FileNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FileStatementNodeValidator.java
index 10e78bb3..69d81319 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/FileStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/FileStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: FileStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: FileStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.FileStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.FileStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ForeachStatementNodeValidator.java
index c772f716..d588dbf3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ForeachStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ForeachStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ForeachStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ForeachStatementNodeValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ForeachStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ForeachStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
index 4fb06723..139f5c87 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/GlobalVarExpressionNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: GlobalVarExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: GlobalVarExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.GlobalVarExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.GlobalVarExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IdentifierNodeValidator.java
index 809a27ec..e7c77ccd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IdentifierNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IdentifierNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdentifierNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: IdentifierNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.IdentifierNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IdentifierNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IfExpressionNodeValidator.java
index f2c65c6e..60e1fec6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IfExpressionNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: IfExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.IfExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -17,8 +17,8 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface IfExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateThen(CompositeNode value);
-	boolean validateElse(CompositeNode value);
 	boolean validateCondition0(CompositeNode value);
+	boolean validateElse(CompositeNode value);
+	boolean validateThen(CompositeNode value);
 	boolean validateCondition1(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IfStatementNodeValidator.java
index c1bed314..accd1045 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/IfStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/IfStatementNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IfStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: IfStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.IfStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.IfStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
index 3556b2ea..f2b43d32 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ImpliesExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImpliesExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ImpliesExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ImpliesExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImpliesExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ImportNodeValidator.java
index 093e3205..82868496 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ImportNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ImportNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ImportNodeValidator.java,v 1.2 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: ImportNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ImportNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ImportNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/InfixExpressionNodeValidator.java
index 3cf2fe4f..7723e81f 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/InfixExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/InfixExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: InfixExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: InfixExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.InfixExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.InfixExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,6 +19,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface InfixExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateCalls(EList<CompositeNode> value);
 	boolean validateTarget(CompositeNode value);
+	boolean validateCalls(EList<CompositeNode> value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/JavaCallNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/JavaCallNodeValidator.java
new file mode 100644
index 00000000..4457e71a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/JavaCallNodeValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: JavaCallNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
+
+import org.eclipse.tmf.common.node.CompositeNode;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaCallNode}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface JavaCallNodeValidator {
+	boolean validate();
+
+	boolean validateJavaReturnType(CompositeNode value);
+	boolean validateJavaName(CompositeNode value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/JavaTypeNodeValidator.java
index 2719a3c0..c8085d8b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/JavaTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/JavaTypeNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: JavaTypeNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: JavaTypeNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.JavaTypeNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.JavaTypeNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/LetExpressionNodeValidator.java
index 0a49e4d2..af57859c 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/LetExpressionNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: LetExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.LetExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/LetStatementNodeValidator.java
index e32c3432..e1bdc33e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/LetStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/LetStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: LetStatementNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: LetStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.LetStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.LetStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ListLiteralNodeValidator.java
index 70d12daf..bf605744 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ListLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ListLiteralNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ListLiteralNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ListLiteralNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ListLiteralNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ListLiteralNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
index 9345e604..4e9672c6 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/MultiplicativeExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: MultiplicativeExpressionNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: MultiplicativeExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.MultiplicativeExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.MultiplicativeExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,6 +19,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface MultiplicativeExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateNexts(EList<CompositeNode> value);
 	boolean validateFirst(CompositeNode value);
+	boolean validateNexts(EList<CompositeNode> value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/NullLiteralNodeValidator.java
index 5deff19d..2af2868b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NullLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/NullLiteralNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NullLiteralNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: NullLiteralNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.NullLiteralNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NullLiteralNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/NumberLiteralNodeValidator.java
index c867babf..62ac627b 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/NumberLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/NumberLiteralNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: NumberLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: NumberLiteralNodeValidator.java,v 1.1 2008/03/17 14:39:08 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.NumberLiteralNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.NumberLiteralNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/OrExpressionNodeValidator.java
index 6a3f3faa..9121516e 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/OrExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/OrExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: OrExpressionNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: OrExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.OrExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.OrExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,6 +19,6 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface OrExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateNexts(EList<CompositeNode> value);
 	boolean validateFirst(CompositeNode value);
+	boolean validateNexts(EList<CompositeNode> value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ParameterListNodeValidator.java
index 918e5f9c..ed8a8385 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParameterListNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ParameterListNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParameterListNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ParameterListNodeValidator.java,v 1.1 2008/03/17 14:39:08 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ParameterListNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParameterListNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
index c3de6924..2c7ae2cf 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ParanthesizedExpressionNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ParanthesizedExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ParanthesizedExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ParanthesizedExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ParanthesizedExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/PointcutNodeValidator.java
index 88a9397e..06123505 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/PointcutNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/PointcutNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: PointcutNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: PointcutNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.PointcutNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.PointcutNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ProtectStatementNodeValidator.java
index 8f797386..d3b92e22 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/ProtectStatementNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/ProtectStatementNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ProtectStatementNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: ProtectStatementNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.ProtectStatementNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.ProtectStatementNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
index 4ffab3bb..2dffa9c1 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/RelationalExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: RelationalExpressionNodeValidator.java,v 1.5 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: RelationalExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.RelationalExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.RelationalExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SequenceNodeValidator.java
index 448c527f..7b38d13a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SequenceNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SequenceNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SequenceNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: SequenceNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SequenceNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SequenceNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SimpleTypeNodeValidator.java
index ef7d468a..dee60c15 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SimpleTypeNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SimpleTypeNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SimpleTypeNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: SimpleTypeNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SimpleTypeNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SimpleTypeNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/StringLiteralNodeValidator.java
index df22ddc6..af0c8294 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/StringLiteralNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/StringLiteralNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: StringLiteralNodeValidator.java,v 1.3 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: StringLiteralNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.StringLiteralNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.StringLiteralNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
index a3857bb5..57938432 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/SwitchExpressionNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: SwitchExpressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: SwitchExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:08 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.SwitchExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.SwitchExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
@@ -19,7 +19,7 @@ import org.eclipse.tmf.common.node.CompositeNode;
 public interface SwitchExpressionNodeValidator {
 	boolean validate();
 
-	boolean validateDefault(CompositeNode value);
 	boolean validateExpression(CompositeNode value);
 	boolean validateCases(EList<CompositeNode> value);
+	boolean validateDefault(CompositeNode value);
 }
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/Test_expressionNodeValidator.java
index d52fa81f..328831c3 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/Test_expressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/Test_expressionNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: Test_expressionNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: Test_expressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.Test_expressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.Test_expressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/TextNodeValidator.java
index 6bf51af5..e3e13a57 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/TextNodeValidator.java
@@ -2,13 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextNodeValidator.java,v 1.3 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: TextNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.TextNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/TextSequenceNodeValidator.java
index a89807cd..c99cf08a 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/TextSequenceNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/TextSequenceNodeValidator.java
@@ -2,16 +2,16 @@
  * <copyright>
  * </copyright>
  *
- * $Id: TextSequenceNodeValidator.java,v 1.4 2008/03/13 08:40:00 jkohnlein Exp $
+ * $Id: TextSequenceNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.TextSequenceNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.TextSequenceNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
index 4ffc7d11..d6dc2bbd 100644
--- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/internal/frontend/parser/xpand3node/validation/UnaryExpressionNodeValidator.java
@@ -2,14 +2,14 @@
  * <copyright>
  * </copyright>
  *
- * $Id: UnaryExpressionNodeValidator.java,v 1.4 2008/03/13 08:39:59 jkohnlein Exp $
+ * $Id: UnaryExpressionNodeValidator.java,v 1.1 2008/03/17 14:39:09 jkohnlein Exp $
  */
-package org.eclipse.xpand3.internal.parser.xpand3node.validation;
+package org.eclipse.xpand3.internal.frontend.parser.xpand3node.validation;
 
 import org.eclipse.tmf.common.node.CompositeNode;
 
 /**
- * A sample validator interface for {@link org.eclipse.xpand3.internal.parser.xpand3node.UnaryExpressionNode}.
+ * A sample validator interface for {@link org.eclipse.xpand3.internal.frontend.parser.xpand3node.UnaryExpressionNode}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatement.java
new file mode 100644
index 00000000..a5cb15fb
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatement.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getAbstractStatement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractStatement extends SyntaxElement {
+} // AbstractStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatementWithBody.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatementWithBody.java
new file mode 100644
index 00000000..70180839
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/AbstractStatementWithBody.java
@@ -0,0 +1,44 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatementWithBody.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Abstract Statement With Body</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.AbstractStatementWithBody#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getAbstractStatementWithBody()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AbstractStatementWithBody extends AbstractStatement {
+	/**
+	 * Returns the value of the '<em><b>Body</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.statement.AbstractStatement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Body</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>Body</em>' containment reference list.
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getAbstractStatementWithBody_Body()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	EList<AbstractStatement> getBody();
+
+} // AbstractStatementWithBody
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ErrorStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ErrorStatement.java
new file mode 100644
index 00000000..7646cda1
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ErrorStatement.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ErrorStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Error Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.ErrorStatement#getMessage <em>Message</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getErrorStatement()
+ * @model
+ * @generated
+ */
+public interface ErrorStatement extends AbstractStatement {
+	/**
+	 * Returns the value of the '<em><b>Message</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Message</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>Message</em>' containment reference.
+	 * @see #setMessage(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getErrorStatement_Message()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	AbstractExpression getMessage();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ErrorStatement#getMessage <em>Message</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Message</em>' containment reference.
+	 * @see #getMessage()
+	 * @generated
+	 */
+	void setMessage(AbstractExpression value);
+
+} // ErrorStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpandStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpandStatement.java
new file mode 100644
index 00000000..a4bec510
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpandStatement.java
@@ -0,0 +1,156 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpandStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expand Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpandStatement#isForeach <em>Foreach</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpandStatement#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpandStatement#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpandStatement#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpandStatement#getDefinition <em>Definition</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement()
+ * @model
+ * @generated
+ */
+public interface ExpandStatement extends AbstractStatement {
+	/**
+	 * Returns the value of the '<em><b>Foreach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Foreach</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Foreach</em>' attribute.
+	 * @see #setForeach(boolean)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement_Foreach()
+	 * @model
+	 * @generated
+	 */
+	boolean isForeach();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ExpandStatement#isForeach <em>Foreach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Foreach</em>' attribute.
+	 * @see #isForeach()
+	 * @generated
+	 */
+	void setForeach(boolean value);
+
+	/**
+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.xpand3.expression.AbstractExpression}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Parameters</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>Parameters</em>' containment reference list.
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement_Parameters()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<AbstractExpression> getParameters();
+
+	/**
+	 * Returns the value of the '<em><b>Separator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Separator</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>Separator</em>' containment reference.
+	 * @see #setSeparator(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement_Separator()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getSeparator();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ExpandStatement#getSeparator <em>Separator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Separator</em>' containment reference.
+	 * @see #getSeparator()
+	 * @generated
+	 */
+	void setSeparator(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target</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>Target</em>' containment reference.
+	 * @see #setTarget(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement_Target()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getTarget();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ExpandStatement#getTarget <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' containment reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Definition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Definition</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>Definition</em>' containment reference.
+	 * @see #setDefinition(Identifier)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpandStatement_Definition()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	Identifier getDefinition();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ExpandStatement#getDefinition <em>Definition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Definition</em>' containment reference.
+	 * @see #getDefinition()
+	 * @generated
+	 */
+	void setDefinition(Identifier value);
+
+} // ExpandStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpressionStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpressionStatement.java
new file mode 100644
index 00000000..fb80fd3f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ExpressionStatement.java
@@ -0,0 +1,54 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expression Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.ExpressionStatement#getExpression <em>Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getExpressionStatement()
+ * @model
+ * @generated
+ */
+public interface ExpressionStatement extends AbstractStatement {
+	/**
+	 * Returns the value of the '<em><b>Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Expression</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>Expression</em>' containment reference.
+	 * @see #setExpression(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getExpressionStatement_Expression()
+	 * @model containment="true" required="true"
+	 * @generated
+	 */
+	AbstractExpression getExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ExpressionStatement#getExpression <em>Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Expression</em>' containment reference.
+	 * @see #getExpression()
+	 * @generated
+	 */
+	void setExpression(AbstractExpression value);
+
+} // ExpressionStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/FileStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/FileStatement.java
new file mode 100644
index 00000000..ccdee8ee
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/FileStatement.java
@@ -0,0 +1,110 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FileStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>File Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.FileStatement#getFileNameExpression <em>File Name Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.FileStatement#getOutletNameIdentifier <em>Outlet Name Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.FileStatement#isOnce <em>Once</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getFileStatement()
+ * @model
+ * @generated
+ */
+public interface FileStatement extends AbstractStatementWithBody {
+	/**
+	 * Returns the value of the '<em><b>File Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>File Name Expression</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>File Name Expression</em>' containment reference.
+	 * @see #setFileNameExpression(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getFileStatement_FileNameExpression()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getFileNameExpression();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.FileStatement#getFileNameExpression <em>File Name Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>File Name Expression</em>' containment reference.
+	 * @see #getFileNameExpression()
+	 * @generated
+	 */
+	void setFileNameExpression(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Outlet Name Identifier</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Outlet Name Identifier</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>Outlet Name Identifier</em>' containment reference.
+	 * @see #setOutletNameIdentifier(Identifier)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getFileStatement_OutletNameIdentifier()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getOutletNameIdentifier();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.FileStatement#getOutletNameIdentifier <em>Outlet Name Identifier</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Outlet Name Identifier</em>' containment reference.
+	 * @see #getOutletNameIdentifier()
+	 * @generated
+	 */
+	void setOutletNameIdentifier(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Once</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Once</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Once</em>' attribute.
+	 * @see #setOnce(boolean)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getFileStatement_Once()
+	 * @model
+	 * @generated
+	 */
+	boolean isOnce();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.FileStatement#isOnce <em>Once</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Once</em>' attribute.
+	 * @see #isOnce()
+	 * @generated
+	 */
+	void setOnce(boolean value);
+
+} // FileStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ForEachStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ForEachStatement.java
new file mode 100644
index 00000000..5cb82975
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ForEachStatement.java
@@ -0,0 +1,137 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ForEachStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>For Each Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.ForEachStatement#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ForEachStatement#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ForEachStatement#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ForEachStatement#getIteratorName <em>Iterator Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getForEachStatement()
+ * @model
+ * @generated
+ */
+public interface ForEachStatement extends AbstractStatementWithBody {
+	/**
+	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target</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>Target</em>' containment reference.
+	 * @see #setTarget(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getForEachStatement_Target()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getTarget();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ForEachStatement#getTarget <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target</em>' containment reference.
+	 * @see #getTarget()
+	 * @generated
+	 */
+	void setTarget(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Separator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Separator</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>Separator</em>' containment reference.
+	 * @see #setSeparator(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getForEachStatement_Separator()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getSeparator();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ForEachStatement#getSeparator <em>Separator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Separator</em>' containment reference.
+	 * @see #getSeparator()
+	 * @generated
+	 */
+	void setSeparator(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Variable</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Variable</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>Variable</em>' containment reference.
+	 * @see #setVariable(Identifier)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getForEachStatement_Variable()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getVariable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ForEachStatement#getVariable <em>Variable</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Variable</em>' containment reference.
+	 * @see #getVariable()
+	 * @generated
+	 */
+	void setVariable(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Iterator Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Iterator 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>Iterator Name</em>' containment reference.
+	 * @see #setIteratorName(Identifier)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getForEachStatement_IteratorName()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getIteratorName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ForEachStatement#getIteratorName <em>Iterator Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Iterator Name</em>' containment reference.
+	 * @see #getIteratorName()
+	 * @generated
+	 */
+	void setIteratorName(Identifier value);
+
+} // ForEachStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/IfStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/IfStatement.java
new file mode 100644
index 00000000..e7e820b4
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/IfStatement.java
@@ -0,0 +1,81 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>If Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.IfStatement#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.IfStatement#getElseIf <em>Else If</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getIfStatement()
+ * @model
+ * @generated
+ */
+public interface IfStatement extends AbstractStatementWithBody {
+	/**
+	 * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Condition</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>Condition</em>' containment reference.
+	 * @see #setCondition(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getIfStatement_Condition()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getCondition();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.IfStatement#getCondition <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Condition</em>' containment reference.
+	 * @see #getCondition()
+	 * @generated
+	 */
+	void setCondition(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Else If</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Else If</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>Else If</em>' containment reference.
+	 * @see #setElseIf(IfStatement)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getIfStatement_ElseIf()
+	 * @model containment="true"
+	 * @generated
+	 */
+	IfStatement getElseIf();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.IfStatement#getElseIf <em>Else If</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Else If</em>' containment reference.
+	 * @see #getElseIf()
+	 * @generated
+	 */
+	void setElseIf(IfStatement value);
+
+} // IfStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/LetStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/LetStatement.java
new file mode 100644
index 00000000..74dbee0a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/LetStatement.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Let Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.LetStatement#getVarName <em>Var Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.LetStatement#getVarValue <em>Var Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getLetStatement()
+ * @model
+ * @generated
+ */
+public interface LetStatement extends AbstractStatementWithBody {
+	/**
+	 * Returns the value of the '<em><b>Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Var 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>Var Name</em>' containment reference.
+	 * @see #setVarName(Identifier)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getLetStatement_VarName()
+	 * @model containment="true"
+	 * @generated
+	 */
+	Identifier getVarName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.LetStatement#getVarName <em>Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Var Name</em>' containment reference.
+	 * @see #getVarName()
+	 * @generated
+	 */
+	void setVarName(Identifier value);
+
+	/**
+	 * Returns the value of the '<em><b>Var Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Var Value</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>Var Value</em>' containment reference.
+	 * @see #setVarValue(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getLetStatement_VarValue()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getVarValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.LetStatement#getVarValue <em>Var Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Var Value</em>' containment reference.
+	 * @see #getVarValue()
+	 * @generated
+	 */
+	void setVarValue(AbstractExpression value);
+
+} // LetStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ProtectStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ProtectStatement.java
new file mode 100644
index 00000000..e984ee5f
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/ProtectStatement.java
@@ -0,0 +1,135 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ProtectStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Protect Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentStart <em>Comment Start</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentEnd <em>Comment End</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ProtectStatement#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.ProtectStatement#isDisable <em>Disable</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getProtectStatement()
+ * @model
+ * @generated
+ */
+public interface ProtectStatement extends AbstractStatementWithBody {
+	/**
+	 * Returns the value of the '<em><b>Comment Start</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Comment Start</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>Comment Start</em>' containment reference.
+	 * @see #setCommentStart(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getProtectStatement_CommentStart()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getCommentStart();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentStart <em>Comment Start</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Comment Start</em>' containment reference.
+	 * @see #getCommentStart()
+	 * @generated
+	 */
+	void setCommentStart(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Comment End</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Comment End</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>Comment End</em>' containment reference.
+	 * @see #setCommentEnd(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getProtectStatement_CommentEnd()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getCommentEnd();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentEnd <em>Comment End</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Comment End</em>' containment reference.
+	 * @see #getCommentEnd()
+	 * @generated
+	 */
+	void setCommentEnd(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Id</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Id</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>Id</em>' containment reference.
+	 * @see #setId(AbstractExpression)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getProtectStatement_Id()
+	 * @model containment="true"
+	 * @generated
+	 */
+	AbstractExpression getId();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ProtectStatement#getId <em>Id</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Id</em>' containment reference.
+	 * @see #getId()
+	 * @generated
+	 */
+	void setId(AbstractExpression value);
+
+	/**
+	 * Returns the value of the '<em><b>Disable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Disable</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Disable</em>' attribute.
+	 * @see #setDisable(boolean)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getProtectStatement_Disable()
+	 * @model
+	 * @generated
+	 */
+	boolean isDisable();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.ProtectStatement#isDisable <em>Disable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Disable</em>' attribute.
+	 * @see #isDisable()
+	 * @generated
+	 */
+	void setDisable(boolean value);
+
+} // ProtectStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementFactory.java
new file mode 100644
index 00000000..ed80d15a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementFactory.java
@@ -0,0 +1,118 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementFactory.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+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.xpand3.statement.StatementPackage
+ * @generated
+ */
+public interface StatementFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StatementFactory eINSTANCE = org.eclipse.xpand3.statement.impl.StatementFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Expand Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Expand Statement</em>'.
+	 * @generated
+	 */
+	ExpandStatement createExpandStatement();
+
+	/**
+	 * Returns a new object of class '<em>Expression Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Expression Statement</em>'.
+	 * @generated
+	 */
+	ExpressionStatement createExpressionStatement();
+
+	/**
+	 * Returns a new object of class '<em>Error Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Error Statement</em>'.
+	 * @generated
+	 */
+	ErrorStatement createErrorStatement();
+
+	/**
+	 * Returns a new object of class '<em>File Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>File Statement</em>'.
+	 * @generated
+	 */
+	FileStatement createFileStatement();
+
+	/**
+	 * Returns a new object of class '<em>For Each Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>For Each Statement</em>'.
+	 * @generated
+	 */
+	ForEachStatement createForEachStatement();
+
+	/**
+	 * Returns a new object of class '<em>If Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>If Statement</em>'.
+	 * @generated
+	 */
+	IfStatement createIfStatement();
+
+	/**
+	 * Returns a new object of class '<em>Let Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Let Statement</em>'.
+	 * @generated
+	 */
+	LetStatement createLetStatement();
+
+	/**
+	 * Returns a new object of class '<em>Protect Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Protect Statement</em>'.
+	 * @generated
+	 */
+	ProtectStatement createProtectStatement();
+
+	/**
+	 * Returns a new object of class '<em>Text Statement</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Text Statement</em>'.
+	 * @generated
+	 */
+	TextStatement createTextStatement();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	StatementPackage getStatementPackage();
+
+} //StatementFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementPackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementPackage.java
new file mode 100644
index 00000000..3742f747
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/StatementPackage.java
@@ -0,0 +1,1659 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementPackage.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+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.xpand3.Xpand3Package;
+
+/**
+ * <!-- 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.xpand3.statement.StatementFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface StatementPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "statement";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/statement";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "statement";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	StatementPackage eINSTANCE = org.eclipse.xpand3.statement.impl.StatementPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.AbstractStatementImpl <em>Abstract Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.AbstractStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getAbstractStatement()
+	 * @generated
+	 */
+	int ABSTRACT_STATEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT__LINE = Xpand3Package.SYNTAX_ELEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT__START = Xpand3Package.SYNTAX_ELEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT__END = Xpand3Package.SYNTAX_ELEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT__FILE_NAME = Xpand3Package.SYNTAX_ELEMENT__FILE_NAME;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_FEATURE_COUNT = Xpand3Package.SYNTAX_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl <em>Expand Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.ExpandStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getExpandStatement()
+	 * @generated
+	 */
+	int EXPAND_STATEMENT = 1;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__LINE = ABSTRACT_STATEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__START = ABSTRACT_STATEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__END = ABSTRACT_STATEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Foreach</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__FOREACH = ABSTRACT_STATEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__PARAMETERS = ABSTRACT_STATEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Separator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__SEPARATOR = ABSTRACT_STATEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__TARGET = ABSTRACT_STATEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Definition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT__DEFINITION = ABSTRACT_STATEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Expand Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPAND_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.ExpressionStatementImpl <em>Expression Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.ExpressionStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getExpressionStatement()
+	 * @generated
+	 */
+	int EXPRESSION_STATEMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT__LINE = ABSTRACT_STATEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT__START = ABSTRACT_STATEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT__END = ABSTRACT_STATEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT__EXPRESSION = ABSTRACT_STATEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Expression Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EXPRESSION_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.ErrorStatementImpl <em>Error Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.ErrorStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getErrorStatement()
+	 * @generated
+	 */
+	int ERROR_STATEMENT = 3;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT__LINE = ABSTRACT_STATEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT__START = ABSTRACT_STATEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT__END = ABSTRACT_STATEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Message</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT__MESSAGE = ABSTRACT_STATEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Error Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ERROR_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.AbstractStatementWithBodyImpl <em>Abstract Statement With Body</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.AbstractStatementWithBodyImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getAbstractStatementWithBody()
+	 * @generated
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY = 4;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY__LINE = ABSTRACT_STATEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY__START = ABSTRACT_STATEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY__END = ABSTRACT_STATEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME = ABSTRACT_STATEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY__BODY = ABSTRACT_STATEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Abstract Statement With Body</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT = ABSTRACT_STATEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.FileStatementImpl <em>File Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.FileStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getFileStatement()
+	 * @generated
+	 */
+	int FILE_STATEMENT = 5;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__LINE = ABSTRACT_STATEMENT_WITH_BODY__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__START = ABSTRACT_STATEMENT_WITH_BODY__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__END = ABSTRACT_STATEMENT_WITH_BODY__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__BODY = ABSTRACT_STATEMENT_WITH_BODY__BODY;
+
+	/**
+	 * The feature id for the '<em><b>File Name Expression</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__FILE_NAME_EXPRESSION = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Outlet Name Identifier</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__OUTLET_NAME_IDENTIFIER = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Once</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT__ONCE = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>File Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FILE_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl <em>For Each Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.ForEachStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getForEachStatement()
+	 * @generated
+	 */
+	int FOR_EACH_STATEMENT = 6;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__LINE = ABSTRACT_STATEMENT_WITH_BODY__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__START = ABSTRACT_STATEMENT_WITH_BODY__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__END = ABSTRACT_STATEMENT_WITH_BODY__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__BODY = ABSTRACT_STATEMENT_WITH_BODY__BODY;
+
+	/**
+	 * The feature id for the '<em><b>Target</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__TARGET = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Separator</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__SEPARATOR = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Variable</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__VARIABLE = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Iterator Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT__ITERATOR_NAME = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>For Each Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int FOR_EACH_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.IfStatementImpl <em>If Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.IfStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getIfStatement()
+	 * @generated
+	 */
+	int IF_STATEMENT = 7;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__LINE = ABSTRACT_STATEMENT_WITH_BODY__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__START = ABSTRACT_STATEMENT_WITH_BODY__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__END = ABSTRACT_STATEMENT_WITH_BODY__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__BODY = ABSTRACT_STATEMENT_WITH_BODY__BODY;
+
+	/**
+	 * The feature id for the '<em><b>Condition</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__CONDITION = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Else If</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT__ELSE_IF = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>If Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IF_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.LetStatementImpl <em>Let Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.LetStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getLetStatement()
+	 * @generated
+	 */
+	int LET_STATEMENT = 8;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__LINE = ABSTRACT_STATEMENT_WITH_BODY__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__START = ABSTRACT_STATEMENT_WITH_BODY__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__END = ABSTRACT_STATEMENT_WITH_BODY__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__BODY = ABSTRACT_STATEMENT_WITH_BODY__BODY;
+
+	/**
+	 * The feature id for the '<em><b>Var Name</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__VAR_NAME = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Var Value</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT__VAR_VALUE = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Let Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LET_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl <em>Protect Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.ProtectStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getProtectStatement()
+	 * @generated
+	 */
+	int PROTECT_STATEMENT = 9;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__LINE = ABSTRACT_STATEMENT_WITH_BODY__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__START = ABSTRACT_STATEMENT_WITH_BODY__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__END = ABSTRACT_STATEMENT_WITH_BODY__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT_WITH_BODY__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Body</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__BODY = ABSTRACT_STATEMENT_WITH_BODY__BODY;
+
+	/**
+	 * The feature id for the '<em><b>Comment Start</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__COMMENT_START = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Comment End</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__COMMENT_END = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Id</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__ID = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Disable</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT__DISABLE = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Protect Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PROTECT_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_WITH_BODY_FEATURE_COUNT + 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.xpand3.statement.impl.TextStatementImpl <em>Text Statement</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.xpand3.statement.impl.TextStatementImpl
+	 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getTextStatement()
+	 * @generated
+	 */
+	int TEXT_STATEMENT = 10;
+
+	/**
+	 * The feature id for the '<em><b>Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__LINE = ABSTRACT_STATEMENT__LINE;
+
+	/**
+	 * The feature id for the '<em><b>Start</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__START = ABSTRACT_STATEMENT__START;
+
+	/**
+	 * The feature id for the '<em><b>End</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__END = ABSTRACT_STATEMENT__END;
+
+	/**
+	 * The feature id for the '<em><b>File Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__FILE_NAME = ABSTRACT_STATEMENT__FILE_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__VALUE = ABSTRACT_STATEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Delete Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT__DELETE_LINE = ABSTRACT_STATEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Text Statement</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT_STATEMENT_FEATURE_COUNT = ABSTRACT_STATEMENT_FEATURE_COUNT + 2;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.AbstractStatement <em>Abstract Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.AbstractStatement
+	 * @generated
+	 */
+	EClass getAbstractStatement();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.ExpandStatement <em>Expand Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Expand Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement
+	 * @generated
+	 */
+	EClass getExpandStatement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.statement.ExpandStatement#isForeach <em>Foreach</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Foreach</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement#isForeach()
+	 * @see #getExpandStatement()
+	 * @generated
+	 */
+	EAttribute getExpandStatement_Foreach();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.statement.ExpandStatement#getParameters <em>Parameters</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement#getParameters()
+	 * @see #getExpandStatement()
+	 * @generated
+	 */
+	EReference getExpandStatement_Parameters();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ExpandStatement#getSeparator <em>Separator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Separator</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement#getSeparator()
+	 * @see #getExpandStatement()
+	 * @generated
+	 */
+	EReference getExpandStatement_Separator();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ExpandStatement#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement#getTarget()
+	 * @see #getExpandStatement()
+	 * @generated
+	 */
+	EReference getExpandStatement_Target();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ExpandStatement#getDefinition <em>Definition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Definition</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpandStatement#getDefinition()
+	 * @see #getExpandStatement()
+	 * @generated
+	 */
+	EReference getExpandStatement_Definition();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.ExpressionStatement <em>Expression Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Expression Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpressionStatement
+	 * @generated
+	 */
+	EClass getExpressionStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ExpressionStatement#getExpression <em>Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Expression</em>'.
+	 * @see org.eclipse.xpand3.statement.ExpressionStatement#getExpression()
+	 * @see #getExpressionStatement()
+	 * @generated
+	 */
+	EReference getExpressionStatement_Expression();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.ErrorStatement <em>Error Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Error Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.ErrorStatement
+	 * @generated
+	 */
+	EClass getErrorStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ErrorStatement#getMessage <em>Message</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Message</em>'.
+	 * @see org.eclipse.xpand3.statement.ErrorStatement#getMessage()
+	 * @see #getErrorStatement()
+	 * @generated
+	 */
+	EReference getErrorStatement_Message();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.AbstractStatementWithBody <em>Abstract Statement With Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Abstract Statement With Body</em>'.
+	 * @see org.eclipse.xpand3.statement.AbstractStatementWithBody
+	 * @generated
+	 */
+	EClass getAbstractStatementWithBody();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.statement.AbstractStatementWithBody#getBody <em>Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Body</em>'.
+	 * @see org.eclipse.xpand3.statement.AbstractStatementWithBody#getBody()
+	 * @see #getAbstractStatementWithBody()
+	 * @generated
+	 */
+	EReference getAbstractStatementWithBody_Body();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.FileStatement <em>File Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>File Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.FileStatement
+	 * @generated
+	 */
+	EClass getFileStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.FileStatement#getFileNameExpression <em>File Name Expression</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>File Name Expression</em>'.
+	 * @see org.eclipse.xpand3.statement.FileStatement#getFileNameExpression()
+	 * @see #getFileStatement()
+	 * @generated
+	 */
+	EReference getFileStatement_FileNameExpression();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.FileStatement#getOutletNameIdentifier <em>Outlet Name Identifier</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Outlet Name Identifier</em>'.
+	 * @see org.eclipse.xpand3.statement.FileStatement#getOutletNameIdentifier()
+	 * @see #getFileStatement()
+	 * @generated
+	 */
+	EReference getFileStatement_OutletNameIdentifier();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.statement.FileStatement#isOnce <em>Once</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Once</em>'.
+	 * @see org.eclipse.xpand3.statement.FileStatement#isOnce()
+	 * @see #getFileStatement()
+	 * @generated
+	 */
+	EAttribute getFileStatement_Once();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.ForEachStatement <em>For Each Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>For Each Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.ForEachStatement
+	 * @generated
+	 */
+	EClass getForEachStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ForEachStatement#getTarget <em>Target</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Target</em>'.
+	 * @see org.eclipse.xpand3.statement.ForEachStatement#getTarget()
+	 * @see #getForEachStatement()
+	 * @generated
+	 */
+	EReference getForEachStatement_Target();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ForEachStatement#getSeparator <em>Separator</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Separator</em>'.
+	 * @see org.eclipse.xpand3.statement.ForEachStatement#getSeparator()
+	 * @see #getForEachStatement()
+	 * @generated
+	 */
+	EReference getForEachStatement_Separator();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ForEachStatement#getVariable <em>Variable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Variable</em>'.
+	 * @see org.eclipse.xpand3.statement.ForEachStatement#getVariable()
+	 * @see #getForEachStatement()
+	 * @generated
+	 */
+	EReference getForEachStatement_Variable();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ForEachStatement#getIteratorName <em>Iterator Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Iterator Name</em>'.
+	 * @see org.eclipse.xpand3.statement.ForEachStatement#getIteratorName()
+	 * @see #getForEachStatement()
+	 * @generated
+	 */
+	EReference getForEachStatement_IteratorName();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.IfStatement <em>If Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>If Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.IfStatement
+	 * @generated
+	 */
+	EClass getIfStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.IfStatement#getCondition <em>Condition</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Condition</em>'.
+	 * @see org.eclipse.xpand3.statement.IfStatement#getCondition()
+	 * @see #getIfStatement()
+	 * @generated
+	 */
+	EReference getIfStatement_Condition();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.IfStatement#getElseIf <em>Else If</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Else If</em>'.
+	 * @see org.eclipse.xpand3.statement.IfStatement#getElseIf()
+	 * @see #getIfStatement()
+	 * @generated
+	 */
+	EReference getIfStatement_ElseIf();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.LetStatement <em>Let Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Let Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.LetStatement
+	 * @generated
+	 */
+	EClass getLetStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.LetStatement#getVarName <em>Var Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Var Name</em>'.
+	 * @see org.eclipse.xpand3.statement.LetStatement#getVarName()
+	 * @see #getLetStatement()
+	 * @generated
+	 */
+	EReference getLetStatement_VarName();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.LetStatement#getVarValue <em>Var Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Var Value</em>'.
+	 * @see org.eclipse.xpand3.statement.LetStatement#getVarValue()
+	 * @see #getLetStatement()
+	 * @generated
+	 */
+	EReference getLetStatement_VarValue();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.ProtectStatement <em>Protect Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Protect Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.ProtectStatement
+	 * @generated
+	 */
+	EClass getProtectStatement();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentStart <em>Comment Start</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Comment Start</em>'.
+	 * @see org.eclipse.xpand3.statement.ProtectStatement#getCommentStart()
+	 * @see #getProtectStatement()
+	 * @generated
+	 */
+	EReference getProtectStatement_CommentStart();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ProtectStatement#getCommentEnd <em>Comment End</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Comment End</em>'.
+	 * @see org.eclipse.xpand3.statement.ProtectStatement#getCommentEnd()
+	 * @see #getProtectStatement()
+	 * @generated
+	 */
+	EReference getProtectStatement_CommentEnd();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.statement.ProtectStatement#getId <em>Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Id</em>'.
+	 * @see org.eclipse.xpand3.statement.ProtectStatement#getId()
+	 * @see #getProtectStatement()
+	 * @generated
+	 */
+	EReference getProtectStatement_Id();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.statement.ProtectStatement#isDisable <em>Disable</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Disable</em>'.
+	 * @see org.eclipse.xpand3.statement.ProtectStatement#isDisable()
+	 * @see #getProtectStatement()
+	 * @generated
+	 */
+	EAttribute getProtectStatement_Disable();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.xpand3.statement.TextStatement <em>Text Statement</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Text Statement</em>'.
+	 * @see org.eclipse.xpand3.statement.TextStatement
+	 * @generated
+	 */
+	EClass getTextStatement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.statement.TextStatement#getValue <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see org.eclipse.xpand3.statement.TextStatement#getValue()
+	 * @see #getTextStatement()
+	 * @generated
+	 */
+	EAttribute getTextStatement_Value();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.xpand3.statement.TextStatement#isDeleteLine <em>Delete Line</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Delete Line</em>'.
+	 * @see org.eclipse.xpand3.statement.TextStatement#isDeleteLine()
+	 * @see #getTextStatement()
+	 * @generated
+	 */
+	EAttribute getTextStatement_DeleteLine();
+
+	/**
+	 * 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
+	 */
+	StatementFactory getStatementFactory();
+
+	/**
+	 * <!-- 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.xpand3.statement.impl.AbstractStatementImpl <em>Abstract Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.AbstractStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getAbstractStatement()
+		 * @generated
+		 */
+		EClass ABSTRACT_STATEMENT = eINSTANCE.getAbstractStatement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl <em>Expand Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.ExpandStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getExpandStatement()
+		 * @generated
+		 */
+		EClass EXPAND_STATEMENT = eINSTANCE.getExpandStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Foreach</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute EXPAND_STATEMENT__FOREACH = eINSTANCE.getExpandStatement_Foreach();
+
+		/**
+		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPAND_STATEMENT__PARAMETERS = eINSTANCE.getExpandStatement_Parameters();
+
+		/**
+		 * The meta object literal for the '<em><b>Separator</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPAND_STATEMENT__SEPARATOR = eINSTANCE.getExpandStatement_Separator();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPAND_STATEMENT__TARGET = eINSTANCE.getExpandStatement_Target();
+
+		/**
+		 * The meta object literal for the '<em><b>Definition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPAND_STATEMENT__DEFINITION = eINSTANCE.getExpandStatement_Definition();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.ExpressionStatementImpl <em>Expression Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.ExpressionStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getExpressionStatement()
+		 * @generated
+		 */
+		EClass EXPRESSION_STATEMENT = eINSTANCE.getExpressionStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference EXPRESSION_STATEMENT__EXPRESSION = eINSTANCE.getExpressionStatement_Expression();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.ErrorStatementImpl <em>Error Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.ErrorStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getErrorStatement()
+		 * @generated
+		 */
+		EClass ERROR_STATEMENT = eINSTANCE.getErrorStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Message</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ERROR_STATEMENT__MESSAGE = eINSTANCE.getErrorStatement_Message();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.AbstractStatementWithBodyImpl <em>Abstract Statement With Body</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.AbstractStatementWithBodyImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getAbstractStatementWithBody()
+		 * @generated
+		 */
+		EClass ABSTRACT_STATEMENT_WITH_BODY = eINSTANCE.getAbstractStatementWithBody();
+
+		/**
+		 * The meta object literal for the '<em><b>Body</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference ABSTRACT_STATEMENT_WITH_BODY__BODY = eINSTANCE.getAbstractStatementWithBody_Body();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.FileStatementImpl <em>File Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.FileStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getFileStatement()
+		 * @generated
+		 */
+		EClass FILE_STATEMENT = eINSTANCE.getFileStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>File Name Expression</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FILE_STATEMENT__FILE_NAME_EXPRESSION = eINSTANCE.getFileStatement_FileNameExpression();
+
+		/**
+		 * The meta object literal for the '<em><b>Outlet Name Identifier</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FILE_STATEMENT__OUTLET_NAME_IDENTIFIER = eINSTANCE.getFileStatement_OutletNameIdentifier();
+
+		/**
+		 * The meta object literal for the '<em><b>Once</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute FILE_STATEMENT__ONCE = eINSTANCE.getFileStatement_Once();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl <em>For Each Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.ForEachStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getForEachStatement()
+		 * @generated
+		 */
+		EClass FOR_EACH_STATEMENT = eINSTANCE.getForEachStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH_STATEMENT__TARGET = eINSTANCE.getForEachStatement_Target();
+
+		/**
+		 * The meta object literal for the '<em><b>Separator</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH_STATEMENT__SEPARATOR = eINSTANCE.getForEachStatement_Separator();
+
+		/**
+		 * The meta object literal for the '<em><b>Variable</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH_STATEMENT__VARIABLE = eINSTANCE.getForEachStatement_Variable();
+
+		/**
+		 * The meta object literal for the '<em><b>Iterator Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference FOR_EACH_STATEMENT__ITERATOR_NAME = eINSTANCE.getForEachStatement_IteratorName();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.IfStatementImpl <em>If Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.IfStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getIfStatement()
+		 * @generated
+		 */
+		EClass IF_STATEMENT = eINSTANCE.getIfStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF_STATEMENT__CONDITION = eINSTANCE.getIfStatement_Condition();
+
+		/**
+		 * The meta object literal for the '<em><b>Else If</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference IF_STATEMENT__ELSE_IF = eINSTANCE.getIfStatement_ElseIf();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.LetStatementImpl <em>Let Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.LetStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getLetStatement()
+		 * @generated
+		 */
+		EClass LET_STATEMENT = eINSTANCE.getLetStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Var Name</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LET_STATEMENT__VAR_NAME = eINSTANCE.getLetStatement_VarName();
+
+		/**
+		 * The meta object literal for the '<em><b>Var Value</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference LET_STATEMENT__VAR_VALUE = eINSTANCE.getLetStatement_VarValue();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl <em>Protect Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.ProtectStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getProtectStatement()
+		 * @generated
+		 */
+		EClass PROTECT_STATEMENT = eINSTANCE.getProtectStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Comment Start</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROTECT_STATEMENT__COMMENT_START = eINSTANCE.getProtectStatement_CommentStart();
+
+		/**
+		 * The meta object literal for the '<em><b>Comment End</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROTECT_STATEMENT__COMMENT_END = eINSTANCE.getProtectStatement_CommentEnd();
+
+		/**
+		 * The meta object literal for the '<em><b>Id</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference PROTECT_STATEMENT__ID = eINSTANCE.getProtectStatement_Id();
+
+		/**
+		 * The meta object literal for the '<em><b>Disable</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute PROTECT_STATEMENT__DISABLE = eINSTANCE.getProtectStatement_Disable();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.xpand3.statement.impl.TextStatementImpl <em>Text Statement</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.xpand3.statement.impl.TextStatementImpl
+		 * @see org.eclipse.xpand3.statement.impl.StatementPackageImpl#getTextStatement()
+		 * @generated
+		 */
+		EClass TEXT_STATEMENT = eINSTANCE.getTextStatement();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TEXT_STATEMENT__VALUE = eINSTANCE.getTextStatement_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Delete Line</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TEXT_STATEMENT__DELETE_LINE = eINSTANCE.getTextStatement_DeleteLine();
+
+	}
+
+} //StatementPackage
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/TextStatement.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/TextStatement.java
new file mode 100644
index 00000000..05bb6c5c
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/TextStatement.java
@@ -0,0 +1,80 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TextStatement.java,v 1.1 2008/03/17 14:39:03 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Text Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.TextStatement#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.TextStatement#isDeleteLine <em>Delete Line</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.xpand3.statement.StatementPackage#getTextStatement()
+ * @model
+ * @generated
+ */
+public interface TextStatement extends AbstractStatement {
+	/**
+	 * 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.xpand3.statement.StatementPackage#getTextStatement_Value()
+	 * @model
+	 * @generated
+	 */
+	String getValue();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.TextStatement#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);
+
+	/**
+	 * Returns the value of the '<em><b>Delete Line</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Delete Line</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Delete Line</em>' attribute.
+	 * @see #setDeleteLine(boolean)
+	 * @see org.eclipse.xpand3.statement.StatementPackage#getTextStatement_DeleteLine()
+	 * @model
+	 * @generated
+	 */
+	boolean isDeleteLine();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.xpand3.statement.TextStatement#isDeleteLine <em>Delete Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Delete Line</em>' attribute.
+	 * @see #isDeleteLine()
+	 * @generated
+	 */
+	void setDeleteLine(boolean value);
+
+} // TextStatement
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementImpl.java
new file mode 100644
index 00000000..169c8075
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementImpl.java
@@ -0,0 +1,45 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatementImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.xpand3.impl.SyntaxElementImpl;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractStatementImpl extends SyntaxElementImpl implements AbstractStatement {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.ABSTRACT_STATEMENT;
+	}
+
+} //AbstractStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementWithBodyImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementWithBodyImpl.java
new file mode 100644
index 00000000..7f0f6d16
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/AbstractStatementWithBodyImpl.java
@@ -0,0 +1,154 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatementWithBodyImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.statement.AbstractStatement;
+import org.eclipse.xpand3.statement.AbstractStatementWithBody;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Abstract Statement With Body</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.AbstractStatementWithBodyImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class AbstractStatementWithBodyImpl extends AbstractStatementImpl implements AbstractStatementWithBody {
+	/**
+	 * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBody()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractStatement> body;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected AbstractStatementWithBodyImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.ABSTRACT_STATEMENT_WITH_BODY;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractStatement> getBody() {
+		if (body == null) {
+			body = new EObjectContainmentEList<AbstractStatement>(AbstractStatement.class, this, StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY);
+		}
+		return body;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY:
+				return ((InternalEList<?>)getBody()).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 StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY:
+				return getBody();
+		}
+		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 StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY:
+				getBody().clear();
+				getBody().addAll((Collection<? extends AbstractStatement>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY:
+				getBody().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.ABSTRACT_STATEMENT_WITH_BODY__BODY:
+				return body != null && !body.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //AbstractStatementWithBodyImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ErrorStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ErrorStatementImpl.java
new file mode 100644
index 00000000..e10477fc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ErrorStatementImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ErrorStatementImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.ErrorStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Error Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ErrorStatementImpl#getMessage <em>Message</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ErrorStatementImpl extends AbstractStatementImpl implements ErrorStatement {
+	/**
+	 * The cached value of the '{@link #getMessage() <em>Message</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMessage()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression message;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ErrorStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.ERROR_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getMessage() {
+		return message;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetMessage(AbstractExpression newMessage, NotificationChain msgs) {
+		AbstractExpression oldMessage = message;
+		message = newMessage;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.ERROR_STATEMENT__MESSAGE, oldMessage, newMessage);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMessage(AbstractExpression newMessage) {
+		if (newMessage != message) {
+			NotificationChain msgs = null;
+			if (message != null)
+				msgs = ((InternalEObject)message).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.ERROR_STATEMENT__MESSAGE, null, msgs);
+			if (newMessage != null)
+				msgs = ((InternalEObject)newMessage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.ERROR_STATEMENT__MESSAGE, null, msgs);
+			msgs = basicSetMessage(newMessage, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.ERROR_STATEMENT__MESSAGE, newMessage, newMessage));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.ERROR_STATEMENT__MESSAGE:
+				return basicSetMessage(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 StatementPackage.ERROR_STATEMENT__MESSAGE:
+				return getMessage();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StatementPackage.ERROR_STATEMENT__MESSAGE:
+				setMessage((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.ERROR_STATEMENT__MESSAGE:
+				setMessage((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.ERROR_STATEMENT__MESSAGE:
+				return message != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ErrorStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpandStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpandStatementImpl.java
new file mode 100644
index 00000000..dabce653
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpandStatementImpl.java
@@ -0,0 +1,426 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpandStatementImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.ExpandStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Expand Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl#isForeach <em>Foreach</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpandStatementImpl#getDefinition <em>Definition</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExpandStatementImpl extends AbstractStatementImpl implements ExpandStatement {
+	/**
+	 * The default value of the '{@link #isForeach() <em>Foreach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isForeach()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean FOREACH_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isForeach() <em>Foreach</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isForeach()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean foreach = FOREACH_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getParameters()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<AbstractExpression> parameters;
+
+	/**
+	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeparator()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression separator;
+
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression target;
+
+	/**
+	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDefinition()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier definition;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExpandStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.EXPAND_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isForeach() {
+		return foreach;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setForeach(boolean newForeach) {
+		boolean oldForeach = foreach;
+		foreach = newForeach;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__FOREACH, oldForeach, foreach));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractExpression> getParameters() {
+		if (parameters == null) {
+			parameters = new EObjectContainmentEList<AbstractExpression>(AbstractExpression.class, this, StatementPackage.EXPAND_STATEMENT__PARAMETERS);
+		}
+		return parameters;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getSeparator() {
+		return separator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSeparator(AbstractExpression newSeparator, NotificationChain msgs) {
+		AbstractExpression oldSeparator = separator;
+		separator = newSeparator;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__SEPARATOR, oldSeparator, newSeparator);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSeparator(AbstractExpression newSeparator) {
+		if (newSeparator != separator) {
+			NotificationChain msgs = null;
+			if (separator != null)
+				msgs = ((InternalEObject)separator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__SEPARATOR, null, msgs);
+			if (newSeparator != null)
+				msgs = ((InternalEObject)newSeparator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__SEPARATOR, null, msgs);
+			msgs = basicSetSeparator(newSeparator, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__SEPARATOR, newSeparator, newSeparator));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTarget(AbstractExpression newTarget, NotificationChain msgs) {
+		AbstractExpression oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTarget(AbstractExpression newTarget) {
+		if (newTarget != target) {
+			NotificationChain msgs = null;
+			if (target != null)
+				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__TARGET, null, msgs);
+			if (newTarget != null)
+				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__TARGET, null, msgs);
+			msgs = basicSetTarget(newTarget, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__TARGET, newTarget, newTarget));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getDefinition() {
+		return definition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetDefinition(Identifier newDefinition, NotificationChain msgs) {
+		Identifier oldDefinition = definition;
+		definition = newDefinition;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__DEFINITION, oldDefinition, newDefinition);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDefinition(Identifier newDefinition) {
+		if (newDefinition != definition) {
+			NotificationChain msgs = null;
+			if (definition != null)
+				msgs = ((InternalEObject)definition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__DEFINITION, null, msgs);
+			if (newDefinition != null)
+				msgs = ((InternalEObject)newDefinition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPAND_STATEMENT__DEFINITION, null, msgs);
+			msgs = basicSetDefinition(newDefinition, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.EXPAND_STATEMENT__DEFINITION, newDefinition, newDefinition));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.EXPAND_STATEMENT__PARAMETERS:
+				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+			case StatementPackage.EXPAND_STATEMENT__SEPARATOR:
+				return basicSetSeparator(null, msgs);
+			case StatementPackage.EXPAND_STATEMENT__TARGET:
+				return basicSetTarget(null, msgs);
+			case StatementPackage.EXPAND_STATEMENT__DEFINITION:
+				return basicSetDefinition(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 StatementPackage.EXPAND_STATEMENT__FOREACH:
+				return isForeach() ? Boolean.TRUE : Boolean.FALSE;
+			case StatementPackage.EXPAND_STATEMENT__PARAMETERS:
+				return getParameters();
+			case StatementPackage.EXPAND_STATEMENT__SEPARATOR:
+				return getSeparator();
+			case StatementPackage.EXPAND_STATEMENT__TARGET:
+				return getTarget();
+			case StatementPackage.EXPAND_STATEMENT__DEFINITION:
+				return getDefinition();
+		}
+		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 StatementPackage.EXPAND_STATEMENT__FOREACH:
+				setForeach(((Boolean)newValue).booleanValue());
+				return;
+			case StatementPackage.EXPAND_STATEMENT__PARAMETERS:
+				getParameters().clear();
+				getParameters().addAll((Collection<? extends AbstractExpression>)newValue);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__SEPARATOR:
+				setSeparator((AbstractExpression)newValue);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__TARGET:
+				setTarget((AbstractExpression)newValue);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__DEFINITION:
+				setDefinition((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.EXPAND_STATEMENT__FOREACH:
+				setForeach(FOREACH_EDEFAULT);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__PARAMETERS:
+				getParameters().clear();
+				return;
+			case StatementPackage.EXPAND_STATEMENT__SEPARATOR:
+				setSeparator((AbstractExpression)null);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__TARGET:
+				setTarget((AbstractExpression)null);
+				return;
+			case StatementPackage.EXPAND_STATEMENT__DEFINITION:
+				setDefinition((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.EXPAND_STATEMENT__FOREACH:
+				return foreach != FOREACH_EDEFAULT;
+			case StatementPackage.EXPAND_STATEMENT__PARAMETERS:
+				return parameters != null && !parameters.isEmpty();
+			case StatementPackage.EXPAND_STATEMENT__SEPARATOR:
+				return separator != null;
+			case StatementPackage.EXPAND_STATEMENT__TARGET:
+				return target != null;
+			case StatementPackage.EXPAND_STATEMENT__DEFINITION:
+				return definition != 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(" (foreach: ");
+		result.append(foreach);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ExpandStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpressionStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpressionStatementImpl.java
new file mode 100644
index 00000000..819afa56
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ExpressionStatementImpl.java
@@ -0,0 +1,180 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionStatementImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.ExpressionStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Expression Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ExpressionStatementImpl#getExpression <em>Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ExpressionStatementImpl extends AbstractStatementImpl implements ExpressionStatement {
+	/**
+	 * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExpression()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression expression;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ExpressionStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.EXPRESSION_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getExpression() {
+		return expression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetExpression(AbstractExpression newExpression, NotificationChain msgs) {
+		AbstractExpression oldExpression = expression;
+		expression = newExpression;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.EXPRESSION_STATEMENT__EXPRESSION, oldExpression, newExpression);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExpression(AbstractExpression newExpression) {
+		if (newExpression != expression) {
+			NotificationChain msgs = null;
+			if (expression != null)
+				msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPRESSION_STATEMENT__EXPRESSION, null, msgs);
+			if (newExpression != null)
+				msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.EXPRESSION_STATEMENT__EXPRESSION, null, msgs);
+			msgs = basicSetExpression(newExpression, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.EXPRESSION_STATEMENT__EXPRESSION, newExpression, newExpression));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.EXPRESSION_STATEMENT__EXPRESSION:
+				return basicSetExpression(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 StatementPackage.EXPRESSION_STATEMENT__EXPRESSION:
+				return getExpression();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StatementPackage.EXPRESSION_STATEMENT__EXPRESSION:
+				setExpression((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.EXPRESSION_STATEMENT__EXPRESSION:
+				setExpression((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.EXPRESSION_STATEMENT__EXPRESSION:
+				return expression != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ExpressionStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/FileStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/FileStatementImpl.java
new file mode 100644
index 00000000..502c99c7
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/FileStatementImpl.java
@@ -0,0 +1,316 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FileStatementImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.FileStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>File Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.FileStatementImpl#getFileNameExpression <em>File Name Expression</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.FileStatementImpl#getOutletNameIdentifier <em>Outlet Name Identifier</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.FileStatementImpl#isOnce <em>Once</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class FileStatementImpl extends AbstractStatementWithBodyImpl implements FileStatement {
+	/**
+	 * The cached value of the '{@link #getFileNameExpression() <em>File Name Expression</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFileNameExpression()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression fileNameExpression;
+
+	/**
+	 * The cached value of the '{@link #getOutletNameIdentifier() <em>Outlet Name Identifier</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOutletNameIdentifier()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier outletNameIdentifier;
+
+	/**
+	 * The default value of the '{@link #isOnce() <em>Once</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOnce()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ONCE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isOnce() <em>Once</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOnce()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean once = ONCE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected FileStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.FILE_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getFileNameExpression() {
+		return fileNameExpression;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetFileNameExpression(AbstractExpression newFileNameExpression, NotificationChain msgs) {
+		AbstractExpression oldFileNameExpression = fileNameExpression;
+		fileNameExpression = newFileNameExpression;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION, oldFileNameExpression, newFileNameExpression);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFileNameExpression(AbstractExpression newFileNameExpression) {
+		if (newFileNameExpression != fileNameExpression) {
+			NotificationChain msgs = null;
+			if (fileNameExpression != null)
+				msgs = ((InternalEObject)fileNameExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION, null, msgs);
+			if (newFileNameExpression != null)
+				msgs = ((InternalEObject)newFileNameExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION, null, msgs);
+			msgs = basicSetFileNameExpression(newFileNameExpression, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION, newFileNameExpression, newFileNameExpression));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getOutletNameIdentifier() {
+		return outletNameIdentifier;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOutletNameIdentifier(Identifier newOutletNameIdentifier, NotificationChain msgs) {
+		Identifier oldOutletNameIdentifier = outletNameIdentifier;
+		outletNameIdentifier = newOutletNameIdentifier;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER, oldOutletNameIdentifier, newOutletNameIdentifier);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOutletNameIdentifier(Identifier newOutletNameIdentifier) {
+		if (newOutletNameIdentifier != outletNameIdentifier) {
+			NotificationChain msgs = null;
+			if (outletNameIdentifier != null)
+				msgs = ((InternalEObject)outletNameIdentifier).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER, null, msgs);
+			if (newOutletNameIdentifier != null)
+				msgs = ((InternalEObject)newOutletNameIdentifier).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER, null, msgs);
+			msgs = basicSetOutletNameIdentifier(newOutletNameIdentifier, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER, newOutletNameIdentifier, newOutletNameIdentifier));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isOnce() {
+		return once;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOnce(boolean newOnce) {
+		boolean oldOnce = once;
+		once = newOnce;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FILE_STATEMENT__ONCE, oldOnce, once));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION:
+				return basicSetFileNameExpression(null, msgs);
+			case StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER:
+				return basicSetOutletNameIdentifier(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 StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION:
+				return getFileNameExpression();
+			case StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER:
+				return getOutletNameIdentifier();
+			case StatementPackage.FILE_STATEMENT__ONCE:
+				return isOnce() ? 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 StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION:
+				setFileNameExpression((AbstractExpression)newValue);
+				return;
+			case StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER:
+				setOutletNameIdentifier((Identifier)newValue);
+				return;
+			case StatementPackage.FILE_STATEMENT__ONCE:
+				setOnce(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION:
+				setFileNameExpression((AbstractExpression)null);
+				return;
+			case StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER:
+				setOutletNameIdentifier((Identifier)null);
+				return;
+			case StatementPackage.FILE_STATEMENT__ONCE:
+				setOnce(ONCE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.FILE_STATEMENT__FILE_NAME_EXPRESSION:
+				return fileNameExpression != null;
+			case StatementPackage.FILE_STATEMENT__OUTLET_NAME_IDENTIFIER:
+				return outletNameIdentifier != null;
+			case StatementPackage.FILE_STATEMENT__ONCE:
+				return once != ONCE_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(" (once: ");
+		result.append(once);
+		result.append(')');
+		return result.toString();
+	}
+
+} //FileStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ForEachStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ForEachStatementImpl.java
new file mode 100644
index 00000000..7c97257c
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ForEachStatementImpl.java
@@ -0,0 +1,380 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ForEachStatementImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.ForEachStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>For Each Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl#getSeparator <em>Separator</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ForEachStatementImpl#getIteratorName <em>Iterator Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ForEachStatementImpl extends AbstractStatementWithBodyImpl implements ForEachStatement {
+	/**
+	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTarget()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression target;
+
+	/**
+	 * The cached value of the '{@link #getSeparator() <em>Separator</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSeparator()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression separator;
+
+	/**
+	 * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVariable()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier variable;
+
+	/**
+	 * The cached value of the '{@link #getIteratorName() <em>Iterator Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getIteratorName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier iteratorName;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ForEachStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.FOR_EACH_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getTarget() {
+		return target;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTarget(AbstractExpression newTarget, NotificationChain msgs) {
+		AbstractExpression oldTarget = target;
+		target = newTarget;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__TARGET, oldTarget, newTarget);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTarget(AbstractExpression newTarget) {
+		if (newTarget != target) {
+			NotificationChain msgs = null;
+			if (target != null)
+				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__TARGET, null, msgs);
+			if (newTarget != null)
+				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__TARGET, null, msgs);
+			msgs = basicSetTarget(newTarget, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__TARGET, newTarget, newTarget));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getSeparator() {
+		return separator;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSeparator(AbstractExpression newSeparator, NotificationChain msgs) {
+		AbstractExpression oldSeparator = separator;
+		separator = newSeparator;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__SEPARATOR, oldSeparator, newSeparator);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSeparator(AbstractExpression newSeparator) {
+		if (newSeparator != separator) {
+			NotificationChain msgs = null;
+			if (separator != null)
+				msgs = ((InternalEObject)separator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__SEPARATOR, null, msgs);
+			if (newSeparator != null)
+				msgs = ((InternalEObject)newSeparator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__SEPARATOR, null, msgs);
+			msgs = basicSetSeparator(newSeparator, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__SEPARATOR, newSeparator, newSeparator));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getVariable() {
+		return variable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVariable(Identifier newVariable, NotificationChain msgs) {
+		Identifier oldVariable = variable;
+		variable = newVariable;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__VARIABLE, oldVariable, newVariable);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVariable(Identifier newVariable) {
+		if (newVariable != variable) {
+			NotificationChain msgs = null;
+			if (variable != null)
+				msgs = ((InternalEObject)variable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__VARIABLE, null, msgs);
+			if (newVariable != null)
+				msgs = ((InternalEObject)newVariable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__VARIABLE, null, msgs);
+			msgs = basicSetVariable(newVariable, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__VARIABLE, newVariable, newVariable));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getIteratorName() {
+		return iteratorName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetIteratorName(Identifier newIteratorName, NotificationChain msgs) {
+		Identifier oldIteratorName = iteratorName;
+		iteratorName = newIteratorName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME, oldIteratorName, newIteratorName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setIteratorName(Identifier newIteratorName) {
+		if (newIteratorName != iteratorName) {
+			NotificationChain msgs = null;
+			if (iteratorName != null)
+				msgs = ((InternalEObject)iteratorName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME, null, msgs);
+			if (newIteratorName != null)
+				msgs = ((InternalEObject)newIteratorName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME, null, msgs);
+			msgs = basicSetIteratorName(newIteratorName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME, newIteratorName, newIteratorName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.FOR_EACH_STATEMENT__TARGET:
+				return basicSetTarget(null, msgs);
+			case StatementPackage.FOR_EACH_STATEMENT__SEPARATOR:
+				return basicSetSeparator(null, msgs);
+			case StatementPackage.FOR_EACH_STATEMENT__VARIABLE:
+				return basicSetVariable(null, msgs);
+			case StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME:
+				return basicSetIteratorName(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 StatementPackage.FOR_EACH_STATEMENT__TARGET:
+				return getTarget();
+			case StatementPackage.FOR_EACH_STATEMENT__SEPARATOR:
+				return getSeparator();
+			case StatementPackage.FOR_EACH_STATEMENT__VARIABLE:
+				return getVariable();
+			case StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME:
+				return getIteratorName();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StatementPackage.FOR_EACH_STATEMENT__TARGET:
+				setTarget((AbstractExpression)newValue);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__SEPARATOR:
+				setSeparator((AbstractExpression)newValue);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__VARIABLE:
+				setVariable((Identifier)newValue);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME:
+				setIteratorName((Identifier)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.FOR_EACH_STATEMENT__TARGET:
+				setTarget((AbstractExpression)null);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__SEPARATOR:
+				setSeparator((AbstractExpression)null);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__VARIABLE:
+				setVariable((Identifier)null);
+				return;
+			case StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME:
+				setIteratorName((Identifier)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.FOR_EACH_STATEMENT__TARGET:
+				return target != null;
+			case StatementPackage.FOR_EACH_STATEMENT__SEPARATOR:
+				return separator != null;
+			case StatementPackage.FOR_EACH_STATEMENT__VARIABLE:
+				return variable != null;
+			case StatementPackage.FOR_EACH_STATEMENT__ITERATOR_NAME:
+				return iteratorName != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //ForEachStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/IfStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/IfStatementImpl.java
new file mode 100644
index 00000000..b9a085a5
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/IfStatementImpl.java
@@ -0,0 +1,246 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfStatementImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.IfStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>If Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.IfStatementImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.IfStatementImpl#getElseIf <em>Else If</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class IfStatementImpl extends AbstractStatementWithBodyImpl implements IfStatement {
+	/**
+	 * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCondition()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression condition;
+
+	/**
+	 * The cached value of the '{@link #getElseIf() <em>Else If</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getElseIf()
+	 * @generated
+	 * @ordered
+	 */
+	protected IfStatement elseIf;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IfStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.IF_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getCondition() {
+		return condition;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCondition(AbstractExpression newCondition, NotificationChain msgs) {
+		AbstractExpression oldCondition = condition;
+		condition = newCondition;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.IF_STATEMENT__CONDITION, oldCondition, newCondition);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCondition(AbstractExpression newCondition) {
+		if (newCondition != condition) {
+			NotificationChain msgs = null;
+			if (condition != null)
+				msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.IF_STATEMENT__CONDITION, null, msgs);
+			if (newCondition != null)
+				msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.IF_STATEMENT__CONDITION, null, msgs);
+			msgs = basicSetCondition(newCondition, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.IF_STATEMENT__CONDITION, newCondition, newCondition));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IfStatement getElseIf() {
+		return elseIf;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetElseIf(IfStatement newElseIf, NotificationChain msgs) {
+		IfStatement oldElseIf = elseIf;
+		elseIf = newElseIf;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.IF_STATEMENT__ELSE_IF, oldElseIf, newElseIf);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setElseIf(IfStatement newElseIf) {
+		if (newElseIf != elseIf) {
+			NotificationChain msgs = null;
+			if (elseIf != null)
+				msgs = ((InternalEObject)elseIf).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.IF_STATEMENT__ELSE_IF, null, msgs);
+			if (newElseIf != null)
+				msgs = ((InternalEObject)newElseIf).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.IF_STATEMENT__ELSE_IF, null, msgs);
+			msgs = basicSetElseIf(newElseIf, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.IF_STATEMENT__ELSE_IF, newElseIf, newElseIf));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.IF_STATEMENT__CONDITION:
+				return basicSetCondition(null, msgs);
+			case StatementPackage.IF_STATEMENT__ELSE_IF:
+				return basicSetElseIf(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 StatementPackage.IF_STATEMENT__CONDITION:
+				return getCondition();
+			case StatementPackage.IF_STATEMENT__ELSE_IF:
+				return getElseIf();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StatementPackage.IF_STATEMENT__CONDITION:
+				setCondition((AbstractExpression)newValue);
+				return;
+			case StatementPackage.IF_STATEMENT__ELSE_IF:
+				setElseIf((IfStatement)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.IF_STATEMENT__CONDITION:
+				setCondition((AbstractExpression)null);
+				return;
+			case StatementPackage.IF_STATEMENT__ELSE_IF:
+				setElseIf((IfStatement)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.IF_STATEMENT__CONDITION:
+				return condition != null;
+			case StatementPackage.IF_STATEMENT__ELSE_IF:
+				return elseIf != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //IfStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/LetStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/LetStatementImpl.java
new file mode 100644
index 00000000..43b75a86
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/LetStatementImpl.java
@@ -0,0 +1,248 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetStatementImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.LetStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Let Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.LetStatementImpl#getVarName <em>Var Name</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.LetStatementImpl#getVarValue <em>Var Value</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class LetStatementImpl extends AbstractStatementWithBodyImpl implements LetStatement {
+	/**
+	 * The cached value of the '{@link #getVarName() <em>Var Name</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVarName()
+	 * @generated
+	 * @ordered
+	 */
+	protected Identifier varName;
+
+	/**
+	 * The cached value of the '{@link #getVarValue() <em>Var Value</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVarValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression varValue;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected LetStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.LET_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Identifier getVarName() {
+		return varName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVarName(Identifier newVarName, NotificationChain msgs) {
+		Identifier oldVarName = varName;
+		varName = newVarName;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.LET_STATEMENT__VAR_NAME, oldVarName, newVarName);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVarName(Identifier newVarName) {
+		if (newVarName != varName) {
+			NotificationChain msgs = null;
+			if (varName != null)
+				msgs = ((InternalEObject)varName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.LET_STATEMENT__VAR_NAME, null, msgs);
+			if (newVarName != null)
+				msgs = ((InternalEObject)newVarName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.LET_STATEMENT__VAR_NAME, null, msgs);
+			msgs = basicSetVarName(newVarName, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.LET_STATEMENT__VAR_NAME, newVarName, newVarName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getVarValue() {
+		return varValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetVarValue(AbstractExpression newVarValue, NotificationChain msgs) {
+		AbstractExpression oldVarValue = varValue;
+		varValue = newVarValue;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.LET_STATEMENT__VAR_VALUE, oldVarValue, newVarValue);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVarValue(AbstractExpression newVarValue) {
+		if (newVarValue != varValue) {
+			NotificationChain msgs = null;
+			if (varValue != null)
+				msgs = ((InternalEObject)varValue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.LET_STATEMENT__VAR_VALUE, null, msgs);
+			if (newVarValue != null)
+				msgs = ((InternalEObject)newVarValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.LET_STATEMENT__VAR_VALUE, null, msgs);
+			msgs = basicSetVarValue(newVarValue, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.LET_STATEMENT__VAR_VALUE, newVarValue, newVarValue));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.LET_STATEMENT__VAR_NAME:
+				return basicSetVarName(null, msgs);
+			case StatementPackage.LET_STATEMENT__VAR_VALUE:
+				return basicSetVarValue(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 StatementPackage.LET_STATEMENT__VAR_NAME:
+				return getVarName();
+			case StatementPackage.LET_STATEMENT__VAR_VALUE:
+				return getVarValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case StatementPackage.LET_STATEMENT__VAR_NAME:
+				setVarName((Identifier)newValue);
+				return;
+			case StatementPackage.LET_STATEMENT__VAR_VALUE:
+				setVarValue((AbstractExpression)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.LET_STATEMENT__VAR_NAME:
+				setVarName((Identifier)null);
+				return;
+			case StatementPackage.LET_STATEMENT__VAR_VALUE:
+				setVarValue((AbstractExpression)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.LET_STATEMENT__VAR_NAME:
+				return varName != null;
+			case StatementPackage.LET_STATEMENT__VAR_VALUE:
+				return varValue != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //LetStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ProtectStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ProtectStatementImpl.java
new file mode 100644
index 00000000..8099d70c
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/ProtectStatementImpl.java
@@ -0,0 +1,380 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ProtectStatementImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.ProtectStatement;
+import org.eclipse.xpand3.statement.StatementPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Protect Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl#getCommentStart <em>Comment Start</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl#getCommentEnd <em>Comment End</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.ProtectStatementImpl#isDisable <em>Disable</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class ProtectStatementImpl extends AbstractStatementWithBodyImpl implements ProtectStatement {
+	/**
+	 * The cached value of the '{@link #getCommentStart() <em>Comment Start</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCommentStart()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression commentStart;
+
+	/**
+	 * The cached value of the '{@link #getCommentEnd() <em>Comment End</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCommentEnd()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression commentEnd;
+
+	/**
+	 * The cached value of the '{@link #getId() <em>Id</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getId()
+	 * @generated
+	 * @ordered
+	 */
+	protected AbstractExpression id;
+
+	/**
+	 * The default value of the '{@link #isDisable() <em>Disable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisable()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DISABLE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDisable() <em>Disable</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDisable()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean disable = DISABLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ProtectStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.PROTECT_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getCommentStart() {
+		return commentStart;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCommentStart(AbstractExpression newCommentStart, NotificationChain msgs) {
+		AbstractExpression oldCommentStart = commentStart;
+		commentStart = newCommentStart;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__COMMENT_START, oldCommentStart, newCommentStart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCommentStart(AbstractExpression newCommentStart) {
+		if (newCommentStart != commentStart) {
+			NotificationChain msgs = null;
+			if (commentStart != null)
+				msgs = ((InternalEObject)commentStart).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__COMMENT_START, null, msgs);
+			if (newCommentStart != null)
+				msgs = ((InternalEObject)newCommentStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__COMMENT_START, null, msgs);
+			msgs = basicSetCommentStart(newCommentStart, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__COMMENT_START, newCommentStart, newCommentStart));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getCommentEnd() {
+		return commentEnd;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetCommentEnd(AbstractExpression newCommentEnd, NotificationChain msgs) {
+		AbstractExpression oldCommentEnd = commentEnd;
+		commentEnd = newCommentEnd;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__COMMENT_END, oldCommentEnd, newCommentEnd);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setCommentEnd(AbstractExpression newCommentEnd) {
+		if (newCommentEnd != commentEnd) {
+			NotificationChain msgs = null;
+			if (commentEnd != null)
+				msgs = ((InternalEObject)commentEnd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__COMMENT_END, null, msgs);
+			if (newCommentEnd != null)
+				msgs = ((InternalEObject)newCommentEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__COMMENT_END, null, msgs);
+			msgs = basicSetCommentEnd(newCommentEnd, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__COMMENT_END, newCommentEnd, newCommentEnd));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AbstractExpression getId() {
+		return id;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetId(AbstractExpression newId, NotificationChain msgs) {
+		AbstractExpression oldId = id;
+		id = newId;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__ID, oldId, newId);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setId(AbstractExpression newId) {
+		if (newId != id) {
+			NotificationChain msgs = null;
+			if (id != null)
+				msgs = ((InternalEObject)id).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__ID, null, msgs);
+			if (newId != null)
+				msgs = ((InternalEObject)newId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - StatementPackage.PROTECT_STATEMENT__ID, null, msgs);
+			msgs = basicSetId(newId, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__ID, newId, newId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDisable() {
+		return disable;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDisable(boolean newDisable) {
+		boolean oldDisable = disable;
+		disable = newDisable;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.PROTECT_STATEMENT__DISABLE, oldDisable, disable));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_START:
+				return basicSetCommentStart(null, msgs);
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_END:
+				return basicSetCommentEnd(null, msgs);
+			case StatementPackage.PROTECT_STATEMENT__ID:
+				return basicSetId(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 StatementPackage.PROTECT_STATEMENT__COMMENT_START:
+				return getCommentStart();
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_END:
+				return getCommentEnd();
+			case StatementPackage.PROTECT_STATEMENT__ID:
+				return getId();
+			case StatementPackage.PROTECT_STATEMENT__DISABLE:
+				return isDisable() ? 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 StatementPackage.PROTECT_STATEMENT__COMMENT_START:
+				setCommentStart((AbstractExpression)newValue);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_END:
+				setCommentEnd((AbstractExpression)newValue);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__ID:
+				setId((AbstractExpression)newValue);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__DISABLE:
+				setDisable(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_START:
+				setCommentStart((AbstractExpression)null);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_END:
+				setCommentEnd((AbstractExpression)null);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__ID:
+				setId((AbstractExpression)null);
+				return;
+			case StatementPackage.PROTECT_STATEMENT__DISABLE:
+				setDisable(DISABLE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_START:
+				return commentStart != null;
+			case StatementPackage.PROTECT_STATEMENT__COMMENT_END:
+				return commentEnd != null;
+			case StatementPackage.PROTECT_STATEMENT__ID:
+				return id != null;
+			case StatementPackage.PROTECT_STATEMENT__DISABLE:
+				return disable != DISABLE_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(" (disable: ");
+		result.append(disable);
+		result.append(')');
+		return result.toString();
+	}
+
+} //ProtectStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementFactoryImpl.java
new file mode 100644
index 00000000..489bf0bc
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementFactoryImpl.java
@@ -0,0 +1,187 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementFactoryImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.statement.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StatementFactoryImpl extends EFactoryImpl implements StatementFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static StatementFactory init() {
+		try {
+			StatementFactory theStatementFactory = (StatementFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/statement"); 
+			if (theStatementFactory != null) {
+				return theStatementFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new StatementFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StatementFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case StatementPackage.EXPAND_STATEMENT: return createExpandStatement();
+			case StatementPackage.EXPRESSION_STATEMENT: return createExpressionStatement();
+			case StatementPackage.ERROR_STATEMENT: return createErrorStatement();
+			case StatementPackage.FILE_STATEMENT: return createFileStatement();
+			case StatementPackage.FOR_EACH_STATEMENT: return createForEachStatement();
+			case StatementPackage.IF_STATEMENT: return createIfStatement();
+			case StatementPackage.LET_STATEMENT: return createLetStatement();
+			case StatementPackage.PROTECT_STATEMENT: return createProtectStatement();
+			case StatementPackage.TEXT_STATEMENT: return createTextStatement();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpandStatement createExpandStatement() {
+		ExpandStatementImpl expandStatement = new ExpandStatementImpl();
+		return expandStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ExpressionStatement createExpressionStatement() {
+		ExpressionStatementImpl expressionStatement = new ExpressionStatementImpl();
+		return expressionStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ErrorStatement createErrorStatement() {
+		ErrorStatementImpl errorStatement = new ErrorStatementImpl();
+		return errorStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public FileStatement createFileStatement() {
+		FileStatementImpl fileStatement = new FileStatementImpl();
+		return fileStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ForEachStatement createForEachStatement() {
+		ForEachStatementImpl forEachStatement = new ForEachStatementImpl();
+		return forEachStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IfStatement createIfStatement() {
+		IfStatementImpl ifStatement = new IfStatementImpl();
+		return ifStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public LetStatement createLetStatement() {
+		LetStatementImpl letStatement = new LetStatementImpl();
+		return letStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ProtectStatement createProtectStatement() {
+		ProtectStatementImpl protectStatement = new ProtectStatementImpl();
+		return protectStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TextStatement createTextStatement() {
+		TextStatementImpl textStatement = new TextStatementImpl();
+		return textStatement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StatementPackage getStatementPackage() {
+		return (StatementPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static StatementPackage getPackage() {
+		return StatementPackage.eINSTANCE;
+	}
+
+} //StatementFactoryImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementPackageImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementPackageImpl.java
new file mode 100644
index 00000000..42478655
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/StatementPackageImpl.java
@@ -0,0 +1,698 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementPackageImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.Xpand3Package;
+
+import org.eclipse.xpand3.declaration.DeclarationPackage;
+
+import org.eclipse.xpand3.declaration.impl.DeclarationPackageImpl;
+
+import org.eclipse.xpand3.expression.ExpressionPackage;
+
+import org.eclipse.xpand3.expression.impl.ExpressionPackageImpl;
+
+import org.eclipse.xpand3.impl.Xpand3PackageImpl;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+import org.eclipse.xpand3.statement.AbstractStatementWithBody;
+import org.eclipse.xpand3.statement.ErrorStatement;
+import org.eclipse.xpand3.statement.ExpandStatement;
+import org.eclipse.xpand3.statement.ExpressionStatement;
+import org.eclipse.xpand3.statement.FileStatement;
+import org.eclipse.xpand3.statement.ForEachStatement;
+import org.eclipse.xpand3.statement.IfStatement;
+import org.eclipse.xpand3.statement.LetStatement;
+import org.eclipse.xpand3.statement.ProtectStatement;
+import org.eclipse.xpand3.statement.StatementFactory;
+import org.eclipse.xpand3.statement.StatementPackage;
+import org.eclipse.xpand3.statement.TextStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class StatementPackageImpl extends EPackageImpl implements StatementPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass expandStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass expressionStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass errorStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass abstractStatementWithBodyEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass fileStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass forEachStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass ifStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass letStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass protectStatementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass textStatementEClass = 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.xpand3.statement.StatementPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private StatementPackageImpl() {
+		super(eNS_URI, StatementFactory.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 StatementPackage init() {
+		if (isInited) return (StatementPackage)EPackage.Registry.INSTANCE.getEPackage(StatementPackage.eNS_URI);
+
+		// Obtain or create and register package
+		StatementPackageImpl theStatementPackage = (StatementPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof StatementPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new StatementPackageImpl());
+
+		isInited = true;
+
+		// Obtain or create and register interdependencies
+		Xpand3PackageImpl theXpand3Package = (Xpand3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) instanceof Xpand3PackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI) : Xpand3Package.eINSTANCE);
+		ExpressionPackageImpl theExpressionPackage = (ExpressionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) instanceof ExpressionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI) : ExpressionPackage.eINSTANCE);
+		DeclarationPackageImpl theDeclarationPackage = (DeclarationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) instanceof DeclarationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(DeclarationPackage.eNS_URI) : DeclarationPackage.eINSTANCE);
+
+		// Create package meta-data objects
+		theStatementPackage.createPackageContents();
+		theXpand3Package.createPackageContents();
+		theExpressionPackage.createPackageContents();
+		theDeclarationPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theStatementPackage.initializePackageContents();
+		theXpand3Package.initializePackageContents();
+		theExpressionPackage.initializePackageContents();
+		theDeclarationPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theStatementPackage.freeze();
+
+		return theStatementPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractStatement() {
+		return abstractStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getExpandStatement() {
+		return expandStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getExpandStatement_Foreach() {
+		return (EAttribute)expandStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpandStatement_Parameters() {
+		return (EReference)expandStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpandStatement_Separator() {
+		return (EReference)expandStatementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpandStatement_Target() {
+		return (EReference)expandStatementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpandStatement_Definition() {
+		return (EReference)expandStatementEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getExpressionStatement() {
+		return expressionStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getExpressionStatement_Expression() {
+		return (EReference)expressionStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getErrorStatement() {
+		return errorStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getErrorStatement_Message() {
+		return (EReference)errorStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getAbstractStatementWithBody() {
+		return abstractStatementWithBodyEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getAbstractStatementWithBody_Body() {
+		return (EReference)abstractStatementWithBodyEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getFileStatement() {
+		return fileStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFileStatement_FileNameExpression() {
+		return (EReference)fileStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getFileStatement_OutletNameIdentifier() {
+		return (EReference)fileStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getFileStatement_Once() {
+		return (EAttribute)fileStatementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getForEachStatement() {
+		return forEachStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getForEachStatement_Target() {
+		return (EReference)forEachStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getForEachStatement_Separator() {
+		return (EReference)forEachStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getForEachStatement_Variable() {
+		return (EReference)forEachStatementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getForEachStatement_IteratorName() {
+		return (EReference)forEachStatementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getIfStatement() {
+		return ifStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIfStatement_Condition() {
+		return (EReference)ifStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getIfStatement_ElseIf() {
+		return (EReference)ifStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getLetStatement() {
+		return letStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLetStatement_VarName() {
+		return (EReference)letStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getLetStatement_VarValue() {
+		return (EReference)letStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getProtectStatement() {
+		return protectStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getProtectStatement_CommentStart() {
+		return (EReference)protectStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getProtectStatement_CommentEnd() {
+		return (EReference)protectStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getProtectStatement_Id() {
+		return (EReference)protectStatementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getProtectStatement_Disable() {
+		return (EAttribute)protectStatementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getTextStatement() {
+		return textStatementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTextStatement_Value() {
+		return (EAttribute)textStatementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTextStatement_DeleteLine() {
+		return (EAttribute)textStatementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StatementFactory getStatementFactory() {
+		return (StatementFactory)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
+		abstractStatementEClass = createEClass(ABSTRACT_STATEMENT);
+
+		expandStatementEClass = createEClass(EXPAND_STATEMENT);
+		createEAttribute(expandStatementEClass, EXPAND_STATEMENT__FOREACH);
+		createEReference(expandStatementEClass, EXPAND_STATEMENT__PARAMETERS);
+		createEReference(expandStatementEClass, EXPAND_STATEMENT__SEPARATOR);
+		createEReference(expandStatementEClass, EXPAND_STATEMENT__TARGET);
+		createEReference(expandStatementEClass, EXPAND_STATEMENT__DEFINITION);
+
+		expressionStatementEClass = createEClass(EXPRESSION_STATEMENT);
+		createEReference(expressionStatementEClass, EXPRESSION_STATEMENT__EXPRESSION);
+
+		errorStatementEClass = createEClass(ERROR_STATEMENT);
+		createEReference(errorStatementEClass, ERROR_STATEMENT__MESSAGE);
+
+		abstractStatementWithBodyEClass = createEClass(ABSTRACT_STATEMENT_WITH_BODY);
+		createEReference(abstractStatementWithBodyEClass, ABSTRACT_STATEMENT_WITH_BODY__BODY);
+
+		fileStatementEClass = createEClass(FILE_STATEMENT);
+		createEReference(fileStatementEClass, FILE_STATEMENT__FILE_NAME_EXPRESSION);
+		createEReference(fileStatementEClass, FILE_STATEMENT__OUTLET_NAME_IDENTIFIER);
+		createEAttribute(fileStatementEClass, FILE_STATEMENT__ONCE);
+
+		forEachStatementEClass = createEClass(FOR_EACH_STATEMENT);
+		createEReference(forEachStatementEClass, FOR_EACH_STATEMENT__TARGET);
+		createEReference(forEachStatementEClass, FOR_EACH_STATEMENT__SEPARATOR);
+		createEReference(forEachStatementEClass, FOR_EACH_STATEMENT__VARIABLE);
+		createEReference(forEachStatementEClass, FOR_EACH_STATEMENT__ITERATOR_NAME);
+
+		ifStatementEClass = createEClass(IF_STATEMENT);
+		createEReference(ifStatementEClass, IF_STATEMENT__CONDITION);
+		createEReference(ifStatementEClass, IF_STATEMENT__ELSE_IF);
+
+		letStatementEClass = createEClass(LET_STATEMENT);
+		createEReference(letStatementEClass, LET_STATEMENT__VAR_NAME);
+		createEReference(letStatementEClass, LET_STATEMENT__VAR_VALUE);
+
+		protectStatementEClass = createEClass(PROTECT_STATEMENT);
+		createEReference(protectStatementEClass, PROTECT_STATEMENT__COMMENT_START);
+		createEReference(protectStatementEClass, PROTECT_STATEMENT__COMMENT_END);
+		createEReference(protectStatementEClass, PROTECT_STATEMENT__ID);
+		createEAttribute(protectStatementEClass, PROTECT_STATEMENT__DISABLE);
+
+		textStatementEClass = createEClass(TEXT_STATEMENT);
+		createEAttribute(textStatementEClass, TEXT_STATEMENT__VALUE);
+		createEAttribute(textStatementEClass, TEXT_STATEMENT__DELETE_LINE);
+	}
+
+	/**
+	 * <!-- 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);
+
+		// Obtain other dependent packages
+		Xpand3Package theXpand3Package = (Xpand3Package)EPackage.Registry.INSTANCE.getEPackage(Xpand3Package.eNS_URI);
+		ExpressionPackage theExpressionPackage = (ExpressionPackage)EPackage.Registry.INSTANCE.getEPackage(ExpressionPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		abstractStatementEClass.getESuperTypes().add(theXpand3Package.getSyntaxElement());
+		expandStatementEClass.getESuperTypes().add(this.getAbstractStatement());
+		expressionStatementEClass.getESuperTypes().add(this.getAbstractStatement());
+		errorStatementEClass.getESuperTypes().add(this.getAbstractStatement());
+		abstractStatementWithBodyEClass.getESuperTypes().add(this.getAbstractStatement());
+		fileStatementEClass.getESuperTypes().add(this.getAbstractStatementWithBody());
+		forEachStatementEClass.getESuperTypes().add(this.getAbstractStatementWithBody());
+		ifStatementEClass.getESuperTypes().add(this.getAbstractStatementWithBody());
+		letStatementEClass.getESuperTypes().add(this.getAbstractStatementWithBody());
+		protectStatementEClass.getESuperTypes().add(this.getAbstractStatementWithBody());
+		textStatementEClass.getESuperTypes().add(this.getAbstractStatement());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(abstractStatementEClass, AbstractStatement.class, "AbstractStatement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(expandStatementEClass, ExpandStatement.class, "ExpandStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getExpandStatement_Foreach(), ecorePackage.getEBoolean(), "foreach", null, 0, 1, ExpandStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatement_Parameters(), theExpressionPackage.getAbstractExpression(), null, "parameters", null, 0, -1, ExpandStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatement_Separator(), theExpressionPackage.getAbstractExpression(), null, "separator", null, 0, 1, ExpandStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatement_Target(), theExpressionPackage.getAbstractExpression(), null, "target", null, 0, 1, ExpandStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getExpandStatement_Definition(), theXpand3Package.getIdentifier(), null, "definition", null, 1, 1, ExpandStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(expressionStatementEClass, ExpressionStatement.class, "ExpressionStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getExpressionStatement_Expression(), theExpressionPackage.getAbstractExpression(), null, "expression", null, 1, 1, ExpressionStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(errorStatementEClass, ErrorStatement.class, "ErrorStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getErrorStatement_Message(), theExpressionPackage.getAbstractExpression(), null, "message", null, 1, 1, ErrorStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(abstractStatementWithBodyEClass, AbstractStatementWithBody.class, "AbstractStatementWithBody", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractStatementWithBody_Body(), this.getAbstractStatement(), null, "body", null, 1, -1, AbstractStatementWithBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(fileStatementEClass, FileStatement.class, "FileStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getFileStatement_FileNameExpression(), theExpressionPackage.getAbstractExpression(), null, "fileNameExpression", null, 0, 1, FileStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFileStatement_OutletNameIdentifier(), theXpand3Package.getIdentifier(), null, "outletNameIdentifier", null, 0, 1, FileStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFileStatement_Once(), ecorePackage.getEBoolean(), "once", null, 0, 1, FileStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(forEachStatementEClass, ForEachStatement.class, "ForEachStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getForEachStatement_Target(), theExpressionPackage.getAbstractExpression(), null, "target", null, 0, 1, ForEachStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForEachStatement_Separator(), theExpressionPackage.getAbstractExpression(), null, "separator", null, 0, 1, ForEachStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForEachStatement_Variable(), theXpand3Package.getIdentifier(), null, "variable", null, 0, 1, ForEachStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getForEachStatement_IteratorName(), theXpand3Package.getIdentifier(), null, "iteratorName", null, 0, 1, ForEachStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(ifStatementEClass, IfStatement.class, "IfStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getIfStatement_Condition(), theExpressionPackage.getAbstractExpression(), null, "condition", null, 0, 1, IfStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getIfStatement_ElseIf(), this.getIfStatement(), null, "elseIf", null, 0, 1, IfStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(letStatementEClass, LetStatement.class, "LetStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLetStatement_VarName(), theXpand3Package.getIdentifier(), null, "varName", null, 0, 1, LetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLetStatement_VarValue(), theExpressionPackage.getAbstractExpression(), null, "varValue", null, 0, 1, LetStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(protectStatementEClass, ProtectStatement.class, "ProtectStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getProtectStatement_CommentStart(), theExpressionPackage.getAbstractExpression(), null, "commentStart", null, 0, 1, ProtectStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProtectStatement_CommentEnd(), theExpressionPackage.getAbstractExpression(), null, "commentEnd", null, 0, 1, ProtectStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getProtectStatement_Id(), theExpressionPackage.getAbstractExpression(), null, "id", null, 0, 1, ProtectStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getProtectStatement_Disable(), ecorePackage.getEBoolean(), "disable", null, 0, 1, ProtectStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(textStatementEClass, TextStatement.class, "TextStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTextStatement_Value(), ecorePackage.getEString(), "value", null, 0, 1, TextStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTextStatement_DeleteLine(), ecorePackage.getEBoolean(), "deleteLine", null, 0, 1, TextStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+	}
+
+} //StatementPackageImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/TextStatementImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/TextStatementImpl.java
new file mode 100644
index 00000000..aef59ad3
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/impl/TextStatementImpl.java
@@ -0,0 +1,220 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TextStatementImpl.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.xpand3.statement.StatementPackage;
+import org.eclipse.xpand3.statement.TextStatement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Text Statement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.TextStatementImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.xpand3.statement.impl.TextStatementImpl#isDeleteLine <em>Delete Line</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TextStatementImpl extends AbstractStatementImpl implements TextStatement {
+	/**
+	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #isDeleteLine() <em>Delete Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDeleteLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean DELETE_LINE_EDEFAULT = false;
+
+	/**
+	 * The cached value of the '{@link #isDeleteLine() <em>Delete Line</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isDeleteLine()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean deleteLine = DELETE_LINE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TextStatementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return StatementPackage.Literals.TEXT_STATEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.TEXT_STATEMENT__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isDeleteLine() {
+		return deleteLine;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDeleteLine(boolean newDeleteLine) {
+		boolean oldDeleteLine = deleteLine;
+		deleteLine = newDeleteLine;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StatementPackage.TEXT_STATEMENT__DELETE_LINE, oldDeleteLine, deleteLine));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case StatementPackage.TEXT_STATEMENT__VALUE:
+				return getValue();
+			case StatementPackage.TEXT_STATEMENT__DELETE_LINE:
+				return isDeleteLine() ? 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 StatementPackage.TEXT_STATEMENT__VALUE:
+				setValue((String)newValue);
+				return;
+			case StatementPackage.TEXT_STATEMENT__DELETE_LINE:
+				setDeleteLine(((Boolean)newValue).booleanValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case StatementPackage.TEXT_STATEMENT__VALUE:
+				setValue(VALUE_EDEFAULT);
+				return;
+			case StatementPackage.TEXT_STATEMENT__DELETE_LINE:
+				setDeleteLine(DELETE_LINE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case StatementPackage.TEXT_STATEMENT__VALUE:
+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+			case StatementPackage.TEXT_STATEMENT__DELETE_LINE:
+				return deleteLine != DELETE_LINE_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(" (value: ");
+		result.append(value);
+		result.append(", deleteLine: ");
+		result.append(deleteLine);
+		result.append(')');
+		return result.toString();
+	}
+
+} //TextStatementImpl
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementAdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementAdapterFactory.java
new file mode 100644
index 00000000..af850af5
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementAdapterFactory.java
@@ -0,0 +1,324 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementAdapterFactory.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.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.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.statement.*;
+
+/**
+ * <!-- 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.xpand3.statement.StatementPackage
+ * @generated
+ */
+public class StatementAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StatementPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StatementAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = StatementPackage.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 the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected StatementSwitch<Adapter> modelSwitch =
+		new StatementSwitch<Adapter>() {
+			@Override
+			public Adapter caseAbstractStatement(AbstractStatement object) {
+				return createAbstractStatementAdapter();
+			}
+			@Override
+			public Adapter caseExpandStatement(ExpandStatement object) {
+				return createExpandStatementAdapter();
+			}
+			@Override
+			public Adapter caseExpressionStatement(ExpressionStatement object) {
+				return createExpressionStatementAdapter();
+			}
+			@Override
+			public Adapter caseErrorStatement(ErrorStatement object) {
+				return createErrorStatementAdapter();
+			}
+			@Override
+			public Adapter caseAbstractStatementWithBody(AbstractStatementWithBody object) {
+				return createAbstractStatementWithBodyAdapter();
+			}
+			@Override
+			public Adapter caseFileStatement(FileStatement object) {
+				return createFileStatementAdapter();
+			}
+			@Override
+			public Adapter caseForEachStatement(ForEachStatement object) {
+				return createForEachStatementAdapter();
+			}
+			@Override
+			public Adapter caseIfStatement(IfStatement object) {
+				return createIfStatementAdapter();
+			}
+			@Override
+			public Adapter caseLetStatement(LetStatement object) {
+				return createLetStatementAdapter();
+			}
+			@Override
+			public Adapter caseProtectStatement(ProtectStatement object) {
+				return createProtectStatementAdapter();
+			}
+			@Override
+			public Adapter caseTextStatement(TextStatement object) {
+				return createTextStatementAdapter();
+			}
+			@Override
+			public Adapter caseSyntaxElement(SyntaxElement object) {
+				return createSyntaxElementAdapter();
+			}
+			@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.xpand3.statement.AbstractStatement <em>Abstract Statement</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.xpand3.statement.AbstractStatement
+	 * @generated
+	 */
+	public Adapter createAbstractStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.ExpandStatement <em>Expand Statement</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.xpand3.statement.ExpandStatement
+	 * @generated
+	 */
+	public Adapter createExpandStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.ExpressionStatement <em>Expression Statement</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.xpand3.statement.ExpressionStatement
+	 * @generated
+	 */
+	public Adapter createExpressionStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.ErrorStatement <em>Error Statement</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.xpand3.statement.ErrorStatement
+	 * @generated
+	 */
+	public Adapter createErrorStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.AbstractStatementWithBody <em>Abstract Statement With Body</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.xpand3.statement.AbstractStatementWithBody
+	 * @generated
+	 */
+	public Adapter createAbstractStatementWithBodyAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.FileStatement <em>File Statement</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.xpand3.statement.FileStatement
+	 * @generated
+	 */
+	public Adapter createFileStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.ForEachStatement <em>For Each Statement</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.xpand3.statement.ForEachStatement
+	 * @generated
+	 */
+	public Adapter createForEachStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.IfStatement <em>If Statement</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.xpand3.statement.IfStatement
+	 * @generated
+	 */
+	public Adapter createIfStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.LetStatement <em>Let Statement</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.xpand3.statement.LetStatement
+	 * @generated
+	 */
+	public Adapter createLetStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.ProtectStatement <em>Protect Statement</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.xpand3.statement.ProtectStatement
+	 * @generated
+	 */
+	public Adapter createProtectStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.statement.TextStatement <em>Text Statement</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.xpand3.statement.TextStatement
+	 * @generated
+	 */
+	public Adapter createTextStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SyntaxElement <em>Syntax Element</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.xpand3.SyntaxElement
+	 * @generated
+	 */
+	public Adapter createSyntaxElementAdapter() {
+		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;
+	}
+
+} //StatementAdapterFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementSwitch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementSwitch.java
new file mode 100644
index 00000000..10d6dc62
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/util/StatementSwitch.java
@@ -0,0 +1,383 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: StatementSwitch.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xpand3.SyntaxElement;
+
+import org.eclipse.xpand3.statement.*;
+
+/**
+ * <!-- 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.xpand3.statement.StatementPackage
+ * @generated
+ */
+public class StatementSwitch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static StatementPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public StatementSwitch() {
+		if (modelPackage == null) {
+			modelPackage = StatementPackage.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 StatementPackage.ABSTRACT_STATEMENT: {
+				AbstractStatement abstractStatement = (AbstractStatement)theEObject;
+				T result = caseAbstractStatement(abstractStatement);
+				if (result == null) result = caseSyntaxElement(abstractStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.EXPAND_STATEMENT: {
+				ExpandStatement expandStatement = (ExpandStatement)theEObject;
+				T result = caseExpandStatement(expandStatement);
+				if (result == null) result = caseAbstractStatement(expandStatement);
+				if (result == null) result = caseSyntaxElement(expandStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.EXPRESSION_STATEMENT: {
+				ExpressionStatement expressionStatement = (ExpressionStatement)theEObject;
+				T result = caseExpressionStatement(expressionStatement);
+				if (result == null) result = caseAbstractStatement(expressionStatement);
+				if (result == null) result = caseSyntaxElement(expressionStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.ERROR_STATEMENT: {
+				ErrorStatement errorStatement = (ErrorStatement)theEObject;
+				T result = caseErrorStatement(errorStatement);
+				if (result == null) result = caseAbstractStatement(errorStatement);
+				if (result == null) result = caseSyntaxElement(errorStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.ABSTRACT_STATEMENT_WITH_BODY: {
+				AbstractStatementWithBody abstractStatementWithBody = (AbstractStatementWithBody)theEObject;
+				T result = caseAbstractStatementWithBody(abstractStatementWithBody);
+				if (result == null) result = caseAbstractStatement(abstractStatementWithBody);
+				if (result == null) result = caseSyntaxElement(abstractStatementWithBody);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.FILE_STATEMENT: {
+				FileStatement fileStatement = (FileStatement)theEObject;
+				T result = caseFileStatement(fileStatement);
+				if (result == null) result = caseAbstractStatementWithBody(fileStatement);
+				if (result == null) result = caseAbstractStatement(fileStatement);
+				if (result == null) result = caseSyntaxElement(fileStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.FOR_EACH_STATEMENT: {
+				ForEachStatement forEachStatement = (ForEachStatement)theEObject;
+				T result = caseForEachStatement(forEachStatement);
+				if (result == null) result = caseAbstractStatementWithBody(forEachStatement);
+				if (result == null) result = caseAbstractStatement(forEachStatement);
+				if (result == null) result = caseSyntaxElement(forEachStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.IF_STATEMENT: {
+				IfStatement ifStatement = (IfStatement)theEObject;
+				T result = caseIfStatement(ifStatement);
+				if (result == null) result = caseAbstractStatementWithBody(ifStatement);
+				if (result == null) result = caseAbstractStatement(ifStatement);
+				if (result == null) result = caseSyntaxElement(ifStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.LET_STATEMENT: {
+				LetStatement letStatement = (LetStatement)theEObject;
+				T result = caseLetStatement(letStatement);
+				if (result == null) result = caseAbstractStatementWithBody(letStatement);
+				if (result == null) result = caseAbstractStatement(letStatement);
+				if (result == null) result = caseSyntaxElement(letStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.PROTECT_STATEMENT: {
+				ProtectStatement protectStatement = (ProtectStatement)theEObject;
+				T result = caseProtectStatement(protectStatement);
+				if (result == null) result = caseAbstractStatementWithBody(protectStatement);
+				if (result == null) result = caseAbstractStatement(protectStatement);
+				if (result == null) result = caseSyntaxElement(protectStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case StatementPackage.TEXT_STATEMENT: {
+				TextStatement textStatement = (TextStatement)theEObject;
+				T result = caseTextStatement(textStatement);
+				if (result == null) result = caseAbstractStatement(textStatement);
+				if (result == null) result = caseSyntaxElement(textStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Statement</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 Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractStatement(AbstractStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Expand Statement</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>Expand Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExpandStatement(ExpandStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Expression Statement</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>Expression Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseExpressionStatement(ExpressionStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Error Statement</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>Error Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseErrorStatement(ErrorStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Abstract Statement With Body</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 Statement With Body</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseAbstractStatementWithBody(AbstractStatementWithBody object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>File Statement</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>File Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFileStatement(FileStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>For Each Statement</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>For Each Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseForEachStatement(ForEachStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>If Statement</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>If Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIfStatement(IfStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Let Statement</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>Let Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseLetStatement(LetStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Protect Statement</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>Protect Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseProtectStatement(ProtectStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Text Statement</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>Text Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTextStatement(TextStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Syntax Element</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>Syntax Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSyntaxElement(SyntaxElement 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;
+	}
+
+} //StatementSwitch
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java
new file mode 100644
index 00000000..704bd657
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java
@@ -0,0 +1,19 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.AbstractStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractStatementValidator {
+	boolean validate();
+
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java
new file mode 100644
index 00000000..f32575bd
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: AbstractStatementWithBodyValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.statement.AbstractStatement;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.AbstractStatementWithBody}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface AbstractStatementWithBodyValidator {
+	boolean validate();
+
+	boolean validateBody(EList<AbstractStatement> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java
new file mode 100644
index 00000000..b8359615
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ErrorStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.ErrorStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ErrorStatementValidator {
+	boolean validate();
+
+	boolean validateMessage(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java
new file mode 100644
index 00000000..0bb80dbe
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java
@@ -0,0 +1,29 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpandStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.ExpandStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ExpandStatementValidator {
+	boolean validate();
+
+	boolean validateForeach(boolean value);
+	boolean validateParameters(EList<AbstractExpression> value);
+	boolean validateSeparator(AbstractExpression value);
+	boolean validateTarget(AbstractExpression value);
+	boolean validateDefinition(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java
new file mode 100644
index 00000000..12887d17
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ExpressionStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.ExpressionStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ExpressionStatementValidator {
+	boolean validate();
+
+	boolean validateExpression(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java
new file mode 100644
index 00000000..6b1fbb95
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java
@@ -0,0 +1,25 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FileStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.FileStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface FileStatementValidator {
+	boolean validate();
+
+	boolean validateFileNameExpression(AbstractExpression value);
+	boolean validateOutletNameIdentifier(Identifier value);
+	boolean validateOnce(boolean value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java
new file mode 100644
index 00000000..cb3658d9
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java
@@ -0,0 +1,26 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ForEachStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.ForEachStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ForEachStatementValidator {
+	boolean validate();
+
+	boolean validateTarget(AbstractExpression value);
+	boolean validateSeparator(AbstractExpression value);
+	boolean validateVariable(Identifier value);
+	boolean validateIteratorName(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java
new file mode 100644
index 00000000..af7eb601
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IfStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+import org.eclipse.xpand3.statement.IfStatement;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.IfStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface IfStatementValidator {
+	boolean validate();
+
+	boolean validateCondition(AbstractExpression value);
+	boolean validateElseIf(IfStatement value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java
new file mode 100644
index 00000000..c11d61ad
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: LetStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.LetStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface LetStatementValidator {
+	boolean validate();
+
+	boolean validateVarName(Identifier value);
+	boolean validateVarValue(AbstractExpression value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java
new file mode 100644
index 00000000..be5ed100
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java
@@ -0,0 +1,24 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ProtectStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+import org.eclipse.xpand3.expression.AbstractExpression;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.ProtectStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ProtectStatementValidator {
+	boolean validate();
+
+	boolean validateCommentStart(AbstractExpression value);
+	boolean validateCommentEnd(AbstractExpression value);
+	boolean validateId(AbstractExpression value);
+	boolean validateDisable(boolean value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java
new file mode 100644
index 00000000..bb4eb928
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java
@@ -0,0 +1,21 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TextStatementValidator.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.statement.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.statement.TextStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface TextStatementValidator {
+	boolean validate();
+
+	boolean validateValue(String value);
+	boolean validateDeleteLine(boolean value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
new file mode 100644
index 00000000..aaa6bccb
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
@@ -0,0 +1,196 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3AdapterFactory.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.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.xpand3.*;
+
+/**
+ * <!-- 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.xpand3.Xpand3Package
+ * @generated
+ */
+public class Xpand3AdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static Xpand3Package modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Xpand3AdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = Xpand3Package.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 the delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Xpand3Switch<Adapter> modelSwitch =
+		new Xpand3Switch<Adapter>() {
+			@Override
+			public Adapter caseSyntaxElement(SyntaxElement object) {
+				return createSyntaxElementAdapter();
+			}
+			@Override
+			public Adapter caseFile(File object) {
+				return createFileAdapter();
+			}
+			@Override
+			public Adapter caseImportStatement(ImportStatement object) {
+				return createImportStatementAdapter();
+			}
+			@Override
+			public Adapter caseIdentifier(Identifier object) {
+				return createIdentifierAdapter();
+			}
+			@Override
+			public Adapter caseDeclaredParameter(DeclaredParameter object) {
+				return createDeclaredParameterAdapter();
+			}
+			@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.xpand3.SyntaxElement <em>Syntax Element</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.xpand3.SyntaxElement
+	 * @generated
+	 */
+	public Adapter createSyntaxElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.File <em>File</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.xpand3.File
+	 * @generated
+	 */
+	public Adapter createFileAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.ImportStatement <em>Import Statement</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.xpand3.ImportStatement
+	 * @generated
+	 */
+	public Adapter createImportStatementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.Identifier <em>Identifier</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.xpand3.Identifier
+	 * @generated
+	 */
+	public Adapter createIdentifierAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</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.xpand3.DeclaredParameter
+	 * @generated
+	 */
+	public Adapter createDeclaredParameterAdapter() {
+		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;
+	}
+
+} //Xpand3AdapterFactory
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
new file mode 100644
index 00000000..fd460faa
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
@@ -0,0 +1,218 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: Xpand3Switch.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.util;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.xpand3.*;
+
+/**
+ * <!-- 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.xpand3.Xpand3Package
+ * @generated
+ */
+public class Xpand3Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static Xpand3Package modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Xpand3Switch() {
+		if (modelPackage == null) {
+			modelPackage = Xpand3Package.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 Xpand3Package.SYNTAX_ELEMENT: {
+				SyntaxElement syntaxElement = (SyntaxElement)theEObject;
+				T result = caseSyntaxElement(syntaxElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case Xpand3Package.FILE: {
+				File file = (File)theEObject;
+				T result = caseFile(file);
+				if (result == null) result = caseSyntaxElement(file);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case Xpand3Package.IMPORT_STATEMENT: {
+				ImportStatement importStatement = (ImportStatement)theEObject;
+				T result = caseImportStatement(importStatement);
+				if (result == null) result = caseSyntaxElement(importStatement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case Xpand3Package.IDENTIFIER: {
+				Identifier identifier = (Identifier)theEObject;
+				T result = caseIdentifier(identifier);
+				if (result == null) result = caseSyntaxElement(identifier);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case Xpand3Package.DECLARED_PARAMETER: {
+				DeclaredParameter declaredParameter = (DeclaredParameter)theEObject;
+				T result = caseDeclaredParameter(declaredParameter);
+				if (result == null) result = caseSyntaxElement(declaredParameter);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Syntax Element</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>Syntax Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSyntaxElement(SyntaxElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>File</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>File</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseFile(File object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Import Statement</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>Import Statement</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseImportStatement(ImportStatement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Identifier</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>Identifier</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseIdentifier(Identifier object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Declared Parameter</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>Declared Parameter</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDeclaredParameter(DeclaredParameter 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;
+	}
+
+} //Xpand3Switch
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java
new file mode 100644
index 00000000..aeb78fc2
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: DeclaredParameterValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.DeclaredParameter}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface DeclaredParameterValidator {
+	boolean validate();
+
+	boolean validateName(Identifier value);
+	boolean validateType(Identifier value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/FileValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/FileValidator.java
new file mode 100644
index 00000000..72389048
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/FileValidator.java
@@ -0,0 +1,26 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: FileValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.validation;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.xpand3.ImportStatement;
+
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.File}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface FileValidator {
+	boolean validate();
+
+	boolean validateImports(EList<ImportStatement> value);
+	boolean validateDeclarations(EList<AbstractDeclaration> value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java
new file mode 100644
index 00000000..d2a6552a
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java
@@ -0,0 +1,20 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: IdentifierValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.Identifier}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface IdentifierValidator {
+	boolean validate();
+
+	boolean validateValue(String value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java
new file mode 100644
index 00000000..6fbd9676
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java
@@ -0,0 +1,22 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: ImportStatementValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.validation;
+
+import org.eclipse.xpand3.Identifier;
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.ImportStatement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface ImportStatementValidator {
+	boolean validate();
+
+	boolean validateImportedId(Identifier value);
+	boolean validateExported(boolean value);
+}
diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java
new file mode 100644
index 00000000..e88306b1
--- /dev/null
+++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java
@@ -0,0 +1,23 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: SyntaxElementValidator.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $
+ */
+package org.eclipse.xpand3.validation;
+
+
+/**
+ * A sample validator interface for {@link org.eclipse.xpand3.SyntaxElement}.
+ * This doesn't really do anything, and it's not a real EMF artifact.
+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
+ */
+public interface SyntaxElementValidator {
+	boolean validate();
+
+	boolean validateLine(int value);
+	boolean validateStart(int value);
+	boolean validateEnd(int value);
+	boolean validateFileName(String value);
+}