From 31f2a0514659b589cb28e93c09219889829b9b27 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Fri, 10 Feb 2023 10:59:15 +0100
Subject: [PATCH] Cleaned up stuff.

---
 ...guage (cdl) Language Infrastructure.launch |   18 -
 .../.launch/Launch EvoAl Eclipse.launch       |   38 -
 ...traintDefinitionLanguageGenerator.xtendbin |  Bin 2353 -> 0 bytes
 ...intDefinitionLanguageGenerator.java._trace |  Bin 440 -> 0 bytes
 ...ConstraintDefinitionLanguageGenerator.java |   21 -
 .../de.evoal.languages.utils.dsl/.classpath   |    7 -
 .../de.evoal.languages.utils.dsl/.project     |   34 -
 .../META-INF/MANIFEST.MF                      |   13 -
 .../build.properties                          |   10 -
 .../model/model.aird                          |  465 -----
 .../model/model.ecore                         |  187 --
 .../model/model.genmodel                      |  131 --
 .../plugin.properties                         |    2 -
 .../de.evoal.languages.utils.dsl/plugin.xml   |   24 -
 .../de.evoal.languages.utils.dsl/pom.xml      |   14 -
 .../languages/model/mll/BlockStatement.java   |   37 -
 .../languages/model/mll/CallStatement.java    |   46 -
 .../languages/model/mll/CounterRange.java     |   68 -
 .../model/mll/DefinedFunctionName.java        |   55 -
 .../languages/model/mll/ForStatement.java     |   83 -
 .../mll/MachineLearningConfiguration.java     |   80 -
 .../evoal/languages/model/mll/MllFactory.java |  150 --
 .../evoal/languages/model/mll/MllPackage.java | 1544 -----------------
 .../PartialSurrogateFunctionDefinition.java   |   94 -
 .../languages/model/mll/PredictStatement.java |  106 --
 .../evoal/languages/model/mll/Prediction.java |  104 --
 .../de/evoal/languages/model/mll/Range.java   |   18 -
 .../evoal/languages/model/mll/Statement.java  |   18 -
 .../model/mll/StringLiteralRange.java         |   39 -
 .../model/mll/SurrogateDefinition.java        |   92 -
 .../model/mll/SurrogateLayerDefinition.java   |   62 -
 .../de/evoal/languages/model/mll/Use.java     |   46 -
 .../model/mll/impl/BlockStatementImpl.java    |  151 --
 .../model/mll/impl/CallStatementImpl.java     |  178 --
 .../model/mll/impl/CounterRangeImpl.java      |  220 ---
 .../mll/impl/DefinedFunctionNameImpl.java     |  161 --
 .../model/mll/impl/ForStatementImpl.java      |  293 ----
 .../MachineLearningConfigurationImpl.java     |  229 ---
 .../model/mll/impl/MllFactoryImpl.java        |  241 ---
 .../model/mll/impl/MllPackageImpl.java        | 1008 -----------
 ...artialSurrogateFunctionDefinitionImpl.java |  291 ----
 .../model/mll/impl/PredictStatementImpl.java  |  343 ----
 .../model/mll/impl/PredictionImpl.java        |  320 ----
 .../languages/model/mll/impl/RangeImpl.java   |   39 -
 .../model/mll/impl/StatementImpl.java         |   39 -
 .../mll/impl/StringLiteralRangeImpl.java      |  152 --
 .../mll/impl/SurrogateDefinitionImpl.java     |  298 ----
 .../impl/SurrogateLayerDefinitionImpl.java    |  225 ---
 .../languages/model/mll/impl/UseImpl.java     |  165 --
 .../model/mll/util/MllAdapterFactory.java     |  392 -----
 .../languages/model/mll/util/MllSwitch.java   |  428 -----
 51 files changed, 8779 deletions(-)
 delete mode 100644 src/languages/de.evoal.languages.model.cdl.dsl/.launch/Generate ConstraintDefinitionLanguage (cdl) Language Infrastructure.launch
 delete mode 100644 src/languages/de.evoal.languages.model.cdl.dsl/.launch/Launch EvoAl Eclipse.launch
 delete mode 100644 src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/.ConstraintDefinitionLanguageGenerator.xtendbin
 delete mode 100644 src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/.ConstraintDefinitionLanguageGenerator.java._trace
 delete mode 100644 src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/ConstraintDefinitionLanguageGenerator.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/.classpath
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/.project
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/META-INF/MANIFEST.MF
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/build.properties
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/model/model.aird
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/model/model.ecore
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/model/model.genmodel
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/plugin.properties
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/plugin.xml
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/pom.xml
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/BlockStatement.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CallStatement.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CounterRange.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/DefinedFunctionName.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/ForStatement.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MachineLearningConfiguration.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllFactory.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllPackage.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PartialSurrogateFunctionDefinition.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PredictStatement.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Prediction.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Range.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Statement.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/StringLiteralRange.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateDefinition.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateLayerDefinition.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Use.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/BlockStatementImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CallStatementImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CounterRangeImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/DefinedFunctionNameImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/ForStatementImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MachineLearningConfigurationImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllFactoryImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllPackageImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PartialSurrogateFunctionDefinitionImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictStatementImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictionImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/RangeImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StatementImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StringLiteralRangeImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateDefinitionImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateLayerDefinitionImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/UseImpl.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllAdapterFactory.java
 delete mode 100644 src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllSwitch.java

