diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression.java
deleted file mode 100644
index 73332de19c7c1212245cf01799d7ae1724ab249d..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression.java
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-/* First created by JCasGen Wed Jul 19 10:01:06 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Wed Jul 19 10:06:43 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Expression extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Expression.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Expression() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Expression(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Expression(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Expression(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: ExpressionID
-
-  /** getter for ExpressionID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getExpressionID() {
-    if (Expression_Type.featOkTst && ((Expression_Type)jcasType).casFeat_ExpressionID == null)
-      jcasType.jcas.throwFeatMissing("ExpressionID", "de.idsma.rw.Expression");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Expression_Type)jcasType).casFeatCode_ExpressionID);}
-    
-  /** setter for ExpressionID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setExpressionID(String v) {
-    if (Expression_Type.featOkTst && ((Expression_Type)jcasType).casFeat_ExpressionID == null)
-      jcasType.jcas.throwFeatMissing("ExpressionID", "de.idsma.rw.Expression");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Expression_Type)jcasType).casFeatCode_ExpressionID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Expression
-
-  /** getter for Expression - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getExpression() {
-    if (Expression_Type.featOkTst && ((Expression_Type)jcasType).casFeat_Expression == null)
-      jcasType.jcas.throwFeatMissing("Expression", "de.idsma.rw.Expression");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Expression_Type)jcasType).casFeatCode_Expression);}
-    
-  /** setter for Expression - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setExpression(String v) {
-    if (Expression_Type.featOkTst && ((Expression_Type)jcasType).casFeat_Expression == null)
-      jcasType.jcas.throwFeatMissing("Expression", "de.idsma.rw.Expression");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Expression_Type)jcasType).casFeatCode_Expression, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression_Type.java
deleted file mode 100644
index 0f67a39601d7993db6668a680f7d6ff68fce24ef..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Expression_Type.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* First created by JCasGen Wed Jul 19 10:01:06 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Wed Jul 19 10:06:43 CEST 2017
- * @generated */
-public class Expression_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Expression.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Expression");
- 
-  /** @generated */
-  final Feature casFeat_ExpressionID;
-  /** @generated */
-  final int     casFeatCode_ExpressionID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getExpressionID(int addr) {
-        if (featOkTst && casFeat_ExpressionID == null)
-      jcas.throwFeatMissing("ExpressionID", "de.idsma.rw.Expression");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_ExpressionID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setExpressionID(int addr, String v) {
-        if (featOkTst && casFeat_ExpressionID == null)
-      jcas.throwFeatMissing("ExpressionID", "de.idsma.rw.Expression");
-    ll_cas.ll_setStringValue(addr, casFeatCode_ExpressionID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Expression;
-  /** @generated */
-  final int     casFeatCode_Expression;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getExpression(int addr) {
-        if (featOkTst && casFeat_Expression == null)
-      jcas.throwFeatMissing("Expression", "de.idsma.rw.Expression");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Expression);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setExpression(int addr, String v) {
-        if (featOkTst && casFeat_Expression == null)
-      jcas.throwFeatMissing("Expression", "de.idsma.rw.Expression");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Expression, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Expression_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_ExpressionID = jcas.getRequiredFeatureDE(casType, "ExpressionID", "uima.cas.String", featOkTst);
-    casFeatCode_ExpressionID  = (null == casFeat_ExpressionID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_ExpressionID).getCode();
-
- 
-    casFeat_Expression = jcas.getRequiredFeatureDE(casType, "Expression", "uima.cas.String", featOkTst);
-    casFeatCode_Expression  = (null == casFeat_Expression) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Expression).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame.java
deleted file mode 100644
index 07f12916140da8cbcad57b12f30a23a599021896..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame.java
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Frame extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Frame.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Frame() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Frame(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Frame(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Frame(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: Pos
-
-  /** getter for Pos - gets - start
-- mid
-- end
-   * @generated
-   * @return value of the feature 
-   */
-  public String getPos() {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_Pos == null)
-      jcasType.jcas.throwFeatMissing("Pos", "de.idsma.rw.Frame");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Frame_Type)jcasType).casFeatCode_Pos);}
-    
-  /** setter for Pos - sets - start
-- mid
-- end 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setPos(String v) {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_Pos == null)
-      jcasType.jcas.throwFeatMissing("Pos", "de.idsma.rw.Frame");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Frame_Type)jcasType).casFeatCode_Pos, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Frame
-
-  /** getter for Frame - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getFrame() {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_Frame == null)
-      jcasType.jcas.throwFeatMissing("Frame", "de.idsma.rw.Frame");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Frame_Type)jcasType).casFeatCode_Frame);}
-    
-  /** setter for Frame - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setFrame(String v) {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_Frame == null)
-      jcasType.jcas.throwFeatMissing("Frame", "de.idsma.rw.Frame");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Frame_Type)jcasType).casFeatCode_Frame, v);}    
-   
-    
-  //*--------------*
-  //* Feature: FrameID
-
-  /** getter for FrameID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getFrameID() {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_FrameID == null)
-      jcasType.jcas.throwFeatMissing("FrameID", "de.idsma.rw.Frame");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Frame_Type)jcasType).casFeatCode_FrameID);}
-    
-  /** setter for FrameID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setFrameID(String v) {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_FrameID == null)
-      jcasType.jcas.throwFeatMissing("FrameID", "de.idsma.rw.Frame");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Frame_Type)jcasType).casFeatCode_FrameID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: FrameNote
-
-  /** getter for FrameNote - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getFrameNote() {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_FrameNote == null)
-      jcasType.jcas.throwFeatMissing("FrameNote", "de.idsma.rw.Frame");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Frame_Type)jcasType).casFeatCode_FrameNote);}
-    
-  /** setter for FrameNote - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setFrameNote(String v) {
-    if (Frame_Type.featOkTst && ((Frame_Type)jcasType).casFeat_FrameNote == null)
-      jcasType.jcas.throwFeatMissing("FrameNote", "de.idsma.rw.Frame");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Frame_Type)jcasType).casFeatCode_FrameNote, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame_Type.java
deleted file mode 100644
index f4f94e30027f1b90a6cc7fb5674a8233064c4889..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Frame_Type.java
+++ /dev/null
@@ -1,153 +0,0 @@
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * @generated */
-public class Frame_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Frame.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Frame");
- 
-  /** @generated */
-  final Feature casFeat_Pos;
-  /** @generated */
-  final int     casFeatCode_Pos;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getPos(int addr) {
-        if (featOkTst && casFeat_Pos == null)
-      jcas.throwFeatMissing("Pos", "de.idsma.rw.Frame");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Pos);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setPos(int addr, String v) {
-        if (featOkTst && casFeat_Pos == null)
-      jcas.throwFeatMissing("Pos", "de.idsma.rw.Frame");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Pos, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Frame;
-  /** @generated */
-  final int     casFeatCode_Frame;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getFrame(int addr) {
-        if (featOkTst && casFeat_Frame == null)
-      jcas.throwFeatMissing("Frame", "de.idsma.rw.Frame");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Frame);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setFrame(int addr, String v) {
-        if (featOkTst && casFeat_Frame == null)
-      jcas.throwFeatMissing("Frame", "de.idsma.rw.Frame");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Frame, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_FrameID;
-  /** @generated */
-  final int     casFeatCode_FrameID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getFrameID(int addr) {
-        if (featOkTst && casFeat_FrameID == null)
-      jcas.throwFeatMissing("FrameID", "de.idsma.rw.Frame");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_FrameID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setFrameID(int addr, String v) {
-        if (featOkTst && casFeat_FrameID == null)
-      jcas.throwFeatMissing("FrameID", "de.idsma.rw.Frame");
-    ll_cas.ll_setStringValue(addr, casFeatCode_FrameID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_FrameNote;
-  /** @generated */
-  final int     casFeatCode_FrameNote;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getFrameNote(int addr) {
-        if (featOkTst && casFeat_FrameNote == null)
-      jcas.throwFeatMissing("FrameNote", "de.idsma.rw.Frame");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_FrameNote);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setFrameNote(int addr, String v) {
-        if (featOkTst && casFeat_FrameNote == null)
-      jcas.throwFeatMissing("FrameNote", "de.idsma.rw.Frame");
-    ll_cas.ll_setStringValue(addr, casFeatCode_FrameNote, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Frame_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_Pos = jcas.getRequiredFeatureDE(casType, "Pos", "uima.cas.String", featOkTst);
-    casFeatCode_Pos  = (null == casFeat_Pos) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Pos).getCode();
-
- 
-    casFeat_Frame = jcas.getRequiredFeatureDE(casType, "Frame", "uima.cas.String", featOkTst);
-    casFeatCode_Frame  = (null == casFeat_Frame) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Frame).getCode();
-
- 
-    casFeat_FrameID = jcas.getRequiredFeatureDE(casType, "FrameID", "uima.cas.String", featOkTst);
-    casFeatCode_FrameID  = (null == casFeat_FrameID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_FrameID).getCode();
-
- 
-    casFeat_FrameNote = jcas.getRequiredFeatureDE(casType, "FrameNote", "uima.cas.String", featOkTst);
-    casFeatCode_FrameNote  = (null == casFeat_FrameNote) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_FrameNote).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression.java
deleted file mode 100644
index 50fa3c9c2b709144495af62ec9f84a67960e38ef..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression.java
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-/* First created by JCasGen Thu Jul 20 09:38:50 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class IntExpression extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(IntExpression.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected IntExpression() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public IntExpression(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public IntExpression(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public IntExpression(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: IntExpressionID
-
-  /** getter for IntExpressionID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getIntExpressionID() {
-    if (IntExpression_Type.featOkTst && ((IntExpression_Type)jcasType).casFeat_IntExpressionID == null)
-      jcasType.jcas.throwFeatMissing("IntExpressionID", "de.idsma.rw.IntExpression");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((IntExpression_Type)jcasType).casFeatCode_IntExpressionID);}
-    
-  /** setter for IntExpressionID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setIntExpressionID(String v) {
-    if (IntExpression_Type.featOkTst && ((IntExpression_Type)jcasType).casFeat_IntExpressionID == null)
-      jcasType.jcas.throwFeatMissing("IntExpressionID", "de.idsma.rw.IntExpression");
-    jcasType.ll_cas.ll_setStringValue(addr, ((IntExpression_Type)jcasType).casFeatCode_IntExpressionID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: IntExpression
-
-  /** getter for IntExpression - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getIntExpression() {
-    if (IntExpression_Type.featOkTst && ((IntExpression_Type)jcasType).casFeat_IntExpression == null)
-      jcasType.jcas.throwFeatMissing("IntExpression", "de.idsma.rw.IntExpression");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((IntExpression_Type)jcasType).casFeatCode_IntExpression);}
-    
-  /** setter for IntExpression - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setIntExpression(String v) {
-    if (IntExpression_Type.featOkTst && ((IntExpression_Type)jcasType).casFeat_IntExpression == null)
-      jcasType.jcas.throwFeatMissing("IntExpression", "de.idsma.rw.IntExpression");
-    jcasType.ll_cas.ll_setStringValue(addr, ((IntExpression_Type)jcasType).casFeatCode_IntExpression, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression_Type.java
deleted file mode 100644
index 108f7f52545ad2548478f0f571eb45f73175190f..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/IntExpression_Type.java
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* First created by JCasGen Thu Jul 20 09:38:50 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * @generated */
-public class IntExpression_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = IntExpression.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.IntExpression");
- 
-  /** @generated */
-  final Feature casFeat_IntExpressionID;
-  /** @generated */
-  final int     casFeatCode_IntExpressionID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getIntExpressionID(int addr) {
-        if (featOkTst && casFeat_IntExpressionID == null)
-      jcas.throwFeatMissing("IntExpressionID", "de.idsma.rw.IntExpression");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_IntExpressionID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setIntExpressionID(int addr, String v) {
-        if (featOkTst && casFeat_IntExpressionID == null)
-      jcas.throwFeatMissing("IntExpressionID", "de.idsma.rw.IntExpression");
-    ll_cas.ll_setStringValue(addr, casFeatCode_IntExpressionID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_IntExpression;
-  /** @generated */
-  final int     casFeatCode_IntExpression;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getIntExpression(int addr) {
-        if (featOkTst && casFeat_IntExpression == null)
-      jcas.throwFeatMissing("IntExpression", "de.idsma.rw.IntExpression");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_IntExpression);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setIntExpression(int addr, String v) {
-        if (featOkTst && casFeat_IntExpression == null)
-      jcas.throwFeatMissing("IntExpression", "de.idsma.rw.IntExpression");
-    ll_cas.ll_setStringValue(addr, casFeatCode_IntExpression, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public IntExpression_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_IntExpressionID = jcas.getRequiredFeatureDE(casType, "IntExpressionID", "uima.cas.String", featOkTst);
-    casFeatCode_IntExpressionID  = (null == casFeat_IntExpressionID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_IntExpressionID).getCode();
-
- 
-    casFeat_IntExpression = jcas.getRequiredFeatureDE(casType, "IntExpression", "uima.cas.String", featOkTst);
-    casFeatCode_IntExpression  = (null == casFeat_IntExpression) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_IntExpression).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata.java
deleted file mode 100644
index 73916bc11aff93e1161b585003ded9054957798d..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata.java
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Metadata extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Metadata.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Metadata() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Metadata(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Metadata(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Metadata(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: Name
-
-  /** getter for Name - gets abrunner
-cpeterek
-ttu
-tvalta
-lweimer
-   * @generated
-   * @return value of the feature 
-   */
-  public String getName() {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Name == null)
-      jcasType.jcas.throwFeatMissing("Name", "de.idsma.rw.Metadata");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Name);}
-    
-  /** setter for Name - sets abrunner
-cpeterek
-ttu
-tvalta
-lweimer 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setName(String v) {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Name == null)
-      jcasType.jcas.throwFeatMissing("Name", "de.idsma.rw.Metadata");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Name, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Timestamp
-
-  /** getter for Timestamp - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getTimestamp() {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Timestamp == null)
-      jcasType.jcas.throwFeatMissing("Timestamp", "de.idsma.rw.Metadata");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Timestamp);}
-    
-  /** setter for Timestamp - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setTimestamp(String v) {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Timestamp == null)
-      jcasType.jcas.throwFeatMissing("Timestamp", "de.idsma.rw.Metadata");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Timestamp, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Version
-
-  /** getter for Version - gets aXsX
-a = annotatorVersion
-s = schemeVersion
-   * @generated
-   * @return value of the feature 
-   */
-  public String getVersion() {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Version == null)
-      jcasType.jcas.throwFeatMissing("Version", "de.idsma.rw.Metadata");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Version);}
-    
-  /** setter for Version - sets aXsX
-a = annotatorVersion
-s = schemeVersion 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setVersion(String v) {
-    if (Metadata_Type.featOkTst && ((Metadata_Type)jcasType).casFeat_Version == null)
-      jcasType.jcas.throwFeatMissing("Version", "de.idsma.rw.Metadata");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Metadata_Type)jcasType).casFeatCode_Version, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata_Type.java
deleted file mode 100644
index b164b0a5c14b9362ec3375c1b66ed00c981f1f64..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Metadata_Type.java
+++ /dev/null
@@ -1,125 +0,0 @@
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * @generated */
-public class Metadata_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Metadata.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Metadata");
- 
-  /** @generated */
-  final Feature casFeat_Name;
-  /** @generated */
-  final int     casFeatCode_Name;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getName(int addr) {
-        if (featOkTst && casFeat_Name == null)
-      jcas.throwFeatMissing("Name", "de.idsma.rw.Metadata");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Name);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setName(int addr, String v) {
-        if (featOkTst && casFeat_Name == null)
-      jcas.throwFeatMissing("Name", "de.idsma.rw.Metadata");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Name, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Timestamp;
-  /** @generated */
-  final int     casFeatCode_Timestamp;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getTimestamp(int addr) {
-        if (featOkTst && casFeat_Timestamp == null)
-      jcas.throwFeatMissing("Timestamp", "de.idsma.rw.Metadata");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Timestamp);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setTimestamp(int addr, String v) {
-        if (featOkTst && casFeat_Timestamp == null)
-      jcas.throwFeatMissing("Timestamp", "de.idsma.rw.Metadata");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Timestamp, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Version;
-  /** @generated */
-  final int     casFeatCode_Version;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getVersion(int addr) {
-        if (featOkTst && casFeat_Version == null)
-      jcas.throwFeatMissing("Version", "de.idsma.rw.Metadata");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Version);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setVersion(int addr, String v) {
-        if (featOkTst && casFeat_Version == null)
-      jcas.throwFeatMissing("Version", "de.idsma.rw.Metadata");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Version, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Metadata_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_Name = jcas.getRequiredFeatureDE(casType, "Name", "uima.cas.String", featOkTst);
-    casFeatCode_Name  = (null == casFeat_Name) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Name).getCode();
-
- 
-    casFeat_Timestamp = jcas.getRequiredFeatureDE(casType, "Timestamp", "uima.cas.String", featOkTst);
-    casFeatCode_Timestamp  = (null == casFeat_Timestamp) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Timestamp).getCode();
-
- 
-    casFeat_Version = jcas.getRequiredFeatureDE(casType, "Version", "uima.cas.String", featOkTst);
-    casFeatCode_Version  = (null == casFeat_Version) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Version).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker.java
deleted file mode 100644
index 3fead65054f6492ccbe0460e04b0109ba272c34d..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Speaker extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Speaker.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Speaker() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Speaker(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Speaker(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Speaker(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
-  //*--------------*
-  //* Feature: SpeakerID
-
-  /** getter for SpeakerID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getSpeakerID() {
-    if (Speaker_Type.featOkTst && ((Speaker_Type)jcasType).casFeat_SpeakerID == null)
-      jcasType.jcas.throwFeatMissing("SpeakerID", "de.idsma.rw.Speaker");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Speaker_Type)jcasType).casFeatCode_SpeakerID);}
-    
-  /** setter for SpeakerID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setSpeakerID(String v) {
-    if (Speaker_Type.featOkTst && ((Speaker_Type)jcasType).casFeat_SpeakerID == null)
-      jcasType.jcas.throwFeatMissing("SpeakerID", "de.idsma.rw.Speaker");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Speaker_Type)jcasType).casFeatCode_SpeakerID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Speaker
-
-  /** getter for Speaker - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getSpeaker() {
-    if (Speaker_Type.featOkTst && ((Speaker_Type)jcasType).casFeat_Speaker == null)
-      jcasType.jcas.throwFeatMissing("Speaker", "de.idsma.rw.Speaker");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Speaker_Type)jcasType).casFeatCode_Speaker);}
-    
-  /** setter for Speaker - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setSpeaker(String v) {
-    if (Speaker_Type.featOkTst && ((Speaker_Type)jcasType).casFeat_Speaker == null)
-      jcasType.jcas.throwFeatMissing("Speaker", "de.idsma.rw.Speaker");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Speaker_Type)jcasType).casFeatCode_Speaker, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker_Type.java
deleted file mode 100644
index 535ebc0d8f7cb47b42b2d33a70f9772e74d383ea..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speaker_Type.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * @generated */
-public class Speaker_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Speaker.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Speaker");
-
-
-
-  /** @generated */
-  final Feature casFeat_SpeakerID;
-  /** @generated */
-  final int     casFeatCode_SpeakerID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getSpeakerID(int addr) {
-        if (featOkTst && casFeat_SpeakerID == null)
-      jcas.throwFeatMissing("SpeakerID", "de.idsma.rw.Speaker");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_SpeakerID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setSpeakerID(int addr, String v) {
-        if (featOkTst && casFeat_SpeakerID == null)
-      jcas.throwFeatMissing("SpeakerID", "de.idsma.rw.Speaker");
-    ll_cas.ll_setStringValue(addr, casFeatCode_SpeakerID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Speaker;
-  /** @generated */
-  final int     casFeatCode_Speaker;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getSpeaker(int addr) {
-        if (featOkTst && casFeat_Speaker == null)
-      jcas.throwFeatMissing("Speaker", "de.idsma.rw.Speaker");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Speaker);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setSpeaker(int addr, String v) {
-        if (featOkTst && casFeat_Speaker == null)
-      jcas.throwFeatMissing("Speaker", "de.idsma.rw.Speaker");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Speaker, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Speaker_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_SpeakerID = jcas.getRequiredFeatureDE(casType, "SpeakerID", "uima.cas.String", featOkTst);
-    casFeatCode_SpeakerID  = (null == casFeat_SpeakerID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_SpeakerID).getCode();
-
- 
-    casFeat_Speaker = jcas.getRequiredFeatureDE(casType, "Speaker", "uima.cas.String", featOkTst);
-    casFeatCode_Speaker  = (null == casFeat_Speaker) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Speaker).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech.java
deleted file mode 100644
index aa4485e10cf1b007286feafebdc403303993d7af..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech.java
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen_maven/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Speech extends Stwr {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Speech.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Speech() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Speech(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Speech(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Speech(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
-}
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech_Type.java
deleted file mode 100644
index 9da8f1bce70b0cd445db221551530c53e2c31bcc..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Speech_Type.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * @generated */
-public class Speech_Type extends Stwr_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Speech.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Speech");
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Speech_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr.java
deleted file mode 100644
index d7d614e7fef859735886318c410ada9e3c314cf2..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr.java
+++ /dev/null
@@ -1,338 +0,0 @@
-
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.cas.StringList;
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Stwr extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Stwr.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Stwr() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Stwr(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Stwr(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Stwr(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: Medium
-
-  /** getter for Medium - gets - speech,
-- thought,
-- writing
-   * @generated
-   * @return value of the feature 
-   */
-  public String getMedium() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Medium == null)
-      jcasType.jcas.throwFeatMissing("Medium", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Medium);}
-    
-  /** setter for Medium - sets - speech,
-- thought,
-- writing 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setMedium(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Medium == null)
-      jcasType.jcas.throwFeatMissing("Medium", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Medium, v);}    
-   
-    
-  //*--------------*
-  //* Feature: RType
-
-  /** getter for RType - gets - direct,
-- indirect,
-- free indirect,
-- reported
-   * @generated
-   * @return value of the feature 
-   */
-  public String getRType() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_RType == null)
-      jcasType.jcas.throwFeatMissing("RType", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_RType);}
-    
-  /** setter for RType - sets - direct,
-- indirect,
-- free indirect,
-- reported 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setRType(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_RType == null)
-      jcasType.jcas.throwFeatMissing("RType", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_RType, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Level
-
-  /** getter for Level - gets - default value: 1,
-- increment for every embedded speech,
-- embedded story: -1
-   * @generated
-   * @return value of the feature 
-   */
-  public String getLevel() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Level == null)
-      jcasType.jcas.throwFeatMissing("Level", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Level);}
-    
-  /** setter for Level - sets - default value: 1,
-- increment for every embedded speech,
-- embedded story: -1 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setLevel(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Level == null)
-      jcasType.jcas.throwFeatMissing("Level", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Level, v);}    
-   
-    
-  //*--------------*
-  //* Feature: NonFact
-
-  /** getter for NonFact - gets - default value: unspec (unspecified),
-- neg (negated), 
-- hyp (hypothetical), 
-- fut (future), 
-- ques (question), 
-- imp (wish, imperative), 
-- plan (plan, intention)
-   * @generated
-   * @return value of the feature 
-   */
-  public String getNonFact() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_NonFact == null)
-      jcasType.jcas.throwFeatMissing("NonFact", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_NonFact);}
-    
-  /** setter for NonFact - sets - default value: unspec (unspecified),
-- neg (negated), 
-- hyp (hypothetical), 
-- fut (future), 
-- ques (question), 
-- imp (wish, imperative), 
-- plan (plan, intention) 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setNonFact(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_NonFact == null)
-      jcasType.jcas.throwFeatMissing("NonFact", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_NonFact, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Prag
-
-  /** getter for Prag - gets - default value: NULL
-   * @generated
-   * @return value of the feature 
-   */
-  public String getPrag() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Prag == null)
-      jcasType.jcas.throwFeatMissing("Prag", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Prag);}
-    
-  /** setter for Prag - sets - default value: NULL 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setPrag(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Prag == null)
-      jcasType.jcas.throwFeatMissing("Prag", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Prag, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Border
-
-  /** getter for Border - gets - default value: NULL,
-
-- values for thought representation: 
-- default value: unspec (unspecified), 
-- percept (perception),  
-- state (state), 
-- feel (feeling)
-   * @generated
-   * @return value of the feature 
-   */
-  public String getBorder() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Border == null)
-      jcasType.jcas.throwFeatMissing("Border", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Border);}
-    
-  /** setter for Border - sets - default value: NULL,
-
-- values for thought representation: 
-- default value: unspec (unspecified), 
-- percept (perception),  
-- state (state), 
-- feel (feeling) 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setBorder(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Border == null)
-      jcasType.jcas.throwFeatMissing("Border", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Border, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Metaph
-
-  /** getter for Metaph - gets - default value: NULL
-   * @generated
-   * @return value of the feature 
-   */
-  public String getMetaph() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Metaph == null)
-      jcasType.jcas.throwFeatMissing("Metaph", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Metaph);}
-    
-  /** setter for Metaph - sets - default value: NULL 
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setMetaph(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Metaph == null)
-      jcasType.jcas.throwFeatMissing("Metaph", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Metaph, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Stwr
-
-  /** getter for Stwr - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getStwr() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Stwr == null)
-      jcasType.jcas.throwFeatMissing("Stwr", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Stwr);}
-    
-  /** setter for Stwr - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setStwr(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_Stwr == null)
-      jcasType.jcas.throwFeatMissing("Stwr", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_Stwr, v);}    
-   
-    
-  //*--------------*
-  //* Feature: StwrID
-
-  /** getter for StwrID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getStwrID() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_StwrID == null)
-      jcasType.jcas.throwFeatMissing("StwrID", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_StwrID);}
-    
-  /** setter for StwrID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setStwrID(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_StwrID == null)
-      jcasType.jcas.throwFeatMissing("StwrID", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_StwrID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: StwrNote
-
-  /** getter for StwrNote - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getStwrNote() {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_StwrNote == null)
-      jcasType.jcas.throwFeatMissing("StwrNote", "de.idsma.rw.Stwr");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_StwrNote);}
-    
-  /** setter for StwrNote - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setStwrNote(String v) {
-    if (Stwr_Type.featOkTst && ((Stwr_Type)jcasType).casFeat_StwrNote == null)
-      jcasType.jcas.throwFeatMissing("StwrNote", "de.idsma.rw.Stwr");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Stwr_Type)jcasType).casFeatCode_StwrNote, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr_Type.java
deleted file mode 100644
index d40aa50193510ed644602c3e6fa590c25a21e829..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Stwr_Type.java
+++ /dev/null
@@ -1,321 +0,0 @@
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Thu Jul 20 09:38:50 CEST 2017
- * @generated */
-public class Stwr_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Stwr.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Stwr");
- 
-  /** @generated */
-  final Feature casFeat_Medium;
-  /** @generated */
-  final int     casFeatCode_Medium;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getMedium(int addr) {
-        if (featOkTst && casFeat_Medium == null)
-      jcas.throwFeatMissing("Medium", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Medium);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setMedium(int addr, String v) {
-        if (featOkTst && casFeat_Medium == null)
-      jcas.throwFeatMissing("Medium", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Medium, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_RType;
-  /** @generated */
-  final int     casFeatCode_RType;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getRType(int addr) {
-        if (featOkTst && casFeat_RType == null)
-      jcas.throwFeatMissing("RType", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_RType);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setRType(int addr, String v) {
-        if (featOkTst && casFeat_RType == null)
-      jcas.throwFeatMissing("RType", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_RType, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Level;
-  /** @generated */
-  final int     casFeatCode_Level;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getLevel(int addr) {
-        if (featOkTst && casFeat_Level == null)
-      jcas.throwFeatMissing("Level", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Level);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setLevel(int addr, String v) {
-        if (featOkTst && casFeat_Level == null)
-      jcas.throwFeatMissing("Level", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Level, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_NonFact;
-  /** @generated */
-  final int     casFeatCode_NonFact;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getNonFact(int addr) {
-        if (featOkTst && casFeat_NonFact == null)
-      jcas.throwFeatMissing("NonFact", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_NonFact);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setNonFact(int addr, String v) {
-        if (featOkTst && casFeat_NonFact == null)
-      jcas.throwFeatMissing("NonFact", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_NonFact, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Prag;
-  /** @generated */
-  final int     casFeatCode_Prag;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getPrag(int addr) {
-        if (featOkTst && casFeat_Prag == null)
-      jcas.throwFeatMissing("Prag", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Prag);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setPrag(int addr, String v) {
-        if (featOkTst && casFeat_Prag == null)
-      jcas.throwFeatMissing("Prag", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Prag, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Border;
-  /** @generated */
-  final int     casFeatCode_Border;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getBorder(int addr) {
-        if (featOkTst && casFeat_Border == null)
-      jcas.throwFeatMissing("Border", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Border);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setBorder(int addr, String v) {
-        if (featOkTst && casFeat_Border == null)
-      jcas.throwFeatMissing("Border", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Border, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Metaph;
-  /** @generated */
-  final int     casFeatCode_Metaph;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getMetaph(int addr) {
-        if (featOkTst && casFeat_Metaph == null)
-      jcas.throwFeatMissing("Metaph", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Metaph);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setMetaph(int addr, String v) {
-        if (featOkTst && casFeat_Metaph == null)
-      jcas.throwFeatMissing("Metaph", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Metaph, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Stwr;
-  /** @generated */
-  final int     casFeatCode_Stwr;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getStwr(int addr) {
-        if (featOkTst && casFeat_Stwr == null)
-      jcas.throwFeatMissing("Stwr", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Stwr);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setStwr(int addr, String v) {
-        if (featOkTst && casFeat_Stwr == null)
-      jcas.throwFeatMissing("Stwr", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Stwr, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_StwrID;
-  /** @generated */
-  final int     casFeatCode_StwrID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getStwrID(int addr) {
-        if (featOkTst && casFeat_StwrID == null)
-      jcas.throwFeatMissing("StwrID", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_StwrID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setStwrID(int addr, String v) {
-        if (featOkTst && casFeat_StwrID == null)
-      jcas.throwFeatMissing("StwrID", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_StwrID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_StwrNote;
-  /** @generated */
-  final int     casFeatCode_StwrNote;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getStwrNote(int addr) {
-        if (featOkTst && casFeat_StwrNote == null)
-      jcas.throwFeatMissing("StwrNote", "de.idsma.rw.Stwr");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_StwrNote);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setStwrNote(int addr, String v) {
-        if (featOkTst && casFeat_StwrNote == null)
-      jcas.throwFeatMissing("StwrNote", "de.idsma.rw.Stwr");
-    ll_cas.ll_setStringValue(addr, casFeatCode_StwrNote, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Stwr_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_Medium = jcas.getRequiredFeatureDE(casType, "Medium", "uima.cas.String", featOkTst);
-    casFeatCode_Medium  = (null == casFeat_Medium) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Medium).getCode();
-
- 
-    casFeat_RType = jcas.getRequiredFeatureDE(casType, "RType", "uima.cas.String", featOkTst);
-    casFeatCode_RType  = (null == casFeat_RType) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_RType).getCode();
-
- 
-    casFeat_Level = jcas.getRequiredFeatureDE(casType, "Level", "uima.cas.String", featOkTst);
-    casFeatCode_Level  = (null == casFeat_Level) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Level).getCode();
-
- 
-    casFeat_NonFact = jcas.getRequiredFeatureDE(casType, "NonFact", "uima.cas.String", featOkTst);
-    casFeatCode_NonFact  = (null == casFeat_NonFact) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_NonFact).getCode();
-
- 
-    casFeat_Prag = jcas.getRequiredFeatureDE(casType, "Prag", "uima.cas.String", featOkTst);
-    casFeatCode_Prag  = (null == casFeat_Prag) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Prag).getCode();
-
- 
-    casFeat_Border = jcas.getRequiredFeatureDE(casType, "Border", "uima.cas.String", featOkTst);
-    casFeatCode_Border  = (null == casFeat_Border) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Border).getCode();
-
- 
-    casFeat_Metaph = jcas.getRequiredFeatureDE(casType, "Metaph", "uima.cas.String", featOkTst);
-    casFeatCode_Metaph  = (null == casFeat_Metaph) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Metaph).getCode();
-
- 
-    casFeat_Stwr = jcas.getRequiredFeatureDE(casType, "Stwr", "uima.cas.String", featOkTst);
-    casFeatCode_Stwr  = (null == casFeat_Stwr) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Stwr).getCode();
-
- 
-    casFeat_StwrID = jcas.getRequiredFeatureDE(casType, "StwrID", "uima.cas.String", featOkTst);
-    casFeatCode_StwrID  = (null == casFeat_StwrID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_StwrID).getCode();
-
- 
-    casFeat_StwrNote = jcas.getRequiredFeatureDE(casType, "StwrNote", "uima.cas.String", featOkTst);
-    casFeatCode_StwrNote  = (null == casFeat_StwrNote) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_StwrNote).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought.java
deleted file mode 100644
index f16792ed2f705dbc5bf22c279e763c3c73d18f13..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought.java
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen_maven/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Thought extends Stwr {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Thought.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Thought() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Thought(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Thought(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Thought(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
-}
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought_Type.java
deleted file mode 100644
index dfd07bb4aa48ec93d76e6253c74f7b714c759be4..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Thought_Type.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * @generated */
-public class Thought_Type extends Stwr_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Thought.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Thought");
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Thought_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb.java
deleted file mode 100644
index cfea46bb3efcf93466b97803735e8e3be78cf892..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-import org.apache.uima.jcas.tcas.Annotation;
-
-
-/** 
- * Updated by JCasGen Mon Jul 17 15:55:17 CEST 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Verb extends Annotation {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Verb.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Verb() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Verb(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Verb(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Verb(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
-  //*--------------*
-  //* Feature: VerbID
-
-  /** getter for VerbID - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getVerbID() {
-    if (Verb_Type.featOkTst && ((Verb_Type)jcasType).casFeat_VerbID == null)
-      jcasType.jcas.throwFeatMissing("VerbID", "de.idsma.rw.Verb");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Verb_Type)jcasType).casFeatCode_VerbID);}
-    
-  /** setter for VerbID - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setVerbID(String v) {
-    if (Verb_Type.featOkTst && ((Verb_Type)jcasType).casFeat_VerbID == null)
-      jcasType.jcas.throwFeatMissing("VerbID", "de.idsma.rw.Verb");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Verb_Type)jcasType).casFeatCode_VerbID, v);}    
-   
-    
-  //*--------------*
-  //* Feature: Verb
-
-  /** getter for Verb - gets 
-   * @generated
-   * @return value of the feature 
-   */
-  public String getVerb() {
-    if (Verb_Type.featOkTst && ((Verb_Type)jcasType).casFeat_Verb == null)
-      jcasType.jcas.throwFeatMissing("Verb", "de.idsma.rw.Verb");
-    return jcasType.ll_cas.ll_getStringValue(addr, ((Verb_Type)jcasType).casFeatCode_Verb);}
-    
-  /** setter for Verb - sets  
-   * @generated
-   * @param v value to set into the feature 
-   */
-  public void setVerb(String v) {
-    if (Verb_Type.featOkTst && ((Verb_Type)jcasType).casFeat_Verb == null)
-      jcasType.jcas.throwFeatMissing("Verb", "de.idsma.rw.Verb");
-    jcasType.ll_cas.ll_setStringValue(addr, ((Verb_Type)jcasType).casFeatCode_Verb, v);}    
-  }
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb_Type.java
deleted file mode 100644
index c39da13c520a4ff1dc2a6a760a83e63fc4a5495c..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Verb_Type.java
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/* First created by JCasGen Wed Jun 21 11:43:59 CEST 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.jcas.tcas.Annotation_Type;
-
-/** 
- * Updated by JCasGen Mon Jul 17 15:55:17 CEST 2017
- * @generated */
-public class Verb_Type extends Annotation_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Verb.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Verb");
-
-
-
-  /** @generated */
-  final Feature casFeat_VerbID;
-  /** @generated */
-  final int     casFeatCode_VerbID;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getVerbID(int addr) {
-        if (featOkTst && casFeat_VerbID == null)
-      jcas.throwFeatMissing("VerbID", "de.idsma.rw.Verb");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_VerbID);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setVerbID(int addr, String v) {
-        if (featOkTst && casFeat_VerbID == null)
-      jcas.throwFeatMissing("VerbID", "de.idsma.rw.Verb");
-    ll_cas.ll_setStringValue(addr, casFeatCode_VerbID, v);}
-    
-  
- 
-  /** @generated */
-  final Feature casFeat_Verb;
-  /** @generated */
-  final int     casFeatCode_Verb;
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @return the feature value 
-   */ 
-  public String getVerb(int addr) {
-        if (featOkTst && casFeat_Verb == null)
-      jcas.throwFeatMissing("Verb", "de.idsma.rw.Verb");
-    return ll_cas.ll_getStringValue(addr, casFeatCode_Verb);
-  }
-  /** @generated
-   * @param addr low level Feature Structure reference
-   * @param v value to set 
-   */    
-  public void setVerb(int addr, String v) {
-        if (featOkTst && casFeat_Verb == null)
-      jcas.throwFeatMissing("Verb", "de.idsma.rw.Verb");
-    ll_cas.ll_setStringValue(addr, casFeatCode_Verb, v);}
-    
-  
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Verb_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
- 
-    casFeat_VerbID = jcas.getRequiredFeatureDE(casType, "VerbID", "uima.cas.String", featOkTst);
-    casFeatCode_VerbID  = (null == casFeat_VerbID) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_VerbID).getCode();
-
- 
-    casFeat_Verb = jcas.getRequiredFeatureDE(casType, "Verb", "uima.cas.String", featOkTst);
-    casFeatCode_Verb  = (null == casFeat_Verb) ? JCas.INVALID_FEATURE_CODE : ((FeatureImpl)casFeat_Verb).getCode();
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing.java
deleted file mode 100644
index 303ddd883805381e40cbe0d1ec2cd174c7b28b07..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing.java
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas; 
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
-
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * XML source: C:/Users/Tu.IDS-DOM/git/Athen_maven/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem.xml
- * @generated */
-public class Writing extends Stwr {
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = JCasRegistry.register(Writing.class);
-  /** @generated
-   * @ordered 
-   */
-  @SuppressWarnings ("hiding")
-  public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
-   */
-  @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected Writing() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
-   * @generated
-   * @param addr low level Feature Structure reference
-   * @param type the type of this Feature Structure 
-   */
-  public Writing(int addr, TOP_Type type) {
-    super(addr, type);
-    readObject();
-  }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
-   */
-  public Writing(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
-
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
-  public Writing(JCas jcas, int begin, int end) {
-    super(jcas);
-    setBegin(begin);
-    setEnd(end);
-    readObject();
-  }   
-
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
-   *
-   * @generated modifiable 
-   */
-  private void readObject() {/*default - does nothing empty block */}
-     
-}
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing_Type.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing_Type.java
deleted file mode 100644
index 160bbca511112f520e8e4e78a7c281bceaaf5e87..0000000000000000000000000000000000000000
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/idsma/rw/Writing_Type.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/* First created by JCasGen Tue Mar 07 17:25:39 CET 2017 */
-package de.idsma.rw;
-
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
-
-/** 
- * Updated by JCasGen Tue Mar 07 17:25:39 CET 2017
- * @generated */
-public class Writing_Type extends Stwr_Type {
-  /** @generated */
-  @SuppressWarnings ("hiding")
-  public final static int typeIndexID = Writing.typeIndexID;
-  /** @generated 
-     @modifiable */
-  @SuppressWarnings ("hiding")
-  public final static boolean featOkTst = JCasRegistry.getFeatOkTst("de.idsma.rw.Writing");
-
-
-
-  /** initialize variables to correspond with Cas Type and Features
-	 * @generated
-	 * @param jcas JCas
-	 * @param casType Type 
-	 */
-  public Writing_Type(JCas jcas, Type casType) {
-    super(jcas, casType);
-    casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl)this.casType, getFSGenerator());
-
-  }
-}
-
-
-
-    
\ No newline at end of file
diff --git a/de.uniwue.mk.athen/workspace/.metadata/.log b/de.uniwue.mk.athen/workspace/.metadata/.log
new file mode 100644
index 0000000000000000000000000000000000000000..8838173ffb7ba5fabe9683fd2f8a324ecc9f0394
--- /dev/null
+++ b/de.uniwue.mk.athen/workspace/.metadata/.log
@@ -0,0 +1,59 @@
+!SESSION 2018-01-30 15:14:09.524 -----------------------------------------------
+eclipse.buildId=unknown
+java.version=1.8.0_161
+java.vendor=Oracle Corporation
+BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=de_DE
+Framework arguments:  -eclipse.keyring C:\Users\TUD32A~1.IDS\AppData\Local\Temp\tycho4149110443232416627secure_storage
+Command-line arguments:  -eclipse.keyring C:\Users\TUD32A~1.IDS\AppData\Local\Temp\tycho4149110443232416627secure_storage
+
+!ENTRY org.eclipse.equinox.p2.engine 4 4 2018-01-30 15:14:09.524
+!MESSAGE An error occurred during the org.eclipse.equinox.internal.p2.engine.phases.CheckTrust phase.
+!SUBENTRY 1 org.eclipse.equinox.p2.engine 4 0 2018-01-30 15:14:09.524
+!MESSAGE session context was:(profile=DefaultProfile, phase=org.eclipse.equinox.internal.p2.engine.phases.CheckTrust, operand=, action=).
+!SUBENTRY 1 org.eclipse.equinox.p2.engine 4 0 2018-01-30 15:14:09.524
+!MESSAGE Error reading signed content.
+!STACK 0
+java.io.FileNotFoundException: C:\Users\Tu.IDS-DOM\git\Athen\de.uniwue.mk.athen\releng\de.uniwue.mk.athen.product\target\products\de.uniwue.mk.athen.product\linux\gtk\x86\plugins\com.ibm.icu_56.1.0.v201601250100.jar (Das System kann die angegebene Datei nicht finden)
+	at java.util.zip.ZipFile.open(Native Method)
+	at java.util.zip.ZipFile.<init>(Unknown Source)
+	at java.util.zip.ZipFile.<init>(Unknown Source)
+	at java.util.zip.ZipFile.<init>(Unknown Source)
+	at org.eclipse.osgi.internal.signedcontent.SignedBundleHook.getSignedContent(SignedBundleHook.java:209)
+	at org.eclipse.equinox.internal.p2.engine.phases.CertificateChecker.checkCertificates(CertificateChecker.java:73)
+	at org.eclipse.equinox.internal.p2.engine.phases.CertificateChecker.start(CertificateChecker.java:54)
+	at org.eclipse.equinox.internal.p2.engine.phases.CheckTrust.completePhase(CheckTrust.java:50)
+	at org.eclipse.equinox.internal.p2.engine.Phase.postPerform(Phase.java:251)
+	at org.eclipse.equinox.internal.p2.engine.Phase.perform(Phase.java:101)
+	at org.eclipse.equinox.internal.p2.engine.PhaseSet.perform(PhaseSet.java:47)
+	at org.eclipse.equinox.internal.p2.engine.Engine.perform(Engine.java:75)
+	at org.eclipse.equinox.internal.p2.engine.Engine.perform(Engine.java:44)
+	at org.eclipse.equinox.internal.provisional.p2.director.PlanExecutionHelper.executePlan(PlanExecutionHelper.java:42)
+	at org.eclipse.equinox.internal.provisional.p2.director.PlanExecutionHelper.executePlan(PlanExecutionHelper.java:24)
+	at org.eclipse.equinox.internal.p2.director.app.DirectorApplication.executePlan(DirectorApplication.java:813)
+	at org.eclipse.equinox.internal.p2.director.app.DirectorApplication.planAndExecute(DirectorApplication.java:806)
+	at org.eclipse.equinox.internal.p2.director.app.DirectorApplication.performProvisioningActions(DirectorApplication.java:793)
+	at org.eclipse.equinox.internal.p2.director.app.DirectorApplication.run(DirectorApplication.java:1111)
+	at org.eclipse.tycho.p2.tools.director.DirectorApplicationWrapper$DirectorApplicationWrapperCommand.execute(DirectorApplicationWrapper.java:45)
+	at org.eclipse.tycho.plugins.p2.director.DirectorMojo.execute(DirectorMojo.java:141)
+	at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:134)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:207)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
+	at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:116)
+	at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:80)
+	at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
+	at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:128)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:307)
+	at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:193)
+	at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:106)
+	at org.apache.maven.cli.MavenCli.execute(MavenCli.java:863)
+	at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:288)
+	at org.apache.maven.cli.MavenCli.main(MavenCli.java:199)
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
+	at java.lang.reflect.Method.invoke(Unknown Source)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
+	at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)