diff --git a/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Generate ConstraintDefinitionLanguage (cdl) Language Infrastructure.launch b/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Generate ConstraintDefinitionLanguage (cdl) Language Infrastructure.launch
deleted file mode 100644
index e686a8b9..00000000
--- a/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Generate ConstraintDefinitionLanguage (cdl) Language Infrastructure.launch	
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/de.evoal.languages.model.cdl.dsl"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/de.evoal.languages.model.cdl.dsl&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/de.evoal.languages.model.cdl.dsl.ide&quot; type=&quot;4&quot;/&gt;&#10;&lt;item path=&quot;/de.evoal.languages.model.cdl.dsl.ui&quot; type=&quot;4&quot;/&gt;&#10;;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="de.evoal.languages.model.cdl.dsl.GenerateConstraintDefinitionLanguage"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="de.evoal.languages.model.cdl.dsl"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
-</launchConfiguration>
diff --git a/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Launch EvoAl Eclipse.launch b/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Launch EvoAl Eclipse.launch
deleted file mode 100644
index 70ed83a6..00000000
--- a/src/languages/de.evoal.languages.model.cdl.dsl/.launch/Launch EvoAl Eclipse.launch	
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-    <booleanAttribute key="append.args" value="true"/>
-    <booleanAttribute key="askclear" value="true"/>
-    <booleanAttribute key="automaticAdd" value="true"/>
-    <booleanAttribute key="automaticValidate" value="false"/>
-    <stringAttribute key="bad_container_name" value="/de.evoal.languages.model.cdl.dsl/.launch/"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <booleanAttribute key="clearws" value="false"/>
-    <booleanAttribute key="clearwslog" value="false"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Launch EvoAl Eclipse"/>
-    <booleanAttribute key="default" value="true"/>
-    <booleanAttribute key="includeOptional" value="true"/>
-    <stringAttribute key="location" value="${workspace_loc}/../runtime-EclipseXtext"/>
-    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OpenJDK 11 (x86_64)"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2g"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <stringAttribute key="product" value="org.eclipse.platform.ide"/>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfig" value="true"/>
-    <booleanAttribute key="useDefaultConfigArea" value="true"/>
-    <booleanAttribute key="useProduct" value="true"/>
-    <booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
diff --git a/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/.ConstraintDefinitionLanguageGenerator.xtendbin b/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/.ConstraintDefinitionLanguageGenerator.xtendbin
deleted file mode 100644
index ccdaa6ae84ffbb5944cbcd07b7c213955f494245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2353
zcmaJ@c{mi@9v)jpA<Nh)VQd-8C6QgSCX}VfI>tUTn86^*maUMbY>kAFC481FV_zHl
zh%&~Okg-PD`MCdly3f7$J%60-Ip_SI=Y4<g`57BfQG)<LAP@le;x+@E0sYAs26uu$
zkq9&lfku^>Z6FESpz0vs*)MR-9!{!r7ogBLuJYW&!Ri^6!wja>?zgmikc$pY;Z*zm
zb@jO`M^r~-oRSEluEb2hP+xExw?^9D#cf-wYA8lmBefa5NW`_OQf%&zjSVl#2QA_>
z(FuetEvf;jfq+7u=e=#R=1<08FmUcA&39?j*zNV%Vb<5!XN95YT%)UB0BLo&p(Dlg
z;J!VcQ4>8wU7GgIy$fITmA{l`CmcuX?9L746{m?Bv=BJZcj9f*D670eO!ggYRB0I#
zVZw7eYC+8hNn3UY6u*i<_>3G+;T;JfA(rIS9{R+w*hpIUS>7(6%;wEdcCXjd3$eAu
zbB=DwCJ@I8C3DN++iFMwo@@w`$N%OW{IEiGt?_H-OyRKcsuP#!uWwI1@e>;Jz%(LH
z!$z=Ru#sm55eWC+xamL+511?`cZ^;Pq%n)x5?#<Fl86he<=+$CbHEsw)JC#-vn$>9
zh6mw(rx#r0nQT&!-Y!}@e-P*r2~LJ4d?NZDBH&G2HBLJs&@qN;iRqLQbpbW;Tm8bl
z$$ss;xsHnAGMT0y4bI~Ojx3$zre?-<<y!j}U9VKcH(l3q^6-j)h-&0;AIA`v9+X7l
zIm-=yNW7X@lXoFB^UabpP}f|3Tda`Bq$%i>saR5Z+H4t@-V+6mv`m_elvyNmvh3x0
zmtO3RNwY#^U%=u~<u1zY<<u%k6A6#vy2;_;qSLx%6F-(mV*NxPMBmE@J3lYnsBo3O
z1rfbRNw&lnTsD{6kIFez)wwr714(p{@kp6YeWP2^pzCdx2@!Zn;xDc7k$3)15<2n$
zRS?6|*)bbjtL${8*qdMXMFTLCGV^Lh0$ly#O7Ck-y*u-lMmxmN8W*n@*l`hbDpRvr
z8-+@Ey5&b$D4a9p4aPUQ=Lm1hN<6LAu(BPU#ddp@K|Aw5@P{~lbBry=de?aWV!NC9
zXJU2((Xc2d&%T>)Sf0Z>=!-;K;&H@SL$ig@L}$)L@dCr3U@fZIKtH|dc0Vb%?UvTq
z!^e?Ju-b=<pRn3RrF-e<JyCL60vIxi9#vU>2+ct1=2!RC6jj&84|U2<m5k4SiZQsv
z`D%pjfQ*2Qk`_sh-$}M=kSRlke^E0C-%Sp?H=<g0EsX9+ydY$n>efPn))14O-Ky}f
z%dZICHg{^foxtk>sz1Kz#835bjTMLc?U-|!T7uVn9!$uh)g*HHhj)354QPSl&K*LT
zQ~-b?9ROhbKeHNilGWZY6w=2V3WGSpP*87IPqZr%(U&aa4$=U1*?QL+yw!*bjSygO
z>2wgWiEGc5abPjjWil;(oe|`B-QL&vb=utTyTITOJ9TOe9{0d<&;>G3V2AGj;M;hz
zBVdvYj<D)&B>8VH93HK$G#)aVx!c{!@D11O>2*j}>a}(pT!IKne;T~+%J&X5r6X9I
zsMJunK55^|VrlO<pL-_@*ZN`Y1J?gKMS?SFp)5me)pA_uLa|hr!!u7S6q^{fx(34o
zPhR9S6LMhdFqd(s2A3za#|W_}a)M>DMmj+Ze&c0UH>&zQ)9Sz;J*Im%MlTwXR-OId
z$(?(0CDdAyqW)1$ZFDQ2J?X;|M}45$ByU-82<|x6C&oIgBM$YI5=uhUOoM&dQ_}|Z
z-rlS3tl4dQPK%>o0YTk~dQ6D|4KkjHq~AFZ5i>M_bJ9x0?`M9N6z-ti*22z(O}lua
zMOhHpRVNtiBh8x==Jv!}+Qx3E9x(q#)1{JycZCDPSbD%}cL!$3_^GZ9?i}X)c?fw~
z75li-He`lPAx|#e;^UiTGfqFgC0(5&g#m;_Xw%a=XeHx*)KXc+%Jk2NsC1)&SjC~@
z>rOio$dOxuh`!#RJ2$f87B-bLH^#z)=#84&%&ELn<hm_rb0Q^KUDtOk>i((#vyESR
zZqXW{?oRg4Hoc%<^-Z7cw&kQ@HiOFZU(RG*1*Ssk7cpVX$cv<gZAP~n^hlf1WxdHQ
z73NYE7j?00LItMaRSAs$3VLaqR#QYe_$_DCN6x0B-KoLjJm;z~sb`_4N?(^u@S6PP
z#bHTZ!Ueg55m3#=WA2w2196*!zh--T3`RE(L{8=UT!T{qP6+_io%?@sJ^h62Q79zT
z)&5kasJvvnew#YzsSzOn{+T^5Z<Hq{N;3T&dZu4e3)CQi221j0gqRbA`){v&^jZ)c
z$@l#5@%;{UDX2wfoo+&b>wKQ82sgcB_ngv#+Jc%i>X?QqS$&DuI@{y5S@AL=&o`tG
zu7wZm7OVViG;2<_3LBKsGARrfQ{fjD&QyP!M2Ne@xrYhX!!|zEAcmUYwddKzWipnV
zfmc~?<Evrb&N;wUR(JZ?Ym$>pVQeb-9Exq%HW$ZR<gWUfJydDa3U*kH@~|v-r|(4P
zw9zweu^<2eayne?xODNX$W)vava4^PN|E8sSlYBvMonLRSES~B&wOT7Y^8x4y&P$M
zE9D#gFz#j9#NDqyjbG_^!!3Y=bzyo+HZG2jI){xq4%wLf$&KI8Od4jr4N6?&HC0um
zY5V7+W{Vz6PBvL~=36o$J0IixX+klwl!3CL82s^Ah6R6A%_BRc{}GW{B=xhNAsoEI
zyw;BT&c~FZbI<3_x!U@;BG22i1&@8TB1D9+rZeH~dTiK4g_2gWXlGN5<*Yv&HU(o6
z!69U0J_D9ny?n~AE~EwWjsgIX`!~N7lpw%AWyV>nI%W7zoGm(x4gNfNRyC(q_76r+
ntna@W+kf70Hm*P4jyQ?*tk#STXiioD0IHK#ebU2#r?bBS^!q9O

diff --git a/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/.ConstraintDefinitionLanguageGenerator.java._trace b/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/.ConstraintDefinitionLanguageGenerator.java._trace
deleted file mode 100644
index 484310faf4102827c64779147a87f855ddf33375..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 440
zcmY+-y-ve06oz4+{Ge6=kvdRXP$dSa#DWJVw%A25(1nEou|$c9A_ZGYQpCyx3lm#+
zZh;$M>P2t~h_Nfq36;WRJ%0Vkgb)`%d_bRA{D^;fLm)S05wk=x`Jkhm<&jEfQ7TJz
zuM?TGILTR3<}8&;7Ez@OHqolAiYQannY_zXR%KdE|5g{PSI3W)REZ6TU=s@tEQbJR
z{Mp-H{Yz}l!nwCuJDjikrZ2*8zwV!W;tz?#f5yF@;bQEYDn=Bwq(;_1fj9}D=$5(N
z2$ys~*2K9R1crT=QggHg;?l#m=a~lLdVm^JBU{{d8+CEl76{oiRyPoOgfCBba5oDY
k1-NSq#EXM%>fr8mA9b~hyEodX{@oI7fq3s=i#zr17ifD?(f|Me

diff --git a/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/ConstraintDefinitionLanguageGenerator.java b/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/ConstraintDefinitionLanguageGenerator.java
deleted file mode 100644
index 1dc5c896..00000000
--- a/src/languages/de.evoal.languages.model.cdl.dsl/xtend-gen/de/evoal/languages/model/cdl/dsl/generator/ConstraintDefinitionLanguageGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * generated by Xtext 2.25.0
- */
-package de.evoal.languages.model.cdl.dsl.generator;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xtext.generator.AbstractGenerator;
-import org.eclipse.xtext.generator.IFileSystemAccess2;
-import org.eclipse.xtext.generator.IGeneratorContext;
-
-/**
- * Generates code from your model files on save.
- * 
- * See https://www.eclipse.org/Xtext/documentation/303_runtime_concepts.html#code-generation
- */
-@SuppressWarnings("all")
-public class ConstraintDefinitionLanguageGenerator extends AbstractGenerator {
-  @Override
-  public void doGenerate(final Resource resource, final IFileSystemAccess2 fsa, final IGeneratorContext context) {
-  }
-}
diff --git a/src/languages/de.evoal.languages.utils.dsl/.classpath b/src/languages/de.evoal.languages.utils.dsl/.classpath
deleted file mode 100644
index 79ba2e81..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/src/languages/de.evoal.languages.utils.dsl/.project b/src/languages/de.evoal.languages.utils.dsl/.project
deleted file mode 100644
index 8136ee81..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>de.evoal.languages.model.mll</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/languages/de.evoal.languages.utils.dsl/META-INF/MANIFEST.MF b/src/languages/de.evoal.languages.utils.dsl/META-INF/MANIFEST.MF
deleted file mode 100644
index bb57c0f0..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: de.evoal.languages.utils.dsl
-Automatic-Module-Name: de.evoal.languages.utils.dsl
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-17
-
diff --git a/src/languages/de.evoal.languages.utils.dsl/build.properties b/src/languages/de.evoal.languages.utils.dsl/build.properties
deleted file mode 100644
index e981b6ab..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src-gen/
-output.. = target/classes/
diff --git a/src/languages/de.evoal.languages.utils.dsl/model/model.aird b/src/languages/de.evoal.languages.utils.dsl/model/model.aird
deleted file mode 100644
index b316692e..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/model/model.aird
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
-  <viewpoint:DAnalysis uid="_zXW9wF8KEey2udIOWrDMdQ" selectedViews="_ze0QoF8KEey2udIOWrDMdQ _zfjQcF8KEey2udIOWrDMdQ _zfrMQF8KEey2udIOWrDMdQ _zf5OsF8KEey2udIOWrDMdQ" version="14.5.1.202106111100">
-    <semanticResources>model.ecore</semanticResources>
-    <semanticResources>platform:/resource/de.evoal.languages.model.el/model/model.ecore</semanticResources>
-    <semanticResources>model.genmodel</semanticResources>
-    <semanticResources>platform:/resource/de.evoal.languages.model.el/model/model.genmodel</semanticResources>
-    <ownedViews xmi:type="viewpoint:DView" uid="_ze0QoF8KEey2udIOWrDMdQ">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_DII8oF8QEeybxIskUaV8dQ" name="DataDescriptionLangugae class diagram" repPath="#_DH_LoF8QEeybxIskUaV8dQ" changeId="7fb936d8-f17a-4609-a8c8-bac764ada33d">
-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="model.ecore#/"/>
-      </ownedRepresentationDescriptors>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_zfjQcF8KEey2udIOWrDMdQ">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_zfrMQF8KEey2udIOWrDMdQ">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_zf5OsF8KEey2udIOWrDMdQ">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
-    </ownedViews>
-  </viewpoint:DAnalysis>
-  <diagram:DSemanticDiagram uid="_DH_LoF8QEeybxIskUaV8dQ">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_DITUsF8QEeybxIskUaV8dQ" source="GMF_DIAGRAMS">
-      <data xmi:type="notation:Diagram" xmi:id="_DIT7wF8QEeybxIskUaV8dQ" type="Sirius" element="_DH_LoF8QEeybxIskUaV8dQ" measurementUnit="Pixel">
-        <children xmi:type="notation:Node" xmi:id="_GKhIgF8QEeybxIskUaV8dQ" type="2003" element="_GJt3QF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_GKhvkF8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_GKiWoF8QEeybxIskUaV8dQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_GKi9s18QEeybxIskUaV8dQ" type="3010" element="_GKU7QF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKi9tF8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKi9tV8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GKsusF8QEeybxIskUaV8dQ" type="3010" element="_GKYloF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKsusV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKsusl8QEeybxIskUaV8dQ"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_GKiWoV8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_GKiWol8QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_GKhIgV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8" italic="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKhIgl8QEeybxIskUaV8dQ" x="315" y="192"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_GKiWo18QEeybxIskUaV8dQ" type="2003" element="_GKCAUF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_GKiWpl8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_GKiWp18QEeybxIskUaV8dQ" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_GKiWqF8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_GKiWqV8QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_GKiWpF8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKiWpV8QEeybxIskUaV8dQ" x="315" y="47"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_GKiWql8QEeybxIskUaV8dQ" type="2003" element="_GKEckV8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_GKiWrV8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_GKi9sF8QEeybxIskUaV8dQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_GKtVw18QEeybxIskUaV8dQ" type="3010" element="_GKZMtF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKtVxF8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKtVxV8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GKtVxl8QEeybxIskUaV8dQ" type="3010" element="_GKZMtl8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKtVx18QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKtVyF8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GKt80F8QEeybxIskUaV8dQ" type="3010" element="_GKZzwF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKt80V8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKt80l8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_GKt8018QEeybxIskUaV8dQ" type="3010" element="_GKZzwl8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_GKt81F8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_GKt81V8QEeybxIskUaV8dQ"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_GKi9sV8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_GKi9sl8QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_GKiWq18QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKiWrF8QEeybxIskUaV8dQ" x="48" y="47"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_PFJhMF8QEeybxIskUaV8dQ" type="2003" element="_PE1_MF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_PFLWYF8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_PFLWYV8QEeybxIskUaV8dQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_PFMkgF8QEeybxIskUaV8dQ" type="3010" element="_PFCzgl8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_PFMkgV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_PFMkgl8QEeybxIskUaV8dQ"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_PFLWYl8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PFLWY18QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_PFJhMV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFJhMl8QEeybxIskUaV8dQ" x="172" y="360"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_PFLWZF8QEeybxIskUaV8dQ" type="2003" element="_PE63sF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_PFL9cF8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_PFL9cV8QEeybxIskUaV8dQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_PFMkhl8QEeybxIskUaV8dQ" type="3010" element="_PFDak18QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_PFMkh18QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_PFMkiF8QEeybxIskUaV8dQ"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_PFL9cl8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PFL9c18QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_PFLWZV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFLWZl8QEeybxIskUaV8dQ" x="444" y="360"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_V5YOEF8QEeybxIskUaV8dQ" type="2003" element="_V4TQAF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_V5aDQF8QEeybxIskUaV8dQ" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_V5aDQV8QEeybxIskUaV8dQ" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_V5bRYF8QEeybxIskUaV8dQ" type="3010" element="_V5EsEV8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_V5bRYV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_V5bRYl8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_V5bRY18QEeybxIskUaV8dQ" type="3010" element="_V5GhQF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_V5bRZF8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8" bold="true"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_V5bRZV8QEeybxIskUaV8dQ"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_V5b4cF8QEeybxIskUaV8dQ" type="3010" element="_V5IWcF8QEeybxIskUaV8dQ">
-              <styles xmi:type="notation:FontStyle" xmi:id="_V5b4cV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_V5b4cl8QEeybxIskUaV8dQ"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_V5aDQl8QEeybxIskUaV8dQ"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_V5aDQ18QEeybxIskUaV8dQ"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_V5YOEV8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5YOEl8QEeybxIskUaV8dQ" x="56" y="192"/>
-        </children>
-        <styles xmi:type="notation:DiagramStyle" xmi:id="_DIT7wV8QEeybxIskUaV8dQ"/>
-        <edges xmi:type="notation:Edge" xmi:id="_GKt81l8QEeybxIskUaV8dQ" type="4001" element="_GKbB4F8QEeybxIskUaV8dQ" source="_GKiWo18QEeybxIskUaV8dQ" target="_GKhIgF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_GKuj418QEeybxIskUaV8dQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKuj5F8QEeybxIskUaV8dQ" x="9" y="-49"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_GKuj5V8QEeybxIskUaV8dQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKuj5l8QEeybxIskUaV8dQ" x="28" y="7"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_GKuj518QEeybxIskUaV8dQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GKuj6F8QEeybxIskUaV8dQ" x="3" y="7"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_GKuj4F8QEeybxIskUaV8dQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_GKuj4V8QEeybxIskUaV8dQ" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GKuj4l8QEeybxIskUaV8dQ" points="[0, 49, 0, -96]$[0, 96, 0, -49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GKvK8F8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GKvK8V8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_PFNLkF8QEeybxIskUaV8dQ" type="4001" element="_PFF20F8QEeybxIskUaV8dQ" source="_PFJhMF8QEeybxIskUaV8dQ" target="_GKhIgF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_PFNLlF8QEeybxIskUaV8dQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFNLlV8QEeybxIskUaV8dQ" x="9" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_PFNyoF8QEeybxIskUaV8dQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFNyoV8QEeybxIskUaV8dQ" x="-19" y="9"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_PFNyol8QEeybxIskUaV8dQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFNyo18QEeybxIskUaV8dQ" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_PFNLkV8QEeybxIskUaV8dQ" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_PFNLkl8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PFNLk18QEeybxIskUaV8dQ" points="[0, -49, -143, 119]$[0, -81, -143, 87]$[144, -81, 1, 87]$[144, -119, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFOZsF8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFOZsV8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_PFPAwF8QEeybxIskUaV8dQ" type="4001" element="_PFGd418QEeybxIskUaV8dQ" source="_PFLWZF8QEeybxIskUaV8dQ" target="_GKhIgF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_PFPAxF8QEeybxIskUaV8dQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFPAxV8QEeybxIskUaV8dQ" x="-67"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_PFPAxl8QEeybxIskUaV8dQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFPAx18QEeybxIskUaV8dQ" x="-23" y="-8"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_PFPAyF8QEeybxIskUaV8dQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PFPAyV8QEeybxIskUaV8dQ" x="-21" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_PFPAwV8QEeybxIskUaV8dQ" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_PFPAwl8QEeybxIskUaV8dQ" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PFPAw18QEeybxIskUaV8dQ" points="[0, -49, 140, 79]$[0, -61, 140, 67]$[-139, -61, 1, 67]$[-139, -79, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFPAyl8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PFPAy18QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_V5b4c18QEeybxIskUaV8dQ" type="4001" element="_V5PEIF8QEeybxIskUaV8dQ" source="_GKiWo18QEeybxIskUaV8dQ" target="_V5YOEF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_V5cfgF8QEeybxIskUaV8dQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5cfgV8QEeybxIskUaV8dQ" x="6" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_V5cfgl8QEeybxIskUaV8dQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5cfg18QEeybxIskUaV8dQ" x="-5" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_V5cfhF8QEeybxIskUaV8dQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5cfhV8QEeybxIskUaV8dQ" x="23" y="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_V5b4dF8QEeybxIskUaV8dQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_V5b4dV8QEeybxIskUaV8dQ" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V5b4dl8QEeybxIskUaV8dQ" points="[-59, -18, 189, -163]$[-118, -18, 130, -163]$[-118, 161, 130, 16]$[-178, 161, 70, 16]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V5eUsF8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V5eUsV8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_V5eUsl8QEeybxIskUaV8dQ" type="4001" element="_V5Sug18QEeybxIskUaV8dQ" source="_PFJhMF8QEeybxIskUaV8dQ" target="_V5YOEF8QEeybxIskUaV8dQ">
-          <children xmi:type="notation:Node" xmi:id="_V5eUtl8QEeybxIskUaV8dQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5eUt18QEeybxIskUaV8dQ" x="9" y="32"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_V5eUuF8QEeybxIskUaV8dQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5eUuV8QEeybxIskUaV8dQ" x="3"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_V5eUul8QEeybxIskUaV8dQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V5eUu18QEeybxIskUaV8dQ" x="8" y="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_V5eUs18QEeybxIskUaV8dQ" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_V5eUtF8QEeybxIskUaV8dQ" fontColor="7490599" fontName=".AppleSystemUIFont" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_V5eUtV8QEeybxIskUaV8dQ" points="[-11, -49, 94, 119]$[-11, -140, 94, 28]$[-35, -140, 70, 28]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V5eUvF8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_V5eUvV8QEeybxIskUaV8dQ" id="(0.5,0.5)"/>
-        </edges>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_DIfh8F8QEeybxIskUaV8dQ" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_DIgJAF8QEeybxIskUaV8dQ">
-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_GKWwcF8QEeybxIskUaV8dQ" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <labelFormat>bold</labelFormat>
-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_V5RgYF8QEeybxIskUaV8dQ" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_V5RgYV8QEeybxIskUaV8dQ" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_V5SHcF8QEeybxIskUaV8dQ" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_V5T8oF8QEeybxIskUaV8dQ" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_V5T8oV8QEeybxIskUaV8dQ" showIcon="false" labelExpression="service:render">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_V5T8ol8QEeybxIskUaV8dQ" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GJt3QF8QEeybxIskUaV8dQ" name="DataDescription" tooltipText="" incomingEdges="_GKbB4F8QEeybxIskUaV8dQ _PFF20F8QEeybxIskUaV8dQ _PFGd418QEeybxIskUaV8dQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="model.ecore#//DataDescription"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//DataDescription"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GJ8gwF8QEeybxIskUaV8dQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
-        <labelFormat>italic</labelFormat>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKU7QF8QEeybxIskUaV8dQ" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="model.ecore#//DataDescription/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="model.ecore#//DataDescription/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKXXgF8QEeybxIskUaV8dQ" labelAlignment="LEFT" description="_GKWwcF8QEeybxIskUaV8dQ">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKYloF8QEeybxIskUaV8dQ" name="getScale() : ScaleType" tooltipText="getScale() : ScaleType">
-        <target xmi:type="ecore:EOperation" href="model.ecore#//DataDescription/getScale"/>
-        <semanticElements xmi:type="ecore:EOperation" href="model.ecore#//DataDescription/getScale"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKYloV8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GKCAUF8QEeybxIskUaV8dQ" name="DataDescriptionModel" tooltipText="" outgoingEdges="_GKbB4F8QEeybxIskUaV8dQ _V5PEIF8QEeybxIskUaV8dQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="model.ecore#//DataDescriptionModel"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//DataDescriptionModel"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GKD1gF8QEeybxIskUaV8dQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_GKEckV8QEeybxIskUaV8dQ" name="ScaleType" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EEnum" href="model.ecore#//ScaleType"/>
-      <semanticElements xmi:type="ecore:EEnum" href="model.ecore#//ScaleType"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_GKEckl8QEeybxIskUaV8dQ" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKZMtF8QEeybxIskUaV8dQ" name="Nominal" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Nominal"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Nominal"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKZMtV8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKZMtl8QEeybxIskUaV8dQ" name="Ordinal" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Ordinal"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Ordinal"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKZMt18QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKZzwF8QEeybxIskUaV8dQ" name="Cardinal" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Cardinal"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Cardinal"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKZzwV8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_GKZzwl8QEeybxIskUaV8dQ" name="Quotient" tooltipText="">
-        <target xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Quotient"/>
-        <semanticElements xmi:type="ecore:EEnumLiteral" href="model.ecore#//ScaleType/Quotient"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_GKZzw18QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_GKbB4F8QEeybxIskUaV8dQ" name="[0..*] descriptions" sourceNode="_GKCAUF8QEeybxIskUaV8dQ" targetNode="_GJt3QF8QEeybxIskUaV8dQ">
-      <target xmi:type="ecore:EReference" href="model.ecore#//DataDescriptionModel/descriptions"/>
-      <semanticElements xmi:type="ecore:EReference" href="model.ecore#//DataDescriptionModel/descriptions"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_GKcQAF8QEeybxIskUaV8dQ" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_GKcQAl8QEeybxIskUaV8dQ" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_GKcQAV8QEeybxIskUaV8dQ" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_PE1_MF8QEeybxIskUaV8dQ" name="TypedDataDescription" tooltipText="" outgoingEdges="_PFF20F8QEeybxIskUaV8dQ _V5Sug18QEeybxIskUaV8dQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="model.ecore#//TypedDataDescription"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//TypedDataDescription"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_PE30YF8QEeybxIskUaV8dQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_PFCzgl8QEeybxIskUaV8dQ" name="getScale() : ScaleType" tooltipText="getScale() : ScaleType">
-        <target xmi:type="ecore:EOperation" href="model.ecore#//TypedDataDescription/getScale"/>
-        <semanticElements xmi:type="ecore:EOperation" href="model.ecore#//TypedDataDescription/getScale"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_PFCzg18QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='Operation']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_PE63sF8QEeybxIskUaV8dQ" name="UntypedDataDescription" tooltipText="" outgoingEdges="_PFGd418QEeybxIskUaV8dQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="model.ecore#//UntypedDataDescription"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//UntypedDataDescription"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_PE63sV8QEeybxIskUaV8dQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_PFDak18QEeybxIskUaV8dQ" name="scale : ScaleType = Nominal" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="model.ecore#//UntypedDataDescription/scale"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="model.ecore#//UntypedDataDescription/scale"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_PFEBoF8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_PFF20F8QEeybxIskUaV8dQ" sourceNode="_PE1_MF8QEeybxIskUaV8dQ" targetNode="_GJt3QF8QEeybxIskUaV8dQ">
-      <target xmi:type="ecore:EClass" href="model.ecore#//TypedDataDescription"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//TypedDataDescription"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_PFF20V8QEeybxIskUaV8dQ" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_PFF20l8QEeybxIskUaV8dQ" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_PFF2018QEeybxIskUaV8dQ" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_PFGd418QEeybxIskUaV8dQ" sourceNode="_PE63sF8QEeybxIskUaV8dQ" targetNode="_GJt3QF8QEeybxIskUaV8dQ">
-      <target xmi:type="ecore:EClass" href="model.ecore#//UntypedDataDescription"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//UntypedDataDescription"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_PFHE8F8QEeybxIskUaV8dQ" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_PFHE8V8QEeybxIskUaV8dQ" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_PFHE8l8QEeybxIskUaV8dQ" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V4TQAF8QEeybxIskUaV8dQ" name="DataType" tooltipText="" incomingEdges="_V5PEIF8QEeybxIskUaV8dQ _V5Sug18QEeybxIskUaV8dQ" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="model.ecore#//DataType"/>
-      <semanticElements xmi:type="ecore:EClass" href="model.ecore#//DataType"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_V4oAIF8QEeybxIskUaV8dQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_V5EsEV8QEeybxIskUaV8dQ" name="scale : ScaleType = Nominal" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="model.ecore#//DataType/scale"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="model.ecore#//DataType/scale"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_V5F6MF8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_V5GhQF8QEeybxIskUaV8dQ" name="name : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="model.ecore#//DataType/name"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="model.ecore#//DataType/name"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_V5HvYF8QEeybxIskUaV8dQ" labelAlignment="LEFT" description="_GKWwcF8QEeybxIskUaV8dQ">
-          <labelFormat>bold</labelFormat>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_V5IWcF8QEeybxIskUaV8dQ" name="description : EString" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="model.ecore#//DataType/description"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="model.ecore#//DataType/description"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_V5IWcV8QEeybxIskUaV8dQ" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_V5PEIF8QEeybxIskUaV8dQ" name="[0..*] types" sourceNode="_GKCAUF8QEeybxIskUaV8dQ" targetNode="_V4TQAF8QEeybxIskUaV8dQ">
-      <target xmi:type="ecore:EReference" href="model.ecore#//DataDescriptionModel/types"/>
-      <semanticElements xmi:type="ecore:EReference" href="model.ecore#//DataDescriptionModel/types"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_V5SHcV8QEeybxIskUaV8dQ" description="_V5RgYF8QEeybxIskUaV8dQ" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_V5SHc18QEeybxIskUaV8dQ" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_V5SHcl8QEeybxIskUaV8dQ" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_V5Sug18QEeybxIskUaV8dQ" name="[1..1] type" sourceNode="_PE1_MF8QEeybxIskUaV8dQ" targetNode="_V4TQAF8QEeybxIskUaV8dQ">
-      <target xmi:type="ecore:EReference" href="model.ecore#//TypedDataDescription/type"/>
-      <semanticElements xmi:type="ecore:EReference" href="model.ecore#//TypedDataDescription/type"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_V5T8o18QEeybxIskUaV8dQ" description="_V5T8oF8QEeybxIskUaV8dQ" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_V5T8pV8QEeybxIskUaV8dQ" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_V5T8pF8QEeybxIskUaV8dQ" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_DIDdEF8QEeybxIskUaV8dQ"/>
-    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
-    <target xmi:type="ecore:EPackage" href="model.ecore#/"/>
-  </diagram:DSemanticDiagram>
-</xmi:XMI>
diff --git a/src/languages/de.evoal.languages.utils.dsl/model/model.ecore b/src/languages/de.evoal.languages.utils.dsl/model/model.ecore
deleted file mode 100644
index 9a4c9817..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/model/model.ecore
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mll" nsURI="https://www.evoal.de/languages/mll/1.0.0" nsPrefix="mll">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="/*&#xA;The definition language allows us to define types and functions for&#xA;configuration purposes.import ecore : 'http://www.eclipse.org/emf/2002/Ecore';"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/OCL/Import">
-    <details key="ddl" value="platform:/resource/de.evoal.languages.model.ddl/model/model.ecore#/"/>
-    <details key="dl" value="platform:/resource/de.evoal.languages.model.dl/model/model.ecore#/"/>
-    <details key="ecore" value="http://www.eclipse.org/emf/2002/Ecore"/>
-    <details key="el" value="platform:/resource/de.evoal.languages.model.el/model/model.ecore#/"/>
-    <details key="instance" value="platform:/resource/de.evoal.languages.model.instance/model/model.ecore#/"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="MachineLearningConfiguration">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Entry point for the model."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="uses" ordered="false" upperBound="-1"
-        eType="#//Use" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Import statements"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="definitions" ordered="false"
-        upperBound="-1" eType="#//SurrogateDefinition" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="List of configured predictions."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="statements" ordered="false"
-        upperBound="-1" eType="#//Statement" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="List of predictions."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SurrogateDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layers" ordered="false"
-        lowerBound="1" upperBound="-1" eType="#//SurrogateLayerDefinition" containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SurrogateLayerDefinition">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="functions" lowerBound="1"
-        upperBound="-1" eType="#//PartialSurrogateFunctionDefinition" containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PartialSurrogateFunctionDefinition">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="name" lowerBound="1" eType="ecore:EClass ../../de.evoal.languages.model.dl/model/model.ecore#//TypeDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" ordered="false"
-        upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.instance/model/model.ecore#//Attribute"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Prediction">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="definition" lowerBound="1"
-        eType="#//SurrogateDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outputs" ordered="false"
-        lowerBound="1" upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.ddl/model/model.ecore#//DataDescription">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="quality" eType="#//BlockStatement"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Configuration of quality estimation."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CallStatement" eSuperTypes="#//Statement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="call" lowerBound="1" eType="ecore:EClass ../../de.evoal.languages.model.el/model/model.ecore#//Call"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BlockStatement" eSuperTypes="#//Statement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="statements" ordered="false"
-        upperBound="-1" eType="#//Statement" containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PredictStatement" eSuperTypes="#//Statement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="surrogate" lowerBound="1"
-        eType="#//SurrogateDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelFilename" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="trainingData" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="statements" ordered="false"
-        upperBound="-1" eType="#//CallStatement" containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ForStatement" eSuperTypes="#//Statement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="range" lowerBound="1" eType="#//Range"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="statements" ordered="false"
-        upperBound="-1" eType="#//Statement" containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Range" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CounterRange" eSuperTypes="#//Range">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="end" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StringLiteralRange" eSuperTypes="#//Range">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elements" ordered="false"
-        upperBound="-1" eType="ecore:EClass ../../de.evoal.languages.model.el/model/model.ecore#//StringLiteral"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/OCL/Collection">
-        <details key="nullFree" value="false"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DefinedFunctionName" eSuperTypes="../../de.evoal.languages.model.el/model/model.ecore#//FunctionName">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="EL integration to allow calls to defined functions."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="definition" lowerBound="1"
-        eType="ecore:EClass ../../de.evoal.languages.model.dl/model/model.ecore#//FunctionDefinition">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Reference to the actual function."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Use">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="importURI" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/src/languages/de.evoal.languages.utils.dsl/model/model.genmodel b/src/languages/de.evoal.languages.utils.dsl/model/model.genmodel
deleted file mode 100644
index 77e26b5d..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/model/model.genmodel
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/de.evoal.languages.model.mll/src-gen" editDirectory="/de.evoal.languages.model.mll.edit/src-gen"
-    editorDirectory="/de.evoal.languages.model.mll.editor/src-gen" modelPluginID="de.evoal.languages.model.mll"
-    modelName="Mll" editPluginClass="de.evoal.languages.model.mll.provider.MllEditPlugin"
-    editorPluginClass="de.evoal.languages.model.mll.presentation.MllEditorPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory="/de.evoal.languages.model.mll.tests/src-gen"
-    testSuiteClass="de.evoal.languages.model.mll.tests.MllAllTests" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="8.0" copyrightFields="false" editPluginID="de.evoal.languages.model.mll.edit"
-    editorPluginID="de.evoal.languages.model.mll.editor" usedGenPackages="../../de.evoal.languages.model.ddl/model/model.genmodel#//ddl ../../de.evoal.languages.model.dl/model/model.genmodel#//dl ../../de.evoal.languages.model.el/model/model.genmodel#//el ../../de.evoal.languages.model.instance/model/model.genmodel#//instance"
-    importOrganizing="true">
-  <foreignModel>model.ecore</foreignModel>
-  <genPackages prefix="Mll" basePackage="de.evoal.languages.model" disposableProviderFactory="true"
-      fileExtensions="mlm" ecorePackage="model.ecore#/">
-    <genClasses ecoreClass="model.ecore#//MachineLearningConfiguration">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//MachineLearningConfiguration/uses"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//MachineLearningConfiguration/definitions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//MachineLearningConfiguration/statements"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//SurrogateDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//SurrogateDefinition/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//SurrogateDefinition/inputs"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//SurrogateDefinition/outputs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//SurrogateDefinition/layers"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//SurrogateLayerDefinition">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//SurrogateLayerDefinition/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//SurrogateLayerDefinition/functions"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//PartialSurrogateFunctionDefinition">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//PartialSurrogateFunctionDefinition/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//PartialSurrogateFunctionDefinition/inputs"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//PartialSurrogateFunctionDefinition/outputs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//PartialSurrogateFunctionDefinition/parameters"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//Prediction">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//Prediction/definition"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//Prediction/inputs"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//Prediction/outputs"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//Prediction/quality"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="model.ecore#//Statement"/>
-    <genClasses ecoreClass="model.ecore#//CallStatement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//CallStatement/call"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//BlockStatement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//BlockStatement/statements"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//PredictStatement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//PredictStatement/surrogate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//PredictStatement/modelFilename"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//PredictStatement/trainingData"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//PredictStatement/statements"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//ForStatement">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//ForStatement/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//ForStatement/range"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//ForStatement/statements"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="model.ecore#//Range"/>
-    <genClasses ecoreClass="model.ecore#//CounterRange">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//CounterRange/start"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//CounterRange/end"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//StringLiteralRange">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference model.ecore#//StringLiteralRange/elements"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//DefinedFunctionName">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference model.ecore#//DefinedFunctionName/definition"/>
-    </genClasses>
-    <genClasses ecoreClass="model.ecore#//Use">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute model.ecore#//Use/importURI"/>
-    </genClasses>
-  </genPackages>
-  <genPackages prefix="Oclstdlib" ecorePackage="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#/">
-    <genDataTypes ecoreDataType="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Boolean"/>
-    <genDataTypes ecoreDataType="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Integer"/>
-    <genDataTypes ecoreDataType="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Real"/>
-    <genDataTypes ecoreDataType="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//String"/>
-    <genDataTypes ecoreDataType="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//UnlimitedNatural"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Bag">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Bag/T"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Collection">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Collection/T"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Collection/elementType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Collection/lower"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Collection/upper"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Map">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Map/K"/>
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Map/V"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Map/keyType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Map/valueType"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclAny"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclComparable"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclElement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclElement/oclContainer"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclElement/oclContents"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclEnumeration"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclInvalid">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclInvalid/oclBadProperty"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclLambda"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclMessage"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclSelf"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclState"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclStereotype"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclSummable"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclTuple"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclType"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OclVoid"/>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OrderedCollection">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OrderedCollection/T"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OrderedSet">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//OrderedSet/T"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Sequence">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Sequence/T"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Set">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//Set/T"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//UniqueCollection">
-      <genTypeParameters ecoreTypeParameter="platform:/plugin/org.eclipse.ocl.pivot/model-gen/oclstdlib.ecore#//UniqueCollection/T"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/src/languages/de.evoal.languages.utils.dsl/plugin.properties b/src/languages/de.evoal.languages.utils.dsl/plugin.properties
deleted file mode 100644
index 7393b7b7..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = EvoAl's Machine Learning Language
-providerName = EvoAl Project
diff --git a/src/languages/de.evoal.languages.utils.dsl/plugin.xml b/src/languages/de.evoal.languages.utils.dsl/plugin.xml
deleted file mode 100644
index bcc6b01a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
--->
-
-<plugin>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated model -->
-      <package
-            uri="https://www.evoal.de/languages/mll/1.0.0"
-            class="de.evoal.languages.model.mll.MllPackage"
-            genModel="model/model.genmodel"/>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated model -->
-      <package
-            uri="http://www.eclipse.org/ocl/2015/Library"
-            class="oclstdlib.OclstdlibPackage"
-            genModel="model/model.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/src/languages/de.evoal.languages.utils.dsl/pom.xml b/src/languages/de.evoal.languages.utils.dsl/pom.xml
deleted file mode 100644
index 65d123ed..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-        <groupId>de.evoal.languages</groupId>
-        <artifactId>de.evoal.languages.releng.parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-      <relativePath>../de.evoal.languages.releng.parent</relativePath>
-  </parent>
-
-  <artifactId>de.evoal.languages.utils.dsl</artifactId>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/BlockStatement.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/BlockStatement.java
deleted file mode 100644
index 2123f8d2..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/BlockStatement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Block Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.BlockStatement#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getBlockStatement()
- * @model
- * @generated
- */
-public interface BlockStatement extends Statement {
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.Statement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getBlockStatement_Statements()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<Statement> getStatements();
-
-} // BlockStatement
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CallStatement.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CallStatement.java
deleted file mode 100644
index 3ba21f54..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CallStatement.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.el.Call;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Call Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.CallStatement#getCall <em>Call</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getCallStatement()
- * @model
- * @generated
- */
-public interface CallStatement extends Statement {
-	/**
-	 * Returns the value of the '<em><b>Call</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Call</em>' containment reference.
-	 * @see #setCall(Call)
-	 * @see de.evoal.languages.model.mll.MllPackage#getCallStatement_Call()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Call getCall();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.CallStatement#getCall <em>Call</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Call</em>' containment reference.
-	 * @see #getCall()
-	 * @generated
-	 */
-	void setCall(Call value);
-
-} // CallStatement
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CounterRange.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CounterRange.java
deleted file mode 100644
index 4a704e8b..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/CounterRange.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Counter Range</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.CounterRange#getStart <em>Start</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.CounterRange#getEnd <em>End</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getCounterRange()
- * @model
- * @generated
- */
-public interface CounterRange extends Range {
-	/**
-	 * Returns the value of the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Start</em>' attribute.
-	 * @see #setStart(int)
-	 * @see de.evoal.languages.model.mll.MllPackage#getCounterRange_Start()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getStart();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.CounterRange#getStart <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' attribute.
-	 * @see #getStart()
-	 * @generated
-	 */
-	void setStart(int value);
-
-	/**
-	 * Returns the value of the '<em><b>End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>End</em>' attribute.
-	 * @see #setEnd(int)
-	 * @see de.evoal.languages.model.mll.MllPackage#getCounterRange_End()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getEnd();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.CounterRange#getEnd <em>End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End</em>' attribute.
-	 * @see #getEnd()
-	 * @generated
-	 */
-	void setEnd(int value);
-
-} // CounterRange
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/DefinedFunctionName.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/DefinedFunctionName.java
deleted file mode 100644
index dbc11c3b..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/DefinedFunctionName.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.dl.FunctionDefinition;
-
-import de.evoal.languages.model.el.FunctionName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Defined Function Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * EL integration to allow calls to defined functions.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.DefinedFunctionName#getDefinition <em>Definition</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getDefinedFunctionName()
- * @model
- * @generated
- */
-public interface DefinedFunctionName extends FunctionName {
-	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Reference to the actual function.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Definition</em>' reference.
-	 * @see #setDefinition(FunctionDefinition)
-	 * @see de.evoal.languages.model.mll.MllPackage#getDefinedFunctionName_Definition()
-	 * @model required="true"
-	 * @generated
-	 */
-	FunctionDefinition getDefinition();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.DefinedFunctionName#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
-	 * @see #getDefinition()
-	 * @generated
-	 */
-	void setDefinition(FunctionDefinition value);
-
-} // DefinedFunctionName
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/ForStatement.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/ForStatement.java
deleted file mode 100644
index 51221ce3..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/ForStatement.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>For Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.ForStatement#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.ForStatement#getRange <em>Range</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.ForStatement#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getForStatement()
- * @model
- * @generated
- */
-public interface ForStatement extends Statement {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getForStatement_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.ForStatement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Range</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Range</em>' containment reference.
-	 * @see #setRange(Range)
-	 * @see de.evoal.languages.model.mll.MllPackage#getForStatement_Range()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Range getRange();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.ForStatement#getRange <em>Range</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Range</em>' containment reference.
-	 * @see #getRange()
-	 * @generated
-	 */
-	void setRange(Range value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.Statement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getForStatement_Statements()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<Statement> getStatements();
-
-} // ForStatement
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MachineLearningConfiguration.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MachineLearningConfiguration.java
deleted file mode 100644
index 8ad5fd1a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MachineLearningConfiguration.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Machine Learning Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Entry point for the model.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getUses <em>Uses</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getMachineLearningConfiguration()
- * @model
- * @generated
- */
-public interface MachineLearningConfiguration extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Uses</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.Use}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Import statements
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Uses</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getMachineLearningConfiguration_Uses()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<Use> getUses();
-
-	/**
-	 * Returns the value of the '<em><b>Definitions</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.SurrogateDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * List of configured predictions.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Definitions</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getMachineLearningConfiguration_Definitions()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<SurrogateDefinition> getDefinitions();
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.Statement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * List of predictions.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Statements</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getMachineLearningConfiguration_Statements()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<Statement> getStatements();
-
-} // MachineLearningConfiguration
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllFactory.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllFactory.java
deleted file mode 100644
index 9de1578a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllFactory.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see de.evoal.languages.model.mll.MllPackage
- * @generated
- */
-public interface MllFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MllFactory eINSTANCE = de.evoal.languages.model.mll.impl.MllFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Machine Learning Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Machine Learning Configuration</em>'.
-	 * @generated
-	 */
-	MachineLearningConfiguration createMachineLearningConfiguration();
-
-	/**
-	 * Returns a new object of class '<em>Surrogate Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Surrogate Definition</em>'.
-	 * @generated
-	 */
-	SurrogateDefinition createSurrogateDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Surrogate Layer Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Surrogate Layer Definition</em>'.
-	 * @generated
-	 */
-	SurrogateLayerDefinition createSurrogateLayerDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Partial Surrogate Function Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Partial Surrogate Function Definition</em>'.
-	 * @generated
-	 */
-	PartialSurrogateFunctionDefinition createPartialSurrogateFunctionDefinition();
-
-	/**
-	 * Returns a new object of class '<em>Prediction</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Prediction</em>'.
-	 * @generated
-	 */
-	Prediction createPrediction();
-
-	/**
-	 * Returns a new object of class '<em>Call Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Call Statement</em>'.
-	 * @generated
-	 */
-	CallStatement createCallStatement();
-
-	/**
-	 * Returns a new object of class '<em>Block Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Block Statement</em>'.
-	 * @generated
-	 */
-	BlockStatement createBlockStatement();
-
-	/**
-	 * Returns a new object of class '<em>Predict Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Predict Statement</em>'.
-	 * @generated
-	 */
-	PredictStatement createPredictStatement();
-
-	/**
-	 * Returns a new object of class '<em>For Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>For Statement</em>'.
-	 * @generated
-	 */
-	ForStatement createForStatement();
-
-	/**
-	 * Returns a new object of class '<em>Counter Range</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Counter Range</em>'.
-	 * @generated
-	 */
-	CounterRange createCounterRange();
-
-	/**
-	 * Returns a new object of class '<em>String Literal Range</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>String Literal Range</em>'.
-	 * @generated
-	 */
-	StringLiteralRange createStringLiteralRange();
-
-	/**
-	 * Returns a new object of class '<em>Defined Function Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Defined Function Name</em>'.
-	 * @generated
-	 */
-	DefinedFunctionName createDefinedFunctionName();
-
-	/**
-	 * Returns a new object of class '<em>Use</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Use</em>'.
-	 * @generated
-	 */
-	Use createUse();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MllPackage getMllPackage();
-
-} //MllFactory
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllPackage.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllPackage.java
deleted file mode 100644
index 09f34c32..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/MllPackage.java
+++ /dev/null
@@ -1,1544 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.el.ELPackage;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * /*
- * The definition language allows us to define types and functions for
- * configuration purposes.import ecore : 'http://www.eclipse.org/emf/2002/Ecore';
- * <!-- end-model-doc -->
- * @see de.evoal.languages.model.mll.MllFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/OCL/Import ddl='platform:/resource/de.evoal.languages.model.ddl/model/model.ecore#/' dl='platform:/resource/de.evoal.languages.model.dl/model/model.ecore#/' ecore='http://www.eclipse.org/emf/2002/Ecore' el='platform:/resource/de.evoal.languages.model.el/model/model.ecore#/' instance='platform:/resource/de.evoal.languages.model.instance/model/model.ecore#/'"
- * @generated
- */
-public interface MllPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "mll";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "https://www.evoal.de/languages/mll/1.0.0";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "mll";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MllPackage eINSTANCE = de.evoal.languages.model.mll.impl.MllPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl <em>Machine Learning Configuration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getMachineLearningConfiguration()
-	 * @generated
-	 */
-	int MACHINE_LEARNING_CONFIGURATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Uses</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MACHINE_LEARNING_CONFIGURATION__USES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Definitions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MACHINE_LEARNING_CONFIGURATION__DEFINITIONS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Statements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MACHINE_LEARNING_CONFIGURATION__STATEMENTS = 2;
-
-	/**
-	 * The number of structural features of the '<em>Machine Learning Configuration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MACHINE_LEARNING_CONFIGURATION_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl <em>Surrogate Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getSurrogateDefinition()
-	 * @generated
-	 */
-	int SURROGATE_DEFINITION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_DEFINITION__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Inputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_DEFINITION__INPUTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Outputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_DEFINITION__OUTPUTS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Layers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_DEFINITION__LAYERS = 3;
-
-	/**
-	 * The number of structural features of the '<em>Surrogate Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_DEFINITION_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl <em>Surrogate Layer Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getSurrogateLayerDefinition()
-	 * @generated
-	 */
-	int SURROGATE_LAYER_DEFINITION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_LAYER_DEFINITION__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Functions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_LAYER_DEFINITION__FUNCTIONS = 1;
-
-	/**
-	 * The number of structural features of the '<em>Surrogate Layer Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SURROGATE_LAYER_DEFINITION_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl <em>Partial Surrogate Function Definition</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPartialSurrogateFunctionDefinition()
-	 * @generated
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Inputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Outputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS = 3;
-
-	/**
-	 * The number of structural features of the '<em>Partial Surrogate Function Definition</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PARTIAL_SURROGATE_FUNCTION_DEFINITION_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.PredictionImpl <em>Prediction</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.PredictionImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPrediction()
-	 * @generated
-	 */
-	int PREDICTION = 4;
-
-	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION__DEFINITION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Inputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION__INPUTS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Outputs</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION__OUTPUTS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Quality</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION__QUALITY = 3;
-
-	/**
-	 * The number of structural features of the '<em>Prediction</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICTION_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.StatementImpl <em>Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.StatementImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getStatement()
-	 * @generated
-	 */
-	int STATEMENT = 5;
-
-	/**
-	 * The number of structural features of the '<em>Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STATEMENT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.CallStatementImpl <em>Call Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.CallStatementImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getCallStatement()
-	 * @generated
-	 */
-	int CALL_STATEMENT = 6;
-
-	/**
-	 * The feature id for the '<em><b>Call</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_STATEMENT__CALL = STATEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Call Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CALL_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.BlockStatementImpl <em>Block Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.BlockStatementImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getBlockStatement()
-	 * @generated
-	 */
-	int BLOCK_STATEMENT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Statements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BLOCK_STATEMENT__STATEMENTS = STATEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Block Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BLOCK_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.PredictStatementImpl <em>Predict Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.PredictStatementImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPredictStatement()
-	 * @generated
-	 */
-	int PREDICT_STATEMENT = 8;
-
-	/**
-	 * The feature id for the '<em><b>Surrogate</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICT_STATEMENT__SURROGATE = STATEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Model Filename</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICT_STATEMENT__MODEL_FILENAME = STATEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Training Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICT_STATEMENT__TRAINING_DATA = STATEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Statements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICT_STATEMENT__STATEMENTS = STATEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Predict Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDICT_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.ForStatementImpl <em>For Statement</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.ForStatementImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getForStatement()
-	 * @generated
-	 */
-	int FOR_STATEMENT = 9;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FOR_STATEMENT__NAME = STATEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Range</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FOR_STATEMENT__RANGE = STATEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Statements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FOR_STATEMENT__STATEMENTS = STATEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>For Statement</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FOR_STATEMENT_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.RangeImpl <em>Range</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.RangeImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getRange()
-	 * @generated
-	 */
-	int RANGE = 10;
-
-	/**
-	 * The number of structural features of the '<em>Range</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RANGE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.CounterRangeImpl <em>Counter Range</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.CounterRangeImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getCounterRange()
-	 * @generated
-	 */
-	int COUNTER_RANGE = 11;
-
-	/**
-	 * The feature id for the '<em><b>Start</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COUNTER_RANGE__START = RANGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>End</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COUNTER_RANGE__END = RANGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Counter Range</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COUNTER_RANGE_FEATURE_COUNT = RANGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.StringLiteralRangeImpl <em>String Literal Range</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.StringLiteralRangeImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getStringLiteralRange()
-	 * @generated
-	 */
-	int STRING_LITERAL_RANGE = 12;
-
-	/**
-	 * The feature id for the '<em><b>Elements</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_LITERAL_RANGE__ELEMENTS = RANGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>String Literal Range</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STRING_LITERAL_RANGE_FEATURE_COUNT = RANGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.DefinedFunctionNameImpl <em>Defined Function Name</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.DefinedFunctionNameImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getDefinedFunctionName()
-	 * @generated
-	 */
-	int DEFINED_FUNCTION_NAME = 13;
-
-	/**
-	 * The feature id for the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFINED_FUNCTION_NAME__DEFINITION = ELPackage.FUNCTION_NAME_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Defined Function Name</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFINED_FUNCTION_NAME_FEATURE_COUNT = ELPackage.FUNCTION_NAME_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link de.evoal.languages.model.mll.impl.UseImpl <em>Use</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see de.evoal.languages.model.mll.impl.UseImpl
-	 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getUse()
-	 * @generated
-	 */
-	int USE = 14;
-
-	/**
-	 * The feature id for the '<em><b>Import URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE__IMPORT_URI = 0;
-
-	/**
-	 * The number of structural features of the '<em>Use</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int USE_FEATURE_COUNT = 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.MachineLearningConfiguration <em>Machine Learning Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Machine Learning Configuration</em>'.
-	 * @see de.evoal.languages.model.mll.MachineLearningConfiguration
-	 * @generated
-	 */
-	EClass getMachineLearningConfiguration();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getUses <em>Uses</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Uses</em>'.
-	 * @see de.evoal.languages.model.mll.MachineLearningConfiguration#getUses()
-	 * @see #getMachineLearningConfiguration()
-	 * @generated
-	 */
-	EReference getMachineLearningConfiguration_Uses();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getDefinitions <em>Definitions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Definitions</em>'.
-	 * @see de.evoal.languages.model.mll.MachineLearningConfiguration#getDefinitions()
-	 * @see #getMachineLearningConfiguration()
-	 * @generated
-	 */
-	EReference getMachineLearningConfiguration_Definitions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.MachineLearningConfiguration#getStatements <em>Statements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Statements</em>'.
-	 * @see de.evoal.languages.model.mll.MachineLearningConfiguration#getStatements()
-	 * @see #getMachineLearningConfiguration()
-	 * @generated
-	 */
-	EReference getMachineLearningConfiguration_Statements();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.SurrogateDefinition <em>Surrogate Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Surrogate Definition</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition
-	 * @generated
-	 */
-	EClass getSurrogateDefinition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.SurrogateDefinition#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition#getName()
-	 * @see #getSurrogateDefinition()
-	 * @generated
-	 */
-	EAttribute getSurrogateDefinition_Name();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.SurrogateDefinition#getInputs <em>Inputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Inputs</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition#getInputs()
-	 * @see #getSurrogateDefinition()
-	 * @generated
-	 */
-	EReference getSurrogateDefinition_Inputs();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.SurrogateDefinition#getOutputs <em>Outputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Outputs</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition#getOutputs()
-	 * @see #getSurrogateDefinition()
-	 * @generated
-	 */
-	EReference getSurrogateDefinition_Outputs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.SurrogateDefinition#getLayers <em>Layers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Layers</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition#getLayers()
-	 * @see #getSurrogateDefinition()
-	 * @generated
-	 */
-	EReference getSurrogateDefinition_Layers();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.SurrogateLayerDefinition <em>Surrogate Layer Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Surrogate Layer Definition</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateLayerDefinition
-	 * @generated
-	 */
-	EClass getSurrogateLayerDefinition();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.SurrogateLayerDefinition#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateLayerDefinition#getName()
-	 * @see #getSurrogateLayerDefinition()
-	 * @generated
-	 */
-	EAttribute getSurrogateLayerDefinition_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.SurrogateLayerDefinition#getFunctions <em>Functions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Functions</em>'.
-	 * @see de.evoal.languages.model.mll.SurrogateLayerDefinition#getFunctions()
-	 * @see #getSurrogateLayerDefinition()
-	 * @generated
-	 */
-	EReference getSurrogateLayerDefinition_Functions();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition <em>Partial Surrogate Function Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Partial Surrogate Function Definition</em>'.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition
-	 * @generated
-	 */
-	EClass getPartialSurrogateFunctionDefinition();
-
-	/**
-	 * Returns the meta object for the reference '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Name</em>'.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getName()
-	 * @see #getPartialSurrogateFunctionDefinition()
-	 * @generated
-	 */
-	EReference getPartialSurrogateFunctionDefinition_Name();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getInputs <em>Inputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Inputs</em>'.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getInputs()
-	 * @see #getPartialSurrogateFunctionDefinition()
-	 * @generated
-	 */
-	EReference getPartialSurrogateFunctionDefinition_Inputs();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getOutputs <em>Outputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Outputs</em>'.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getOutputs()
-	 * @see #getPartialSurrogateFunctionDefinition()
-	 * @generated
-	 */
-	EReference getPartialSurrogateFunctionDefinition_Outputs();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getParameters <em>Parameters</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Parameters</em>'.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getParameters()
-	 * @see #getPartialSurrogateFunctionDefinition()
-	 * @generated
-	 */
-	EReference getPartialSurrogateFunctionDefinition_Parameters();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.Prediction <em>Prediction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Prediction</em>'.
-	 * @see de.evoal.languages.model.mll.Prediction
-	 * @generated
-	 */
-	EClass getPrediction();
-
-	/**
-	 * Returns the meta object for the reference '{@link de.evoal.languages.model.mll.Prediction#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Definition</em>'.
-	 * @see de.evoal.languages.model.mll.Prediction#getDefinition()
-	 * @see #getPrediction()
-	 * @generated
-	 */
-	EReference getPrediction_Definition();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.Prediction#getInputs <em>Inputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Inputs</em>'.
-	 * @see de.evoal.languages.model.mll.Prediction#getInputs()
-	 * @see #getPrediction()
-	 * @generated
-	 */
-	EReference getPrediction_Inputs();
-
-	/**
-	 * Returns the meta object for the reference list '{@link de.evoal.languages.model.mll.Prediction#getOutputs <em>Outputs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Outputs</em>'.
-	 * @see de.evoal.languages.model.mll.Prediction#getOutputs()
-	 * @see #getPrediction()
-	 * @generated
-	 */
-	EReference getPrediction_Outputs();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link de.evoal.languages.model.mll.Prediction#getQuality <em>Quality</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Quality</em>'.
-	 * @see de.evoal.languages.model.mll.Prediction#getQuality()
-	 * @see #getPrediction()
-	 * @generated
-	 */
-	EReference getPrediction_Quality();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.Statement <em>Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Statement</em>'.
-	 * @see de.evoal.languages.model.mll.Statement
-	 * @generated
-	 */
-	EClass getStatement();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.CallStatement <em>Call Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Call Statement</em>'.
-	 * @see de.evoal.languages.model.mll.CallStatement
-	 * @generated
-	 */
-	EClass getCallStatement();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link de.evoal.languages.model.mll.CallStatement#getCall <em>Call</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Call</em>'.
-	 * @see de.evoal.languages.model.mll.CallStatement#getCall()
-	 * @see #getCallStatement()
-	 * @generated
-	 */
-	EReference getCallStatement_Call();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.BlockStatement <em>Block Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Block Statement</em>'.
-	 * @see de.evoal.languages.model.mll.BlockStatement
-	 * @generated
-	 */
-	EClass getBlockStatement();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.BlockStatement#getStatements <em>Statements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Statements</em>'.
-	 * @see de.evoal.languages.model.mll.BlockStatement#getStatements()
-	 * @see #getBlockStatement()
-	 * @generated
-	 */
-	EReference getBlockStatement_Statements();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.PredictStatement <em>Predict Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Predict Statement</em>'.
-	 * @see de.evoal.languages.model.mll.PredictStatement
-	 * @generated
-	 */
-	EClass getPredictStatement();
-
-	/**
-	 * Returns the meta object for the reference '{@link de.evoal.languages.model.mll.PredictStatement#getSurrogate <em>Surrogate</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Surrogate</em>'.
-	 * @see de.evoal.languages.model.mll.PredictStatement#getSurrogate()
-	 * @see #getPredictStatement()
-	 * @generated
-	 */
-	EReference getPredictStatement_Surrogate();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.PredictStatement#getModelFilename <em>Model Filename</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Model Filename</em>'.
-	 * @see de.evoal.languages.model.mll.PredictStatement#getModelFilename()
-	 * @see #getPredictStatement()
-	 * @generated
-	 */
-	EAttribute getPredictStatement_ModelFilename();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.PredictStatement#getTrainingData <em>Training Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Training Data</em>'.
-	 * @see de.evoal.languages.model.mll.PredictStatement#getTrainingData()
-	 * @see #getPredictStatement()
-	 * @generated
-	 */
-	EAttribute getPredictStatement_TrainingData();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.PredictStatement#getStatements <em>Statements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Statements</em>'.
-	 * @see de.evoal.languages.model.mll.PredictStatement#getStatements()
-	 * @see #getPredictStatement()
-	 * @generated
-	 */
-	EReference getPredictStatement_Statements();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.ForStatement <em>For Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>For Statement</em>'.
-	 * @see de.evoal.languages.model.mll.ForStatement
-	 * @generated
-	 */
-	EClass getForStatement();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.ForStatement#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see de.evoal.languages.model.mll.ForStatement#getName()
-	 * @see #getForStatement()
-	 * @generated
-	 */
-	EAttribute getForStatement_Name();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link de.evoal.languages.model.mll.ForStatement#getRange <em>Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Range</em>'.
-	 * @see de.evoal.languages.model.mll.ForStatement#getRange()
-	 * @see #getForStatement()
-	 * @generated
-	 */
-	EReference getForStatement_Range();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.ForStatement#getStatements <em>Statements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Statements</em>'.
-	 * @see de.evoal.languages.model.mll.ForStatement#getStatements()
-	 * @see #getForStatement()
-	 * @generated
-	 */
-	EReference getForStatement_Statements();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.Range <em>Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Range</em>'.
-	 * @see de.evoal.languages.model.mll.Range
-	 * @generated
-	 */
-	EClass getRange();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.CounterRange <em>Counter Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Counter Range</em>'.
-	 * @see de.evoal.languages.model.mll.CounterRange
-	 * @generated
-	 */
-	EClass getCounterRange();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.CounterRange#getStart <em>Start</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Start</em>'.
-	 * @see de.evoal.languages.model.mll.CounterRange#getStart()
-	 * @see #getCounterRange()
-	 * @generated
-	 */
-	EAttribute getCounterRange_Start();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.CounterRange#getEnd <em>End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>End</em>'.
-	 * @see de.evoal.languages.model.mll.CounterRange#getEnd()
-	 * @see #getCounterRange()
-	 * @generated
-	 */
-	EAttribute getCounterRange_End();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.StringLiteralRange <em>String Literal Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>String Literal Range</em>'.
-	 * @see de.evoal.languages.model.mll.StringLiteralRange
-	 * @generated
-	 */
-	EClass getStringLiteralRange();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link de.evoal.languages.model.mll.StringLiteralRange#getElements <em>Elements</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Elements</em>'.
-	 * @see de.evoal.languages.model.mll.StringLiteralRange#getElements()
-	 * @see #getStringLiteralRange()
-	 * @generated
-	 */
-	EReference getStringLiteralRange_Elements();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.DefinedFunctionName <em>Defined Function Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Defined Function Name</em>'.
-	 * @see de.evoal.languages.model.mll.DefinedFunctionName
-	 * @generated
-	 */
-	EClass getDefinedFunctionName();
-
-	/**
-	 * Returns the meta object for the reference '{@link de.evoal.languages.model.mll.DefinedFunctionName#getDefinition <em>Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Definition</em>'.
-	 * @see de.evoal.languages.model.mll.DefinedFunctionName#getDefinition()
-	 * @see #getDefinedFunctionName()
-	 * @generated
-	 */
-	EReference getDefinedFunctionName_Definition();
-
-	/**
-	 * Returns the meta object for class '{@link de.evoal.languages.model.mll.Use <em>Use</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Use</em>'.
-	 * @see de.evoal.languages.model.mll.Use
-	 * @generated
-	 */
-	EClass getUse();
-
-	/**
-	 * Returns the meta object for the attribute '{@link de.evoal.languages.model.mll.Use#getImportURI <em>Import URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Import URI</em>'.
-	 * @see de.evoal.languages.model.mll.Use#getImportURI()
-	 * @see #getUse()
-	 * @generated
-	 */
-	EAttribute getUse_ImportURI();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	MllFactory getMllFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl <em>Machine Learning Configuration</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getMachineLearningConfiguration()
-		 * @generated
-		 */
-		EClass MACHINE_LEARNING_CONFIGURATION = eINSTANCE.getMachineLearningConfiguration();
-
-		/**
-		 * The meta object literal for the '<em><b>Uses</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MACHINE_LEARNING_CONFIGURATION__USES = eINSTANCE.getMachineLearningConfiguration_Uses();
-
-		/**
-		 * The meta object literal for the '<em><b>Definitions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MACHINE_LEARNING_CONFIGURATION__DEFINITIONS = eINSTANCE.getMachineLearningConfiguration_Definitions();
-
-		/**
-		 * The meta object literal for the '<em><b>Statements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference MACHINE_LEARNING_CONFIGURATION__STATEMENTS = eINSTANCE.getMachineLearningConfiguration_Statements();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl <em>Surrogate Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getSurrogateDefinition()
-		 * @generated
-		 */
-		EClass SURROGATE_DEFINITION = eINSTANCE.getSurrogateDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SURROGATE_DEFINITION__NAME = eINSTANCE.getSurrogateDefinition_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Inputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SURROGATE_DEFINITION__INPUTS = eINSTANCE.getSurrogateDefinition_Inputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Outputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SURROGATE_DEFINITION__OUTPUTS = eINSTANCE.getSurrogateDefinition_Outputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Layers</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SURROGATE_DEFINITION__LAYERS = eINSTANCE.getSurrogateDefinition_Layers();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl <em>Surrogate Layer Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getSurrogateLayerDefinition()
-		 * @generated
-		 */
-		EClass SURROGATE_LAYER_DEFINITION = eINSTANCE.getSurrogateLayerDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute SURROGATE_LAYER_DEFINITION__NAME = eINSTANCE.getSurrogateLayerDefinition_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Functions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference SURROGATE_LAYER_DEFINITION__FUNCTIONS = eINSTANCE.getSurrogateLayerDefinition_Functions();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl <em>Partial Surrogate Function Definition</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPartialSurrogateFunctionDefinition()
-		 * @generated
-		 */
-		EClass PARTIAL_SURROGATE_FUNCTION_DEFINITION = eINSTANCE.getPartialSurrogateFunctionDefinition();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME = eINSTANCE.getPartialSurrogateFunctionDefinition_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Inputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS = eINSTANCE.getPartialSurrogateFunctionDefinition_Inputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Outputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS = eINSTANCE.getPartialSurrogateFunctionDefinition_Outputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS = eINSTANCE.getPartialSurrogateFunctionDefinition_Parameters();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.PredictionImpl <em>Prediction</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.PredictionImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPrediction()
-		 * @generated
-		 */
-		EClass PREDICTION = eINSTANCE.getPrediction();
-
-		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION__DEFINITION = eINSTANCE.getPrediction_Definition();
-
-		/**
-		 * The meta object literal for the '<em><b>Inputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION__INPUTS = eINSTANCE.getPrediction_Inputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Outputs</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION__OUTPUTS = eINSTANCE.getPrediction_Outputs();
-
-		/**
-		 * The meta object literal for the '<em><b>Quality</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICTION__QUALITY = eINSTANCE.getPrediction_Quality();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.StatementImpl <em>Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.StatementImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getStatement()
-		 * @generated
-		 */
-		EClass STATEMENT = eINSTANCE.getStatement();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.CallStatementImpl <em>Call Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.CallStatementImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getCallStatement()
-		 * @generated
-		 */
-		EClass CALL_STATEMENT = eINSTANCE.getCallStatement();
-
-		/**
-		 * The meta object literal for the '<em><b>Call</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference CALL_STATEMENT__CALL = eINSTANCE.getCallStatement_Call();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.BlockStatementImpl <em>Block Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.BlockStatementImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getBlockStatement()
-		 * @generated
-		 */
-		EClass BLOCK_STATEMENT = eINSTANCE.getBlockStatement();
-
-		/**
-		 * The meta object literal for the '<em><b>Statements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference BLOCK_STATEMENT__STATEMENTS = eINSTANCE.getBlockStatement_Statements();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.PredictStatementImpl <em>Predict Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.PredictStatementImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getPredictStatement()
-		 * @generated
-		 */
-		EClass PREDICT_STATEMENT = eINSTANCE.getPredictStatement();
-
-		/**
-		 * The meta object literal for the '<em><b>Surrogate</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICT_STATEMENT__SURROGATE = eINSTANCE.getPredictStatement_Surrogate();
-
-		/**
-		 * The meta object literal for the '<em><b>Model Filename</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PREDICT_STATEMENT__MODEL_FILENAME = eINSTANCE.getPredictStatement_ModelFilename();
-
-		/**
-		 * The meta object literal for the '<em><b>Training Data</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute PREDICT_STATEMENT__TRAINING_DATA = eINSTANCE.getPredictStatement_TrainingData();
-
-		/**
-		 * The meta object literal for the '<em><b>Statements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference PREDICT_STATEMENT__STATEMENTS = eINSTANCE.getPredictStatement_Statements();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.ForStatementImpl <em>For Statement</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.ForStatementImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getForStatement()
-		 * @generated
-		 */
-		EClass FOR_STATEMENT = eINSTANCE.getForStatement();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FOR_STATEMENT__NAME = eINSTANCE.getForStatement_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FOR_STATEMENT__RANGE = eINSTANCE.getForStatement_Range();
-
-		/**
-		 * The meta object literal for the '<em><b>Statements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference FOR_STATEMENT__STATEMENTS = eINSTANCE.getForStatement_Statements();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.RangeImpl <em>Range</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.RangeImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getRange()
-		 * @generated
-		 */
-		EClass RANGE = eINSTANCE.getRange();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.CounterRangeImpl <em>Counter Range</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.CounterRangeImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getCounterRange()
-		 * @generated
-		 */
-		EClass COUNTER_RANGE = eINSTANCE.getCounterRange();
-
-		/**
-		 * The meta object literal for the '<em><b>Start</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COUNTER_RANGE__START = eINSTANCE.getCounterRange_Start();
-
-		/**
-		 * The meta object literal for the '<em><b>End</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COUNTER_RANGE__END = eINSTANCE.getCounterRange_End();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.StringLiteralRangeImpl <em>String Literal Range</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.StringLiteralRangeImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getStringLiteralRange()
-		 * @generated
-		 */
-		EClass STRING_LITERAL_RANGE = eINSTANCE.getStringLiteralRange();
-
-		/**
-		 * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference STRING_LITERAL_RANGE__ELEMENTS = eINSTANCE.getStringLiteralRange_Elements();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.DefinedFunctionNameImpl <em>Defined Function Name</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.DefinedFunctionNameImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getDefinedFunctionName()
-		 * @generated
-		 */
-		EClass DEFINED_FUNCTION_NAME = eINSTANCE.getDefinedFunctionName();
-
-		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference DEFINED_FUNCTION_NAME__DEFINITION = eINSTANCE.getDefinedFunctionName_Definition();
-
-		/**
-		 * The meta object literal for the '{@link de.evoal.languages.model.mll.impl.UseImpl <em>Use</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see de.evoal.languages.model.mll.impl.UseImpl
-		 * @see de.evoal.languages.model.mll.impl.MllPackageImpl#getUse()
-		 * @generated
-		 */
-		EClass USE = eINSTANCE.getUse();
-
-		/**
-		 * The meta object literal for the '<em><b>Import URI</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute USE__IMPORT_URI = eINSTANCE.getUse_ImportURI();
-
-	}
-
-} //MllPackage
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PartialSurrogateFunctionDefinition.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PartialSurrogateFunctionDefinition.java
deleted file mode 100644
index 942d3497..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PartialSurrogateFunctionDefinition.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import de.evoal.languages.model.dl.TypeDefinition;
-import de.evoal.languages.model.instance.Attribute;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Partial Surrogate Function Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getParameters <em>Parameters</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getPartialSurrogateFunctionDefinition()
- * @model
- * @generated
- */
-public interface PartialSurrogateFunctionDefinition extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' reference.
-	 * @see #setName(TypeDefinition)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPartialSurrogateFunctionDefinition_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	TypeDefinition getName();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition#getName <em>Name</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' reference.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(TypeDefinition value);
-
-	/**
-	 * Returns the value of the '<em><b>Inputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPartialSurrogateFunctionDefinition_Inputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getInputs();
-
-	/**
-	 * Returns the value of the '<em><b>Outputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPartialSurrogateFunctionDefinition_Outputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getOutputs();
-
-	/**
-	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.instance.Attribute}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parameters</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPartialSurrogateFunctionDefinition_Parameters()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<Attribute> getParameters();
-
-} // PartialSurrogateFunctionDefinition
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PredictStatement.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PredictStatement.java
deleted file mode 100644
index fc69376a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/PredictStatement.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predict Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.PredictStatement#getSurrogate <em>Surrogate</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PredictStatement#getModelFilename <em>Model Filename</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PredictStatement#getTrainingData <em>Training Data</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.PredictStatement#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getPredictStatement()
- * @model
- * @generated
- */
-public interface PredictStatement extends Statement {
-	/**
-	 * Returns the value of the '<em><b>Surrogate</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Surrogate</em>' reference.
-	 * @see #setSurrogate(SurrogateDefinition)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPredictStatement_Surrogate()
-	 * @model required="true"
-	 * @generated
-	 */
-	SurrogateDefinition getSurrogate();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.PredictStatement#getSurrogate <em>Surrogate</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Surrogate</em>' reference.
-	 * @see #getSurrogate()
-	 * @generated
-	 */
-	void setSurrogate(SurrogateDefinition value);
-
-	/**
-	 * Returns the value of the '<em><b>Model Filename</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Model Filename</em>' attribute.
-	 * @see #setModelFilename(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPredictStatement_ModelFilename()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getModelFilename();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.PredictStatement#getModelFilename <em>Model Filename</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Model Filename</em>' attribute.
-	 * @see #getModelFilename()
-	 * @generated
-	 */
-	void setModelFilename(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Training Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Training Data</em>' attribute.
-	 * @see #setTrainingData(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPredictStatement_TrainingData()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getTrainingData();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.PredictStatement#getTrainingData <em>Training Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Training Data</em>' attribute.
-	 * @see #getTrainingData()
-	 * @generated
-	 */
-	void setTrainingData(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.CallStatement}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPredictStatement_Statements()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<CallStatement> getStatements();
-
-} // PredictStatement
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Prediction.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Prediction.java
deleted file mode 100644
index 8f9f9436..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Prediction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prediction</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.Prediction#getDefinition <em>Definition</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.Prediction#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.Prediction#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.Prediction#getQuality <em>Quality</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getPrediction()
- * @model
- * @generated
- */
-public interface Prediction extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Definition</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Definition</em>' reference.
-	 * @see #setDefinition(SurrogateDefinition)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPrediction_Definition()
-	 * @model required="true"
-	 * @generated
-	 */
-	SurrogateDefinition getDefinition();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.Prediction#getDefinition <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definition</em>' reference.
-	 * @see #getDefinition()
-	 * @generated
-	 */
-	void setDefinition(SurrogateDefinition value);
-
-	/**
-	 * Returns the value of the '<em><b>Inputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPrediction_Inputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getInputs();
-
-	/**
-	 * Returns the value of the '<em><b>Outputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getPrediction_Outputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getOutputs();
-
-	/**
-	 * Returns the value of the '<em><b>Quality</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Configuration of quality estimation.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Quality</em>' containment reference.
-	 * @see #setQuality(BlockStatement)
-	 * @see de.evoal.languages.model.mll.MllPackage#getPrediction_Quality()
-	 * @model containment="true"
-	 * @generated
-	 */
-	BlockStatement getQuality();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.Prediction#getQuality <em>Quality</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Quality</em>' containment reference.
-	 * @see #getQuality()
-	 * @generated
-	 */
-	void setQuality(BlockStatement value);
-
-} // Prediction
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Range.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Range.java
deleted file mode 100644
index 4d79a19f..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Range.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Range</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see de.evoal.languages.model.mll.MllPackage#getRange()
- * @model abstract="true"
- * @generated
- */
-public interface Range extends EObject {
-} // Range
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Statement.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Statement.java
deleted file mode 100644
index de105fcc..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Statement.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see de.evoal.languages.model.mll.MllPackage#getStatement()
- * @model abstract="true"
- * @generated
- */
-public interface Statement extends EObject {
-} // Statement
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/StringLiteralRange.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/StringLiteralRange.java
deleted file mode 100644
index fbe26be5..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/StringLiteralRange.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.el.StringLiteral;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Literal Range</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.StringLiteralRange#getElements <em>Elements</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getStringLiteralRange()
- * @model
- * @generated
- */
-public interface StringLiteralRange extends Range {
-	/**
-	 * Returns the value of the '<em><b>Elements</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.el.StringLiteral}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Elements</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getStringLiteralRange_Elements()
-	 * @model containment="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<StringLiteral> getElements();
-
-} // StringLiteralRange
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateDefinition.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateDefinition.java
deleted file mode 100644
index 747dbe5e..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateDefinition.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Surrogate Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateDefinition#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateDefinition#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateDefinition#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateDefinition#getLayers <em>Layers</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getSurrogateDefinition()
- * @model
- * @generated
- */
-public interface SurrogateDefinition extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateDefinition_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.SurrogateDefinition#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Inputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateDefinition_Inputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getInputs();
-
-	/**
-	 * Returns the value of the '<em><b>Outputs</b></em>' reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.ddl.DataDescription}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outputs</em>' reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateDefinition_Outputs()
-	 * @model required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<DataDescription> getOutputs();
-
-	/**
-	 * Returns the value of the '<em><b>Layers</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.SurrogateLayerDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Layers</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateDefinition_Layers()
-	 * @model containment="true" required="true" ordered="false"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<SurrogateLayerDefinition> getLayers();
-
-} // SurrogateDefinition
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateLayerDefinition.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateLayerDefinition.java
deleted file mode 100644
index c9eb6839..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/SurrogateLayerDefinition.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Surrogate Layer Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateLayerDefinition#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.SurrogateLayerDefinition#getFunctions <em>Functions</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getSurrogateLayerDefinition()
- * @model
- * @generated
- */
-public interface SurrogateLayerDefinition extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateLayerDefinition_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.SurrogateLayerDefinition#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Functions</b></em>' containment reference list.
-	 * The list contents are of type {@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Functions</em>' containment reference list.
-	 * @see de.evoal.languages.model.mll.MllPackage#getSurrogateLayerDefinition_Functions()
-	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/OCL/Collection nullFree='false'"
-	 * @generated
-	 */
-	EList<PartialSurrogateFunctionDefinition> getFunctions();
-
-} // SurrogateLayerDefinition
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Use.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Use.java
deleted file mode 100644
index 3b3434f3..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/Use.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Use</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.Use#getImportURI <em>Import URI</em>}</li>
- * </ul>
- *
- * @see de.evoal.languages.model.mll.MllPackage#getUse()
- * @model
- * @generated
- */
-public interface Use extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Import URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Import URI</em>' attribute.
-	 * @see #setImportURI(String)
-	 * @see de.evoal.languages.model.mll.MllPackage#getUse_ImportURI()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getImportURI();
-
-	/**
-	 * Sets the value of the '{@link de.evoal.languages.model.mll.Use#getImportURI <em>Import URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Import URI</em>' attribute.
-	 * @see #getImportURI()
-	 * @generated
-	 */
-	void setImportURI(String value);
-
-} // Use
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/BlockStatementImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/BlockStatementImpl.java
deleted file mode 100644
index 3ecfecd3..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/BlockStatementImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.BlockStatement;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Statement;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Block Statement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.BlockStatementImpl#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class BlockStatementImpl extends StatementImpl implements BlockStatement {
-	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Statement> statements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BlockStatementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.BLOCK_STATEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<Statement> getStatements() {
-		if (statements == null) {
-			statements = new EObjectContainmentEList<Statement>(Statement.class, this, MllPackage.BLOCK_STATEMENT__STATEMENTS);
-		}
-		return statements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.BLOCK_STATEMENT__STATEMENTS:
-				return ((InternalEList<?>)getStatements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.BLOCK_STATEMENT__STATEMENTS:
-				return getStatements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.BLOCK_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				getStatements().addAll((Collection<? extends Statement>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.BLOCK_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.BLOCK_STATEMENT__STATEMENTS:
-				return statements != null && !statements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //BlockStatementImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CallStatementImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CallStatementImpl.java
deleted file mode 100644
index 1f0bd1a1..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CallStatementImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.el.Call;
-
-import de.evoal.languages.model.mll.CallStatement;
-import de.evoal.languages.model.mll.MllPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Call Statement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.CallStatementImpl#getCall <em>Call</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class CallStatementImpl extends StatementImpl implements CallStatement {
-	/**
-	 * The cached value of the '{@link #getCall() <em>Call</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCall()
-	 * @generated
-	 * @ordered
-	 */
-	protected Call call;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CallStatementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.CALL_STATEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Call getCall() {
-		return call;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCall(Call newCall, NotificationChain msgs) {
-		Call oldCall = call;
-		call = newCall;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MllPackage.CALL_STATEMENT__CALL, oldCall, newCall);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setCall(Call newCall) {
-		if (newCall != call) {
-			NotificationChain msgs = null;
-			if (call != null)
-				msgs = ((InternalEObject)call).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MllPackage.CALL_STATEMENT__CALL, null, msgs);
-			if (newCall != null)
-				msgs = ((InternalEObject)newCall).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MllPackage.CALL_STATEMENT__CALL, null, msgs);
-			msgs = basicSetCall(newCall, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.CALL_STATEMENT__CALL, newCall, newCall));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.CALL_STATEMENT__CALL:
-				return basicSetCall(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.CALL_STATEMENT__CALL:
-				return getCall();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.CALL_STATEMENT__CALL:
-				setCall((Call)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.CALL_STATEMENT__CALL:
-				setCall((Call)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.CALL_STATEMENT__CALL:
-				return call != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CallStatementImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CounterRangeImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CounterRangeImpl.java
deleted file mode 100644
index 43323f7a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/CounterRangeImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.CounterRange;
-import de.evoal.languages.model.mll.MllPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Counter Range</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.CounterRangeImpl#getStart <em>Start</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.CounterRangeImpl#getEnd <em>End</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class CounterRangeImpl extends RangeImpl implements CounterRange {
-	/**
-	 * The default value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int START_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStart()
-	 * @generated
-	 * @ordered
-	 */
-	protected int start = START_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEnd() <em>End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnd()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int END_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getEnd() <em>End</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEnd()
-	 * @generated
-	 * @ordered
-	 */
-	protected int end = END_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CounterRangeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.COUNTER_RANGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int getStart() {
-		return start;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setStart(int newStart) {
-		int oldStart = start;
-		start = newStart;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.COUNTER_RANGE__START, oldStart, start));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int getEnd() {
-		return end;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setEnd(int newEnd) {
-		int oldEnd = end;
-		end = newEnd;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.COUNTER_RANGE__END, oldEnd, end));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.COUNTER_RANGE__START:
-				return getStart();
-			case MllPackage.COUNTER_RANGE__END:
-				return getEnd();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.COUNTER_RANGE__START:
-				setStart((Integer)newValue);
-				return;
-			case MllPackage.COUNTER_RANGE__END:
-				setEnd((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.COUNTER_RANGE__START:
-				setStart(START_EDEFAULT);
-				return;
-			case MllPackage.COUNTER_RANGE__END:
-				setEnd(END_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.COUNTER_RANGE__START:
-				return start != START_EDEFAULT;
-			case MllPackage.COUNTER_RANGE__END:
-				return end != END_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (start: ");
-		result.append(start);
-		result.append(", end: ");
-		result.append(end);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CounterRangeImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/DefinedFunctionNameImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/DefinedFunctionNameImpl.java
deleted file mode 100644
index 004db372..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/DefinedFunctionNameImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.dl.FunctionDefinition;
-
-import de.evoal.languages.model.el.impl.FunctionNameImpl;
-
-import de.evoal.languages.model.mll.DefinedFunctionName;
-import de.evoal.languages.model.mll.MllPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Defined Function Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.DefinedFunctionNameImpl#getDefinition <em>Definition</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class DefinedFunctionNameImpl extends FunctionNameImpl implements DefinedFunctionName {
-	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected FunctionDefinition definition;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefinedFunctionNameImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.DEFINED_FUNCTION_NAME;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public FunctionDefinition getDefinition() {
-		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (FunctionDefinition)eResolveProxy(oldDefinition);
-			if (definition != oldDefinition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MllPackage.DEFINED_FUNCTION_NAME__DEFINITION, oldDefinition, definition));
-			}
-		}
-		return definition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FunctionDefinition basicGetDefinition() {
-		return definition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDefinition(FunctionDefinition newDefinition) {
-		FunctionDefinition oldDefinition = definition;
-		definition = newDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.DEFINED_FUNCTION_NAME__DEFINITION, oldDefinition, definition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.DEFINED_FUNCTION_NAME__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.DEFINED_FUNCTION_NAME__DEFINITION:
-				setDefinition((FunctionDefinition)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.DEFINED_FUNCTION_NAME__DEFINITION:
-				setDefinition((FunctionDefinition)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.DEFINED_FUNCTION_NAME__DEFINITION:
-				return definition != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DefinedFunctionNameImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/ForStatementImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/ForStatementImpl.java
deleted file mode 100644
index 5a555d8a..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/ForStatementImpl.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.ForStatement;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Range;
-import de.evoal.languages.model.mll.Statement;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>For Statement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.ForStatementImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.ForStatementImpl#getRange <em>Range</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.ForStatementImpl#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ForStatementImpl extends StatementImpl implements ForStatement {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRange()
-	 * @generated
-	 * @ordered
-	 */
-	protected Range range;
-
-	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Statement> statements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ForStatementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.FOR_STATEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.FOR_STATEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Range getRange() {
-		return range;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRange(Range newRange, NotificationChain msgs) {
-		Range oldRange = range;
-		range = newRange;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MllPackage.FOR_STATEMENT__RANGE, oldRange, newRange);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setRange(Range newRange) {
-		if (newRange != range) {
-			NotificationChain msgs = null;
-			if (range != null)
-				msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MllPackage.FOR_STATEMENT__RANGE, null, msgs);
-			if (newRange != null)
-				msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MllPackage.FOR_STATEMENT__RANGE, null, msgs);
-			msgs = basicSetRange(newRange, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.FOR_STATEMENT__RANGE, newRange, newRange));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<Statement> getStatements() {
-		if (statements == null) {
-			statements = new EObjectContainmentEList<Statement>(Statement.class, this, MllPackage.FOR_STATEMENT__STATEMENTS);
-		}
-		return statements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.FOR_STATEMENT__RANGE:
-				return basicSetRange(null, msgs);
-			case MllPackage.FOR_STATEMENT__STATEMENTS:
-				return ((InternalEList<?>)getStatements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.FOR_STATEMENT__NAME:
-				return getName();
-			case MllPackage.FOR_STATEMENT__RANGE:
-				return getRange();
-			case MllPackage.FOR_STATEMENT__STATEMENTS:
-				return getStatements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.FOR_STATEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case MllPackage.FOR_STATEMENT__RANGE:
-				setRange((Range)newValue);
-				return;
-			case MllPackage.FOR_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				getStatements().addAll((Collection<? extends Statement>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.FOR_STATEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MllPackage.FOR_STATEMENT__RANGE:
-				setRange((Range)null);
-				return;
-			case MllPackage.FOR_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.FOR_STATEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MllPackage.FOR_STATEMENT__RANGE:
-				return range != null;
-			case MllPackage.FOR_STATEMENT__STATEMENTS:
-				return statements != null && !statements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ForStatementImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MachineLearningConfigurationImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MachineLearningConfigurationImpl.java
deleted file mode 100644
index fcc41213..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MachineLearningConfigurationImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.MachineLearningConfiguration;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Statement;
-import de.evoal.languages.model.mll.SurrogateDefinition;
-import de.evoal.languages.model.mll.Use;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Machine Learning Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl#getUses <em>Uses</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.MachineLearningConfigurationImpl#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class MachineLearningConfigurationImpl extends MinimalEObjectImpl.Container implements MachineLearningConfiguration {
-	/**
-	 * The cached value of the '{@link #getUses() <em>Uses</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUses()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Use> uses;
-
-	/**
-	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefinitions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SurrogateDefinition> definitions;
-
-	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Statement> statements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MachineLearningConfigurationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.MACHINE_LEARNING_CONFIGURATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<Use> getUses() {
-		if (uses == null) {
-			uses = new EObjectContainmentEList<Use>(Use.class, this, MllPackage.MACHINE_LEARNING_CONFIGURATION__USES);
-		}
-		return uses;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<SurrogateDefinition> getDefinitions() {
-		if (definitions == null) {
-			definitions = new EObjectContainmentEList<SurrogateDefinition>(SurrogateDefinition.class, this, MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS);
-		}
-		return definitions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<Statement> getStatements() {
-		if (statements == null) {
-			statements = new EObjectContainmentEList<Statement>(Statement.class, this, MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS);
-		}
-		return statements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__USES:
-				return ((InternalEList<?>)getUses()).basicRemove(otherEnd, msgs);
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS:
-				return ((InternalEList<?>)getDefinitions()).basicRemove(otherEnd, msgs);
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS:
-				return ((InternalEList<?>)getStatements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__USES:
-				return getUses();
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS:
-				return getDefinitions();
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS:
-				return getStatements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__USES:
-				getUses().clear();
-				getUses().addAll((Collection<? extends Use>)newValue);
-				return;
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS:
-				getDefinitions().clear();
-				getDefinitions().addAll((Collection<? extends SurrogateDefinition>)newValue);
-				return;
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS:
-				getStatements().clear();
-				getStatements().addAll((Collection<? extends Statement>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__USES:
-				getUses().clear();
-				return;
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS:
-				getDefinitions().clear();
-				return;
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS:
-				getStatements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__USES:
-				return uses != null && !uses.isEmpty();
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__DEFINITIONS:
-				return definitions != null && !definitions.isEmpty();
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION__STATEMENTS:
-				return statements != null && !statements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MachineLearningConfigurationImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllFactoryImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllFactoryImpl.java
deleted file mode 100644
index 867358af..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllFactoryImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MllFactoryImpl extends EFactoryImpl implements MllFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static MllFactory init() {
-		try {
-			MllFactory theMllFactory = (MllFactory)EPackage.Registry.INSTANCE.getEFactory(MllPackage.eNS_URI);
-			if (theMllFactory != null) {
-				return theMllFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new MllFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MllFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION: return createMachineLearningConfiguration();
-			case MllPackage.SURROGATE_DEFINITION: return createSurrogateDefinition();
-			case MllPackage.SURROGATE_LAYER_DEFINITION: return createSurrogateLayerDefinition();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION: return createPartialSurrogateFunctionDefinition();
-			case MllPackage.PREDICTION: return createPrediction();
-			case MllPackage.CALL_STATEMENT: return createCallStatement();
-			case MllPackage.BLOCK_STATEMENT: return createBlockStatement();
-			case MllPackage.PREDICT_STATEMENT: return createPredictStatement();
-			case MllPackage.FOR_STATEMENT: return createForStatement();
-			case MllPackage.COUNTER_RANGE: return createCounterRange();
-			case MllPackage.STRING_LITERAL_RANGE: return createStringLiteralRange();
-			case MllPackage.DEFINED_FUNCTION_NAME: return createDefinedFunctionName();
-			case MllPackage.USE: return createUse();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public MachineLearningConfiguration createMachineLearningConfiguration() {
-		MachineLearningConfigurationImpl machineLearningConfiguration = new MachineLearningConfigurationImpl();
-		return machineLearningConfiguration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public SurrogateDefinition createSurrogateDefinition() {
-		SurrogateDefinitionImpl surrogateDefinition = new SurrogateDefinitionImpl();
-		return surrogateDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public SurrogateLayerDefinition createSurrogateLayerDefinition() {
-		SurrogateLayerDefinitionImpl surrogateLayerDefinition = new SurrogateLayerDefinitionImpl();
-		return surrogateLayerDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public PartialSurrogateFunctionDefinition createPartialSurrogateFunctionDefinition() {
-		PartialSurrogateFunctionDefinitionImpl partialSurrogateFunctionDefinition = new PartialSurrogateFunctionDefinitionImpl();
-		return partialSurrogateFunctionDefinition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Prediction createPrediction() {
-		PredictionImpl prediction = new PredictionImpl();
-		return prediction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public CallStatement createCallStatement() {
-		CallStatementImpl callStatement = new CallStatementImpl();
-		return callStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public BlockStatement createBlockStatement() {
-		BlockStatementImpl blockStatement = new BlockStatementImpl();
-		return blockStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public PredictStatement createPredictStatement() {
-		PredictStatementImpl predictStatement = new PredictStatementImpl();
-		return predictStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ForStatement createForStatement() {
-		ForStatementImpl forStatement = new ForStatementImpl();
-		return forStatement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public CounterRange createCounterRange() {
-		CounterRangeImpl counterRange = new CounterRangeImpl();
-		return counterRange;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public StringLiteralRange createStringLiteralRange() {
-		StringLiteralRangeImpl stringLiteralRange = new StringLiteralRangeImpl();
-		return stringLiteralRange;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public DefinedFunctionName createDefinedFunctionName() {
-		DefinedFunctionNameImpl definedFunctionName = new DefinedFunctionNameImpl();
-		return definedFunctionName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Use createUse() {
-		UseImpl use = new UseImpl();
-		return use;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public MllPackage getMllPackage() {
-		return (MllPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static MllPackage getPackage() {
-		return MllPackage.eINSTANCE;
-	}
-
-} //MllFactoryImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllPackageImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllPackageImpl.java
deleted file mode 100644
index 6d34be2c..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/MllPackageImpl.java
+++ /dev/null
@@ -1,1008 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.ddl.DdlPackage;
-
-import de.evoal.languages.model.dl.DlPackage;
-
-import de.evoal.languages.model.el.ELPackage;
-
-import de.evoal.languages.model.instance.InstancePackage;
-
-import de.evoal.languages.model.mll.BlockStatement;
-import de.evoal.languages.model.mll.CallStatement;
-import de.evoal.languages.model.mll.CounterRange;
-import de.evoal.languages.model.mll.DefinedFunctionName;
-import de.evoal.languages.model.mll.ForStatement;
-import de.evoal.languages.model.mll.MachineLearningConfiguration;
-import de.evoal.languages.model.mll.MllFactory;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition;
-import de.evoal.languages.model.mll.PredictStatement;
-import de.evoal.languages.model.mll.Prediction;
-import de.evoal.languages.model.mll.Range;
-import de.evoal.languages.model.mll.Statement;
-import de.evoal.languages.model.mll.StringLiteralRange;
-import de.evoal.languages.model.mll.SurrogateDefinition;
-import de.evoal.languages.model.mll.SurrogateLayerDefinition;
-import de.evoal.languages.model.mll.Use;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MllPackageImpl extends EPackageImpl implements MllPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass machineLearningConfigurationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass surrogateDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass surrogateLayerDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass partialSurrogateFunctionDefinitionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predictionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass statementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass callStatementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass blockStatementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predictStatementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass forStatementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rangeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass counterRangeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stringLiteralRangeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass definedFunctionNameEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass useEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see de.evoal.languages.model.mll.MllPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private MllPackageImpl() {
-		super(eNS_URI, MllFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>This method is used to initialize {@link MllPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static MllPackage init() {
-		if (isInited) return (MllPackage)EPackage.Registry.INSTANCE.getEPackage(MllPackage.eNS_URI);
-
-		// Obtain or create and register package
-		Object registeredMllPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
-		MllPackageImpl theMllPackage = registeredMllPackage instanceof MllPackageImpl ? (MllPackageImpl)registeredMllPackage : new MllPackageImpl();
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		DdlPackage.eINSTANCE.eClass();
-		DlPackage.eINSTANCE.eClass();
-		ELPackage.eINSTANCE.eClass();
-		InstancePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theMllPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theMllPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theMllPackage.freeze();
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(MllPackage.eNS_URI, theMllPackage);
-		return theMllPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getMachineLearningConfiguration() {
-		return machineLearningConfigurationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getMachineLearningConfiguration_Uses() {
-		return (EReference)machineLearningConfigurationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getMachineLearningConfiguration_Definitions() {
-		return (EReference)machineLearningConfigurationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getMachineLearningConfiguration_Statements() {
-		return (EReference)machineLearningConfigurationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getSurrogateDefinition() {
-		return surrogateDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getSurrogateDefinition_Name() {
-		return (EAttribute)surrogateDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getSurrogateDefinition_Inputs() {
-		return (EReference)surrogateDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getSurrogateDefinition_Outputs() {
-		return (EReference)surrogateDefinitionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getSurrogateDefinition_Layers() {
-		return (EReference)surrogateDefinitionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getSurrogateLayerDefinition() {
-		return surrogateLayerDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getSurrogateLayerDefinition_Name() {
-		return (EAttribute)surrogateLayerDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getSurrogateLayerDefinition_Functions() {
-		return (EReference)surrogateLayerDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getPartialSurrogateFunctionDefinition() {
-		return partialSurrogateFunctionDefinitionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPartialSurrogateFunctionDefinition_Name() {
-		return (EReference)partialSurrogateFunctionDefinitionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPartialSurrogateFunctionDefinition_Inputs() {
-		return (EReference)partialSurrogateFunctionDefinitionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPartialSurrogateFunctionDefinition_Outputs() {
-		return (EReference)partialSurrogateFunctionDefinitionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPartialSurrogateFunctionDefinition_Parameters() {
-		return (EReference)partialSurrogateFunctionDefinitionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getPrediction() {
-		return predictionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPrediction_Definition() {
-		return (EReference)predictionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPrediction_Inputs() {
-		return (EReference)predictionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPrediction_Outputs() {
-		return (EReference)predictionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPrediction_Quality() {
-		return (EReference)predictionEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getStatement() {
-		return statementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getCallStatement() {
-		return callStatementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getCallStatement_Call() {
-		return (EReference)callStatementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getBlockStatement() {
-		return blockStatementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getBlockStatement_Statements() {
-		return (EReference)blockStatementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getPredictStatement() {
-		return predictStatementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPredictStatement_Surrogate() {
-		return (EReference)predictStatementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getPredictStatement_ModelFilename() {
-		return (EAttribute)predictStatementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getPredictStatement_TrainingData() {
-		return (EAttribute)predictStatementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getPredictStatement_Statements() {
-		return (EReference)predictStatementEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getForStatement() {
-		return forStatementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getForStatement_Name() {
-		return (EAttribute)forStatementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getForStatement_Range() {
-		return (EReference)forStatementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getForStatement_Statements() {
-		return (EReference)forStatementEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getRange() {
-		return rangeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getCounterRange() {
-		return counterRangeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getCounterRange_Start() {
-		return (EAttribute)counterRangeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getCounterRange_End() {
-		return (EAttribute)counterRangeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getStringLiteralRange() {
-		return stringLiteralRangeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getStringLiteralRange_Elements() {
-		return (EReference)stringLiteralRangeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getDefinedFunctionName() {
-		return definedFunctionNameEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EReference getDefinedFunctionName_Definition() {
-		return (EReference)definedFunctionNameEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EClass getUse() {
-		return useEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EAttribute getUse_ImportURI() {
-		return (EAttribute)useEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public MllFactory getMllFactory() {
-		return (MllFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		machineLearningConfigurationEClass = createEClass(MACHINE_LEARNING_CONFIGURATION);
-		createEReference(machineLearningConfigurationEClass, MACHINE_LEARNING_CONFIGURATION__USES);
-		createEReference(machineLearningConfigurationEClass, MACHINE_LEARNING_CONFIGURATION__DEFINITIONS);
-		createEReference(machineLearningConfigurationEClass, MACHINE_LEARNING_CONFIGURATION__STATEMENTS);
-
-		surrogateDefinitionEClass = createEClass(SURROGATE_DEFINITION);
-		createEAttribute(surrogateDefinitionEClass, SURROGATE_DEFINITION__NAME);
-		createEReference(surrogateDefinitionEClass, SURROGATE_DEFINITION__INPUTS);
-		createEReference(surrogateDefinitionEClass, SURROGATE_DEFINITION__OUTPUTS);
-		createEReference(surrogateDefinitionEClass, SURROGATE_DEFINITION__LAYERS);
-
-		surrogateLayerDefinitionEClass = createEClass(SURROGATE_LAYER_DEFINITION);
-		createEAttribute(surrogateLayerDefinitionEClass, SURROGATE_LAYER_DEFINITION__NAME);
-		createEReference(surrogateLayerDefinitionEClass, SURROGATE_LAYER_DEFINITION__FUNCTIONS);
-
-		partialSurrogateFunctionDefinitionEClass = createEClass(PARTIAL_SURROGATE_FUNCTION_DEFINITION);
-		createEReference(partialSurrogateFunctionDefinitionEClass, PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME);
-		createEReference(partialSurrogateFunctionDefinitionEClass, PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS);
-		createEReference(partialSurrogateFunctionDefinitionEClass, PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS);
-		createEReference(partialSurrogateFunctionDefinitionEClass, PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS);
-
-		predictionEClass = createEClass(PREDICTION);
-		createEReference(predictionEClass, PREDICTION__DEFINITION);
-		createEReference(predictionEClass, PREDICTION__INPUTS);
-		createEReference(predictionEClass, PREDICTION__OUTPUTS);
-		createEReference(predictionEClass, PREDICTION__QUALITY);
-
-		statementEClass = createEClass(STATEMENT);
-
-		callStatementEClass = createEClass(CALL_STATEMENT);
-		createEReference(callStatementEClass, CALL_STATEMENT__CALL);
-
-		blockStatementEClass = createEClass(BLOCK_STATEMENT);
-		createEReference(blockStatementEClass, BLOCK_STATEMENT__STATEMENTS);
-
-		predictStatementEClass = createEClass(PREDICT_STATEMENT);
-		createEReference(predictStatementEClass, PREDICT_STATEMENT__SURROGATE);
-		createEAttribute(predictStatementEClass, PREDICT_STATEMENT__MODEL_FILENAME);
-		createEAttribute(predictStatementEClass, PREDICT_STATEMENT__TRAINING_DATA);
-		createEReference(predictStatementEClass, PREDICT_STATEMENT__STATEMENTS);
-
-		forStatementEClass = createEClass(FOR_STATEMENT);
-		createEAttribute(forStatementEClass, FOR_STATEMENT__NAME);
-		createEReference(forStatementEClass, FOR_STATEMENT__RANGE);
-		createEReference(forStatementEClass, FOR_STATEMENT__STATEMENTS);
-
-		rangeEClass = createEClass(RANGE);
-
-		counterRangeEClass = createEClass(COUNTER_RANGE);
-		createEAttribute(counterRangeEClass, COUNTER_RANGE__START);
-		createEAttribute(counterRangeEClass, COUNTER_RANGE__END);
-
-		stringLiteralRangeEClass = createEClass(STRING_LITERAL_RANGE);
-		createEReference(stringLiteralRangeEClass, STRING_LITERAL_RANGE__ELEMENTS);
-
-		definedFunctionNameEClass = createEClass(DEFINED_FUNCTION_NAME);
-		createEReference(definedFunctionNameEClass, DEFINED_FUNCTION_NAME__DEFINITION);
-
-		useEClass = createEClass(USE);
-		createEAttribute(useEClass, USE__IMPORT_URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		DdlPackage theDdlPackage = (DdlPackage)EPackage.Registry.INSTANCE.getEPackage(DdlPackage.eNS_URI);
-		DlPackage theDlPackage = (DlPackage)EPackage.Registry.INSTANCE.getEPackage(DlPackage.eNS_URI);
-		InstancePackage theInstancePackage = (InstancePackage)EPackage.Registry.INSTANCE.getEPackage(InstancePackage.eNS_URI);
-		ELPackage theELPackage = (ELPackage)EPackage.Registry.INSTANCE.getEPackage(ELPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		callStatementEClass.getESuperTypes().add(this.getStatement());
-		blockStatementEClass.getESuperTypes().add(this.getStatement());
-		predictStatementEClass.getESuperTypes().add(this.getStatement());
-		forStatementEClass.getESuperTypes().add(this.getStatement());
-		counterRangeEClass.getESuperTypes().add(this.getRange());
-		stringLiteralRangeEClass.getESuperTypes().add(this.getRange());
-		definedFunctionNameEClass.getESuperTypes().add(theELPackage.getFunctionName());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(machineLearningConfigurationEClass, MachineLearningConfiguration.class, "MachineLearningConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMachineLearningConfiguration_Uses(), this.getUse(), null, "uses", null, 0, -1, MachineLearningConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMachineLearningConfiguration_Definitions(), this.getSurrogateDefinition(), null, "definitions", null, 0, -1, MachineLearningConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMachineLearningConfiguration_Statements(), this.getStatement(), null, "statements", null, 0, -1, MachineLearningConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(surrogateDefinitionEClass, SurrogateDefinition.class, "SurrogateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSurrogateDefinition_Name(), ecorePackage.getEString(), "name", null, 1, 1, SurrogateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSurrogateDefinition_Inputs(), theDdlPackage.getDataDescription(), null, "inputs", null, 1, -1, SurrogateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSurrogateDefinition_Outputs(), theDdlPackage.getDataDescription(), null, "outputs", null, 1, -1, SurrogateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getSurrogateDefinition_Layers(), this.getSurrogateLayerDefinition(), null, "layers", null, 1, -1, SurrogateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(surrogateLayerDefinitionEClass, SurrogateLayerDefinition.class, "SurrogateLayerDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSurrogateLayerDefinition_Name(), ecorePackage.getEString(), "name", null, 1, 1, SurrogateLayerDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSurrogateLayerDefinition_Functions(), this.getPartialSurrogateFunctionDefinition(), null, "functions", null, 1, -1, SurrogateLayerDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(partialSurrogateFunctionDefinitionEClass, PartialSurrogateFunctionDefinition.class, "PartialSurrogateFunctionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPartialSurrogateFunctionDefinition_Name(), theDlPackage.getTypeDefinition(), null, "name", null, 1, 1, PartialSurrogateFunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPartialSurrogateFunctionDefinition_Inputs(), theDdlPackage.getDataDescription(), null, "inputs", null, 1, -1, PartialSurrogateFunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPartialSurrogateFunctionDefinition_Outputs(), theDdlPackage.getDataDescription(), null, "outputs", null, 1, -1, PartialSurrogateFunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPartialSurrogateFunctionDefinition_Parameters(), theInstancePackage.getAttribute(), null, "parameters", null, 0, -1, PartialSurrogateFunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(predictionEClass, Prediction.class, "Prediction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPrediction_Definition(), this.getSurrogateDefinition(), null, "definition", null, 1, 1, Prediction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPrediction_Inputs(), theDdlPackage.getDataDescription(), null, "inputs", null, 1, -1, Prediction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPrediction_Outputs(), theDdlPackage.getDataDescription(), null, "outputs", null, 1, -1, Prediction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPrediction_Quality(), this.getBlockStatement(), null, "quality", null, 0, 1, Prediction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(statementEClass, Statement.class, "Statement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(callStatementEClass, CallStatement.class, "CallStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCallStatement_Call(), theELPackage.getCall(), null, "call", null, 1, 1, CallStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(blockStatementEClass, BlockStatement.class, "BlockStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBlockStatement_Statements(), this.getStatement(), null, "statements", null, 0, -1, BlockStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(predictStatementEClass, PredictStatement.class, "PredictStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPredictStatement_Surrogate(), this.getSurrogateDefinition(), null, "surrogate", null, 1, 1, PredictStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPredictStatement_ModelFilename(), ecorePackage.getEString(), "modelFilename", null, 1, 1, PredictStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPredictStatement_TrainingData(), ecorePackage.getEString(), "trainingData", null, 1, 1, PredictStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPredictStatement_Statements(), this.getCallStatement(), null, "statements", null, 0, -1, PredictStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(forStatementEClass, ForStatement.class, "ForStatement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getForStatement_Name(), ecorePackage.getEString(), "name", null, 1, 1, ForStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getForStatement_Range(), this.getRange(), null, "range", null, 1, 1, ForStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getForStatement_Statements(), this.getStatement(), null, "statements", null, 0, -1, ForStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(rangeEClass, Range.class, "Range", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(counterRangeEClass, CounterRange.class, "CounterRange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCounterRange_Start(), ecorePackage.getEInt(), "start", null, 1, 1, CounterRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCounterRange_End(), ecorePackage.getEInt(), "end", null, 1, 1, CounterRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(stringLiteralRangeEClass, StringLiteralRange.class, "StringLiteralRange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getStringLiteralRange_Elements(), theELPackage.getStringLiteral(), null, "elements", null, 0, -1, StringLiteralRange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(definedFunctionNameEClass, DefinedFunctionName.class, "DefinedFunctionName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefinedFunctionName_Definition(), theDlPackage.getFunctionDefinition(), null, "definition", null, 1, 1, DefinedFunctionName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(useEClass, Use.class, "Use", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getUse_ImportURI(), ecorePackage.getEString(), "importURI", null, 1, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/OCL/Import
-		createImportAnnotations();
-		// http://www.eclipse.org/OCL/Collection
-		createCollectionAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Import</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createImportAnnotations() {
-		String source = "http://www.eclipse.org/OCL/Import";
-		addAnnotation
-		  (this,
-		   source,
-		   new String[] {
-			   "ddl", "platform:/resource/de.evoal.languages.model.ddl/model/model.ecore#/",
-			   "dl", "platform:/resource/de.evoal.languages.model.dl/model/model.ecore#/",
-			   "ecore", "http://www.eclipse.org/emf/2002/Ecore",
-			   "el", "platform:/resource/de.evoal.languages.model.el/model/model.ecore#/",
-			   "instance", "platform:/resource/de.evoal.languages.model.instance/model/model.ecore#/"
-		   });
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/OCL/Collection</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createCollectionAnnotations() {
-		String source = "http://www.eclipse.org/OCL/Collection";
-		addAnnotation
-		  (getMachineLearningConfiguration_Uses(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getMachineLearningConfiguration_Definitions(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getMachineLearningConfiguration_Statements(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getSurrogateDefinition_Inputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getSurrogateDefinition_Outputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getSurrogateDefinition_Layers(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getSurrogateLayerDefinition_Functions(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPartialSurrogateFunctionDefinition_Inputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPartialSurrogateFunctionDefinition_Outputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPartialSurrogateFunctionDefinition_Parameters(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPrediction_Inputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPrediction_Outputs(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getBlockStatement_Statements(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getPredictStatement_Statements(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getForStatement_Statements(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-		addAnnotation
-		  (getStringLiteralRange_Elements(),
-		   source,
-		   new String[] {
-			   "nullFree", "false"
-		   });
-	}
-
-} //MllPackageImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PartialSurrogateFunctionDefinitionImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PartialSurrogateFunctionDefinitionImpl.java
deleted file mode 100644
index 8d5fa005..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PartialSurrogateFunctionDefinitionImpl.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import de.evoal.languages.model.dl.TypeDefinition;
-import de.evoal.languages.model.instance.Attribute;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Partial Surrogate Function Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PartialSurrogateFunctionDefinitionImpl#getParameters <em>Parameters</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PartialSurrogateFunctionDefinitionImpl extends MinimalEObjectImpl.Container implements PartialSurrogateFunctionDefinition {
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected TypeDefinition name;
-
-	/**
-	 * The cached value of the '{@link #getInputs() <em>Inputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> inputs;
-
-	/**
-	 * The cached value of the '{@link #getOutputs() <em>Outputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> outputs;
-
-	/**
-	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getParameters()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Attribute> parameters;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PartialSurrogateFunctionDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.PARTIAL_SURROGATE_FUNCTION_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public TypeDefinition getName() {
-		if (name != null && name.eIsProxy()) {
-			InternalEObject oldName = (InternalEObject)name;
-			name = (TypeDefinition)eResolveProxy(oldName);
-			if (name != oldName) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME, oldName, name));
-			}
-		}
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TypeDefinition basicGetName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setName(TypeDefinition newName) {
-		TypeDefinition oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getInputs() {
-		if (inputs == null) {
-			inputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS);
-		}
-		return inputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getOutputs() {
-		if (outputs == null) {
-			outputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS);
-		}
-		return outputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<Attribute> getParameters() {
-		if (parameters == null) {
-			parameters = new EObjectContainmentEList<Attribute>(Attribute.class, this, MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS);
-		}
-		return parameters;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS:
-				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME:
-				if (resolve) return getName();
-				return basicGetName();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS:
-				return getInputs();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS:
-				return getOutputs();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS:
-				return getParameters();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME:
-				setName((TypeDefinition)newValue);
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS:
-				getInputs().clear();
-				getInputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS:
-				getOutputs().clear();
-				getOutputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS:
-				getParameters().clear();
-				getParameters().addAll((Collection<? extends Attribute>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME:
-				setName((TypeDefinition)null);
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS:
-				getInputs().clear();
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS:
-				getOutputs().clear();
-				return;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS:
-				getParameters().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__NAME:
-				return name != null;
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__INPUTS:
-				return inputs != null && !inputs.isEmpty();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__OUTPUTS:
-				return outputs != null && !outputs.isEmpty();
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION__PARAMETERS:
-				return parameters != null && !parameters.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PartialSurrogateFunctionDefinitionImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictStatementImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictStatementImpl.java
deleted file mode 100644
index 8370189d..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictStatementImpl.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.CallStatement;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.PredictStatement;
-import de.evoal.languages.model.mll.SurrogateDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Predict Statement</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictStatementImpl#getSurrogate <em>Surrogate</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictStatementImpl#getModelFilename <em>Model Filename</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictStatementImpl#getTrainingData <em>Training Data</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictStatementImpl#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PredictStatementImpl extends StatementImpl implements PredictStatement {
-	/**
-	 * The cached value of the '{@link #getSurrogate() <em>Surrogate</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSurrogate()
-	 * @generated
-	 * @ordered
-	 */
-	protected SurrogateDefinition surrogate;
-
-	/**
-	 * The default value of the '{@link #getModelFilename() <em>Model Filename</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelFilename()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MODEL_FILENAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getModelFilename() <em>Model Filename</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getModelFilename()
-	 * @generated
-	 * @ordered
-	 */
-	protected String modelFilename = MODEL_FILENAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getTrainingData() <em>Training Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTrainingData()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TRAINING_DATA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTrainingData() <em>Training Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTrainingData()
-	 * @generated
-	 * @ordered
-	 */
-	protected String trainingData = TRAINING_DATA_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStatements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CallStatement> statements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredictStatementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.PREDICT_STATEMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public SurrogateDefinition getSurrogate() {
-		if (surrogate != null && surrogate.eIsProxy()) {
-			InternalEObject oldSurrogate = (InternalEObject)surrogate;
-			surrogate = (SurrogateDefinition)eResolveProxy(oldSurrogate);
-			if (surrogate != oldSurrogate) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MllPackage.PREDICT_STATEMENT__SURROGATE, oldSurrogate, surrogate));
-			}
-		}
-		return surrogate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SurrogateDefinition basicGetSurrogate() {
-		return surrogate;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setSurrogate(SurrogateDefinition newSurrogate) {
-		SurrogateDefinition oldSurrogate = surrogate;
-		surrogate = newSurrogate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PREDICT_STATEMENT__SURROGATE, oldSurrogate, surrogate));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getModelFilename() {
-		return modelFilename;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setModelFilename(String newModelFilename) {
-		String oldModelFilename = modelFilename;
-		modelFilename = newModelFilename;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PREDICT_STATEMENT__MODEL_FILENAME, oldModelFilename, modelFilename));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getTrainingData() {
-		return trainingData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setTrainingData(String newTrainingData) {
-		String oldTrainingData = trainingData;
-		trainingData = newTrainingData;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PREDICT_STATEMENT__TRAINING_DATA, oldTrainingData, trainingData));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<CallStatement> getStatements() {
-		if (statements == null) {
-			statements = new EObjectContainmentEList<CallStatement>(CallStatement.class, this, MllPackage.PREDICT_STATEMENT__STATEMENTS);
-		}
-		return statements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.PREDICT_STATEMENT__STATEMENTS:
-				return ((InternalEList<?>)getStatements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.PREDICT_STATEMENT__SURROGATE:
-				if (resolve) return getSurrogate();
-				return basicGetSurrogate();
-			case MllPackage.PREDICT_STATEMENT__MODEL_FILENAME:
-				return getModelFilename();
-			case MllPackage.PREDICT_STATEMENT__TRAINING_DATA:
-				return getTrainingData();
-			case MllPackage.PREDICT_STATEMENT__STATEMENTS:
-				return getStatements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.PREDICT_STATEMENT__SURROGATE:
-				setSurrogate((SurrogateDefinition)newValue);
-				return;
-			case MllPackage.PREDICT_STATEMENT__MODEL_FILENAME:
-				setModelFilename((String)newValue);
-				return;
-			case MllPackage.PREDICT_STATEMENT__TRAINING_DATA:
-				setTrainingData((String)newValue);
-				return;
-			case MllPackage.PREDICT_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				getStatements().addAll((Collection<? extends CallStatement>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.PREDICT_STATEMENT__SURROGATE:
-				setSurrogate((SurrogateDefinition)null);
-				return;
-			case MllPackage.PREDICT_STATEMENT__MODEL_FILENAME:
-				setModelFilename(MODEL_FILENAME_EDEFAULT);
-				return;
-			case MllPackage.PREDICT_STATEMENT__TRAINING_DATA:
-				setTrainingData(TRAINING_DATA_EDEFAULT);
-				return;
-			case MllPackage.PREDICT_STATEMENT__STATEMENTS:
-				getStatements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.PREDICT_STATEMENT__SURROGATE:
-				return surrogate != null;
-			case MllPackage.PREDICT_STATEMENT__MODEL_FILENAME:
-				return MODEL_FILENAME_EDEFAULT == null ? modelFilename != null : !MODEL_FILENAME_EDEFAULT.equals(modelFilename);
-			case MllPackage.PREDICT_STATEMENT__TRAINING_DATA:
-				return TRAINING_DATA_EDEFAULT == null ? trainingData != null : !TRAINING_DATA_EDEFAULT.equals(trainingData);
-			case MllPackage.PREDICT_STATEMENT__STATEMENTS:
-				return statements != null && !statements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (modelFilename: ");
-		result.append(modelFilename);
-		result.append(", trainingData: ");
-		result.append(trainingData);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PredictStatementImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictionImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictionImpl.java
deleted file mode 100644
index 5b22e66d..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/PredictionImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import de.evoal.languages.model.mll.BlockStatement;
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Prediction;
-import de.evoal.languages.model.mll.SurrogateDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Prediction</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictionImpl#getDefinition <em>Definition</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictionImpl#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictionImpl#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.PredictionImpl#getQuality <em>Quality</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PredictionImpl extends MinimalEObjectImpl.Container implements Prediction {
-	/**
-	 * The cached value of the '{@link #getDefinition() <em>Definition</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefinition()
-	 * @generated
-	 * @ordered
-	 */
-	protected SurrogateDefinition definition;
-
-	/**
-	 * The cached value of the '{@link #getInputs() <em>Inputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> inputs;
-
-	/**
-	 * The cached value of the '{@link #getOutputs() <em>Outputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> outputs;
-
-	/**
-	 * The cached value of the '{@link #getQuality() <em>Quality</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuality()
-	 * @generated
-	 * @ordered
-	 */
-	protected BlockStatement quality;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredictionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.PREDICTION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public SurrogateDefinition getDefinition() {
-		if (definition != null && definition.eIsProxy()) {
-			InternalEObject oldDefinition = (InternalEObject)definition;
-			definition = (SurrogateDefinition)eResolveProxy(oldDefinition);
-			if (definition != oldDefinition) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, MllPackage.PREDICTION__DEFINITION, oldDefinition, definition));
-			}
-		}
-		return definition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SurrogateDefinition basicGetDefinition() {
-		return definition;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setDefinition(SurrogateDefinition newDefinition) {
-		SurrogateDefinition oldDefinition = definition;
-		definition = newDefinition;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PREDICTION__DEFINITION, oldDefinition, definition));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getInputs() {
-		if (inputs == null) {
-			inputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.PREDICTION__INPUTS);
-		}
-		return inputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getOutputs() {
-		if (outputs == null) {
-			outputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.PREDICTION__OUTPUTS);
-		}
-		return outputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public BlockStatement getQuality() {
-		return quality;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetQuality(BlockStatement newQuality, NotificationChain msgs) {
-		BlockStatement oldQuality = quality;
-		quality = newQuality;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MllPackage.PREDICTION__QUALITY, oldQuality, newQuality);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setQuality(BlockStatement newQuality) {
-		if (newQuality != quality) {
-			NotificationChain msgs = null;
-			if (quality != null)
-				msgs = ((InternalEObject)quality).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MllPackage.PREDICTION__QUALITY, null, msgs);
-			if (newQuality != null)
-				msgs = ((InternalEObject)newQuality).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MllPackage.PREDICTION__QUALITY, null, msgs);
-			msgs = basicSetQuality(newQuality, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.PREDICTION__QUALITY, newQuality, newQuality));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.PREDICTION__QUALITY:
-				return basicSetQuality(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.PREDICTION__DEFINITION:
-				if (resolve) return getDefinition();
-				return basicGetDefinition();
-			case MllPackage.PREDICTION__INPUTS:
-				return getInputs();
-			case MllPackage.PREDICTION__OUTPUTS:
-				return getOutputs();
-			case MllPackage.PREDICTION__QUALITY:
-				return getQuality();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.PREDICTION__DEFINITION:
-				setDefinition((SurrogateDefinition)newValue);
-				return;
-			case MllPackage.PREDICTION__INPUTS:
-				getInputs().clear();
-				getInputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.PREDICTION__OUTPUTS:
-				getOutputs().clear();
-				getOutputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.PREDICTION__QUALITY:
-				setQuality((BlockStatement)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.PREDICTION__DEFINITION:
-				setDefinition((SurrogateDefinition)null);
-				return;
-			case MllPackage.PREDICTION__INPUTS:
-				getInputs().clear();
-				return;
-			case MllPackage.PREDICTION__OUTPUTS:
-				getOutputs().clear();
-				return;
-			case MllPackage.PREDICTION__QUALITY:
-				setQuality((BlockStatement)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.PREDICTION__DEFINITION:
-				return definition != null;
-			case MllPackage.PREDICTION__INPUTS:
-				return inputs != null && !inputs.isEmpty();
-			case MllPackage.PREDICTION__OUTPUTS:
-				return outputs != null && !outputs.isEmpty();
-			case MllPackage.PREDICTION__QUALITY:
-				return quality != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PredictionImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/RangeImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/RangeImpl.java
deleted file mode 100644
index eebfb205..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/RangeImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Range;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Range</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public abstract class RangeImpl extends MinimalEObjectImpl.Container implements Range {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RangeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.RANGE;
-	}
-
-} //RangeImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StatementImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StatementImpl.java
deleted file mode 100644
index 3fdc9be6..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StatementImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Statement;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public abstract class StatementImpl extends MinimalEObjectImpl.Container implements Statement {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StatementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.STATEMENT;
-	}
-
-} //StatementImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StringLiteralRangeImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StringLiteralRangeImpl.java
deleted file mode 100644
index 927ed2d0..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/StringLiteralRangeImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.el.StringLiteral;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.StringLiteralRange;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Literal Range</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.StringLiteralRangeImpl#getElements <em>Elements</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class StringLiteralRangeImpl extends RangeImpl implements StringLiteralRange {
-	/**
-	 * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<StringLiteral> elements;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StringLiteralRangeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.STRING_LITERAL_RANGE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<StringLiteral> getElements() {
-		if (elements == null) {
-			elements = new EObjectContainmentEList<StringLiteral>(StringLiteral.class, this, MllPackage.STRING_LITERAL_RANGE__ELEMENTS);
-		}
-		return elements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.STRING_LITERAL_RANGE__ELEMENTS:
-				return ((InternalEList<?>)getElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.STRING_LITERAL_RANGE__ELEMENTS:
-				return getElements();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.STRING_LITERAL_RANGE__ELEMENTS:
-				getElements().clear();
-				getElements().addAll((Collection<? extends StringLiteral>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.STRING_LITERAL_RANGE__ELEMENTS:
-				getElements().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.STRING_LITERAL_RANGE__ELEMENTS:
-				return elements != null && !elements.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //StringLiteralRangeImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateDefinitionImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateDefinitionImpl.java
deleted file mode 100644
index ebb86630..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateDefinitionImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.ddl.DataDescription;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.SurrogateDefinition;
-import de.evoal.languages.model.mll.SurrogateLayerDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Surrogate Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl#getInputs <em>Inputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl#getOutputs <em>Outputs</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateDefinitionImpl#getLayers <em>Layers</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class SurrogateDefinitionImpl extends MinimalEObjectImpl.Container implements SurrogateDefinition {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getInputs() <em>Inputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> inputs;
-
-	/**
-	 * The cached value of the '{@link #getOutputs() <em>Outputs</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOutputs()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DataDescription> outputs;
-
-	/**
-	 * The cached value of the '{@link #getLayers() <em>Layers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLayers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SurrogateLayerDefinition> layers;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SurrogateDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.SURROGATE_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.SURROGATE_DEFINITION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getInputs() {
-		if (inputs == null) {
-			inputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.SURROGATE_DEFINITION__INPUTS);
-		}
-		return inputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<DataDescription> getOutputs() {
-		if (outputs == null) {
-			outputs = new EObjectResolvingEList<DataDescription>(DataDescription.class, this, MllPackage.SURROGATE_DEFINITION__OUTPUTS);
-		}
-		return outputs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<SurrogateLayerDefinition> getLayers() {
-		if (layers == null) {
-			layers = new EObjectContainmentEList<SurrogateLayerDefinition>(SurrogateLayerDefinition.class, this, MllPackage.SURROGATE_DEFINITION__LAYERS);
-		}
-		return layers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_DEFINITION__LAYERS:
-				return ((InternalEList<?>)getLayers()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_DEFINITION__NAME:
-				return getName();
-			case MllPackage.SURROGATE_DEFINITION__INPUTS:
-				return getInputs();
-			case MllPackage.SURROGATE_DEFINITION__OUTPUTS:
-				return getOutputs();
-			case MllPackage.SURROGATE_DEFINITION__LAYERS:
-				return getLayers();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_DEFINITION__NAME:
-				setName((String)newValue);
-				return;
-			case MllPackage.SURROGATE_DEFINITION__INPUTS:
-				getInputs().clear();
-				getInputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.SURROGATE_DEFINITION__OUTPUTS:
-				getOutputs().clear();
-				getOutputs().addAll((Collection<? extends DataDescription>)newValue);
-				return;
-			case MllPackage.SURROGATE_DEFINITION__LAYERS:
-				getLayers().clear();
-				getLayers().addAll((Collection<? extends SurrogateLayerDefinition>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_DEFINITION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MllPackage.SURROGATE_DEFINITION__INPUTS:
-				getInputs().clear();
-				return;
-			case MllPackage.SURROGATE_DEFINITION__OUTPUTS:
-				getOutputs().clear();
-				return;
-			case MllPackage.SURROGATE_DEFINITION__LAYERS:
-				getLayers().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_DEFINITION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MllPackage.SURROGATE_DEFINITION__INPUTS:
-				return inputs != null && !inputs.isEmpty();
-			case MllPackage.SURROGATE_DEFINITION__OUTPUTS:
-				return outputs != null && !outputs.isEmpty();
-			case MllPackage.SURROGATE_DEFINITION__LAYERS:
-				return layers != null && !layers.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SurrogateDefinitionImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateLayerDefinitionImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateLayerDefinitionImpl.java
deleted file mode 100644
index 1906b5fc..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/SurrogateLayerDefinitionImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition;
-import de.evoal.languages.model.mll.SurrogateLayerDefinition;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Surrogate Layer Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl#getName <em>Name</em>}</li>
- *   <li>{@link de.evoal.languages.model.mll.impl.SurrogateLayerDefinitionImpl#getFunctions <em>Functions</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class SurrogateLayerDefinitionImpl extends MinimalEObjectImpl.Container implements SurrogateLayerDefinition {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFunctions() <em>Functions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFunctions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<PartialSurrogateFunctionDefinition> functions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SurrogateLayerDefinitionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.SURROGATE_LAYER_DEFINITION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.SURROGATE_LAYER_DEFINITION__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EList<PartialSurrogateFunctionDefinition> getFunctions() {
-		if (functions == null) {
-			functions = new EObjectContainmentEList<PartialSurrogateFunctionDefinition>(PartialSurrogateFunctionDefinition.class, this, MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS);
-		}
-		return functions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS:
-				return ((InternalEList<?>)getFunctions()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_LAYER_DEFINITION__NAME:
-				return getName();
-			case MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS:
-				return getFunctions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_LAYER_DEFINITION__NAME:
-				setName((String)newValue);
-				return;
-			case MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS:
-				getFunctions().clear();
-				getFunctions().addAll((Collection<? extends PartialSurrogateFunctionDefinition>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_LAYER_DEFINITION__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS:
-				getFunctions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.SURROGATE_LAYER_DEFINITION__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case MllPackage.SURROGATE_LAYER_DEFINITION__FUNCTIONS:
-				return functions != null && !functions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SurrogateLayerDefinitionImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/UseImpl.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/UseImpl.java
deleted file mode 100644
index 22127e25..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/impl/UseImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.impl;
-
-import de.evoal.languages.model.mll.MllPackage;
-import de.evoal.languages.model.mll.Use;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Use</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link de.evoal.languages.model.mll.impl.UseImpl#getImportURI <em>Import URI</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class UseImpl extends MinimalEObjectImpl.Container implements Use {
-	/**
-	 * The default value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImportURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IMPORT_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getImportURI() <em>Import URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImportURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String importURI = IMPORT_URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected UseImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return MllPackage.Literals.USE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getImportURI() {
-		return importURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setImportURI(String newImportURI) {
-		String oldImportURI = importURI;
-		importURI = newImportURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, MllPackage.USE__IMPORT_URI, oldImportURI, importURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case MllPackage.USE__IMPORT_URI:
-				return getImportURI();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case MllPackage.USE__IMPORT_URI:
-				setImportURI((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case MllPackage.USE__IMPORT_URI:
-				setImportURI(IMPORT_URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case MllPackage.USE__IMPORT_URI:
-				return IMPORT_URI_EDEFAULT == null ? importURI != null : !IMPORT_URI_EDEFAULT.equals(importURI);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuilder result = new StringBuilder(super.toString());
-		result.append(" (importURI: ");
-		result.append(importURI);
-		result.append(')');
-		return result.toString();
-	}
-
-} //UseImpl
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllAdapterFactory.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllAdapterFactory.java
deleted file mode 100644
index 2b775c03..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllAdapterFactory.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.util;
-
-import de.evoal.languages.model.el.FunctionName;
-
-import de.evoal.languages.model.mll.*;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see de.evoal.languages.model.mll.MllPackage
- * @generated
- */
-public class MllAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MllPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MllAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = MllPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MllSwitch<Adapter> modelSwitch =
-		new MllSwitch<Adapter>() {
-			@Override
-			public Adapter caseMachineLearningConfiguration(MachineLearningConfiguration object) {
-				return createMachineLearningConfigurationAdapter();
-			}
-			@Override
-			public Adapter caseSurrogateDefinition(SurrogateDefinition object) {
-				return createSurrogateDefinitionAdapter();
-			}
-			@Override
-			public Adapter caseSurrogateLayerDefinition(SurrogateLayerDefinition object) {
-				return createSurrogateLayerDefinitionAdapter();
-			}
-			@Override
-			public Adapter casePartialSurrogateFunctionDefinition(PartialSurrogateFunctionDefinition object) {
-				return createPartialSurrogateFunctionDefinitionAdapter();
-			}
-			@Override
-			public Adapter casePrediction(Prediction object) {
-				return createPredictionAdapter();
-			}
-			@Override
-			public Adapter caseStatement(Statement object) {
-				return createStatementAdapter();
-			}
-			@Override
-			public Adapter caseCallStatement(CallStatement object) {
-				return createCallStatementAdapter();
-			}
-			@Override
-			public Adapter caseBlockStatement(BlockStatement object) {
-				return createBlockStatementAdapter();
-			}
-			@Override
-			public Adapter casePredictStatement(PredictStatement object) {
-				return createPredictStatementAdapter();
-			}
-			@Override
-			public Adapter caseForStatement(ForStatement object) {
-				return createForStatementAdapter();
-			}
-			@Override
-			public Adapter caseRange(Range object) {
-				return createRangeAdapter();
-			}
-			@Override
-			public Adapter caseCounterRange(CounterRange object) {
-				return createCounterRangeAdapter();
-			}
-			@Override
-			public Adapter caseStringLiteralRange(StringLiteralRange object) {
-				return createStringLiteralRangeAdapter();
-			}
-			@Override
-			public Adapter caseDefinedFunctionName(DefinedFunctionName object) {
-				return createDefinedFunctionNameAdapter();
-			}
-			@Override
-			public Adapter caseUse(Use object) {
-				return createUseAdapter();
-			}
-			@Override
-			public Adapter caseFunctionName(FunctionName object) {
-				return createFunctionNameAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.MachineLearningConfiguration <em>Machine Learning Configuration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.MachineLearningConfiguration
-	 * @generated
-	 */
-	public Adapter createMachineLearningConfigurationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.SurrogateDefinition <em>Surrogate Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.SurrogateDefinition
-	 * @generated
-	 */
-	public Adapter createSurrogateDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.SurrogateLayerDefinition <em>Surrogate Layer Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.SurrogateLayerDefinition
-	 * @generated
-	 */
-	public Adapter createSurrogateLayerDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition <em>Partial Surrogate Function Definition</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.PartialSurrogateFunctionDefinition
-	 * @generated
-	 */
-	public Adapter createPartialSurrogateFunctionDefinitionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.Prediction <em>Prediction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.Prediction
-	 * @generated
-	 */
-	public Adapter createPredictionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.Statement <em>Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.Statement
-	 * @generated
-	 */
-	public Adapter createStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.CallStatement <em>Call Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.CallStatement
-	 * @generated
-	 */
-	public Adapter createCallStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.BlockStatement <em>Block Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.BlockStatement
-	 * @generated
-	 */
-	public Adapter createBlockStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.PredictStatement <em>Predict Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.PredictStatement
-	 * @generated
-	 */
-	public Adapter createPredictStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.ForStatement <em>For Statement</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.ForStatement
-	 * @generated
-	 */
-	public Adapter createForStatementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.Range <em>Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.Range
-	 * @generated
-	 */
-	public Adapter createRangeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.CounterRange <em>Counter Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.CounterRange
-	 * @generated
-	 */
-	public Adapter createCounterRangeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.StringLiteralRange <em>String Literal Range</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.StringLiteralRange
-	 * @generated
-	 */
-	public Adapter createStringLiteralRangeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.DefinedFunctionName <em>Defined Function Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.DefinedFunctionName
-	 * @generated
-	 */
-	public Adapter createDefinedFunctionNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.mll.Use <em>Use</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.mll.Use
-	 * @generated
-	 */
-	public Adapter createUseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link de.evoal.languages.model.el.FunctionName <em>Function Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see de.evoal.languages.model.el.FunctionName
-	 * @generated
-	 */
-	public Adapter createFunctionNameAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //MllAdapterFactory
diff --git a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllSwitch.java b/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllSwitch.java
deleted file mode 100644
index a340e1f3..00000000
--- a/src/languages/de.evoal.languages.utils.dsl/src-gen/de/evoal/languages/model/mll/util/MllSwitch.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/**
- */
-package de.evoal.languages.model.mll.util;
-
-import de.evoal.languages.model.el.FunctionName;
-
-import de.evoal.languages.model.mll.*;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.util.Switch;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see de.evoal.languages.model.mll.MllPackage
- * @generated
- */
-public class MllSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static MllPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MllSwitch() {
-		if (modelPackage == null) {
-			modelPackage = MllPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case MllPackage.MACHINE_LEARNING_CONFIGURATION: {
-				MachineLearningConfiguration machineLearningConfiguration = (MachineLearningConfiguration)theEObject;
-				T result = caseMachineLearningConfiguration(machineLearningConfiguration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.SURROGATE_DEFINITION: {
-				SurrogateDefinition surrogateDefinition = (SurrogateDefinition)theEObject;
-				T result = caseSurrogateDefinition(surrogateDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.SURROGATE_LAYER_DEFINITION: {
-				SurrogateLayerDefinition surrogateLayerDefinition = (SurrogateLayerDefinition)theEObject;
-				T result = caseSurrogateLayerDefinition(surrogateLayerDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.PARTIAL_SURROGATE_FUNCTION_DEFINITION: {
-				PartialSurrogateFunctionDefinition partialSurrogateFunctionDefinition = (PartialSurrogateFunctionDefinition)theEObject;
-				T result = casePartialSurrogateFunctionDefinition(partialSurrogateFunctionDefinition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.PREDICTION: {
-				Prediction prediction = (Prediction)theEObject;
-				T result = casePrediction(prediction);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.STATEMENT: {
-				Statement statement = (Statement)theEObject;
-				T result = caseStatement(statement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.CALL_STATEMENT: {
-				CallStatement callStatement = (CallStatement)theEObject;
-				T result = caseCallStatement(callStatement);
-				if (result == null) result = caseStatement(callStatement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.BLOCK_STATEMENT: {
-				BlockStatement blockStatement = (BlockStatement)theEObject;
-				T result = caseBlockStatement(blockStatement);
-				if (result == null) result = caseStatement(blockStatement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.PREDICT_STATEMENT: {
-				PredictStatement predictStatement = (PredictStatement)theEObject;
-				T result = casePredictStatement(predictStatement);
-				if (result == null) result = caseStatement(predictStatement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.FOR_STATEMENT: {
-				ForStatement forStatement = (ForStatement)theEObject;
-				T result = caseForStatement(forStatement);
-				if (result == null) result = caseStatement(forStatement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.RANGE: {
-				Range range = (Range)theEObject;
-				T result = caseRange(range);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.COUNTER_RANGE: {
-				CounterRange counterRange = (CounterRange)theEObject;
-				T result = caseCounterRange(counterRange);
-				if (result == null) result = caseRange(counterRange);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.STRING_LITERAL_RANGE: {
-				StringLiteralRange stringLiteralRange = (StringLiteralRange)theEObject;
-				T result = caseStringLiteralRange(stringLiteralRange);
-				if (result == null) result = caseRange(stringLiteralRange);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.DEFINED_FUNCTION_NAME: {
-				DefinedFunctionName definedFunctionName = (DefinedFunctionName)theEObject;
-				T result = caseDefinedFunctionName(definedFunctionName);
-				if (result == null) result = caseFunctionName(definedFunctionName);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case MllPackage.USE: {
-				Use use = (Use)theEObject;
-				T result = caseUse(use);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Machine Learning Configuration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Machine Learning Configuration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMachineLearningConfiguration(MachineLearningConfiguration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Surrogate Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Surrogate Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSurrogateDefinition(SurrogateDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Surrogate Layer Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Surrogate Layer Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSurrogateLayerDefinition(SurrogateLayerDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Partial Surrogate Function Definition</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Partial Surrogate Function Definition</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePartialSurrogateFunctionDefinition(PartialSurrogateFunctionDefinition object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Prediction</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Prediction</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePrediction(Prediction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStatement(Statement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Call Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Call Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCallStatement(CallStatement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Block Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Block Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBlockStatement(BlockStatement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Predict Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Predict Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePredictStatement(PredictStatement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>For Statement</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>For Statement</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseForStatement(ForStatement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Range</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Range</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRange(Range object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Counter Range</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Counter Range</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCounterRange(CounterRange object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>String Literal Range</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>String Literal Range</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStringLiteralRange(StringLiteralRange object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Defined Function Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Defined Function Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefinedFunctionName(DefinedFunctionName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Use</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Use</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseUse(Use object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Function Name</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Function Name</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFunctionName(FunctionName object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //MllSwitch
-- 
GitLab