diff --git a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.dtos.dtos_bin b/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.dtos.dtos_bin
deleted file mode 100644
index 2e9c690..0000000
--- a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.dtos.dtos_bin
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<dto:LDtoModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dto="http://osbp.eclipse.org/dsl/dto/v1" xmlns:entity="http://osbp.eclipse.org/dsl/entity/v1">
-  <packages name="org.eclipse.osbp.utils.functionnormalizer.dtos">
-    <imports importedNamespace="org.eclipse.osbp.utils.functionnormalizer.entities.*"/>
-    <types xsi:type="dto:LAutoInheritDto" name="FunctionNormalizerDto">
-      <annotationInfo xsi:type="dto:LDto"/>
-      <features xsi:type="dto:LDtoInheritedAttribute">
-        <annotationInfo xsi:type="dto:LDtoFeature"/>
-        <inheritedFeature xsi:type="entity:LBeanAttribute" href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.0/@features.0"/>
-      </features>
-      <features xsi:type="dto:LDtoInheritedAttribute">
-        <annotationInfo xsi:type="dto:LDtoFeature"/>
-        <inheritedFeature xsi:type="entity:LBeanAttribute" href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.0/@features.1"/>
-      </features>
-      <wrappedType href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.0"/>
-    </types>
-    <types xsi:type="dto:LAutoInheritDto" name="FunctionTypeDto">
-      <annotationInfo xsi:type="dto:LDto"/>
-      <features xsi:type="dto:LDtoInheritedAttribute">
-        <annotationInfo xsi:type="dto:LDtoFeature"/>
-        <inheritedFeature xsi:type="entity:LBeanAttribute" href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.1/@features.0"/>
-      </features>
-      <wrappedType href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.1"/>
-    </types>
-    <types xsi:type="dto:LAutoInheritDto" name="FunctionTypingDto">
-      <annotationInfo xsi:type="dto:LDto"/>
-      <features xsi:type="dto:LDtoInheritedReference" type="//@packages.0/@types.1">
-        <annotationInfo xsi:type="dto:LDtoFeature"/>
-        <inheritedFeature xsi:type="entity:LBeanReference" href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.2/@features.0"/>
-      </features>
-      <features xsi:type="dto:LDtoInheritedReference" type="//@packages.0/@types.0">
-        <annotationInfo xsi:type="dto:LDtoFeature"/>
-        <inheritedFeature xsi:type="entity:LBeanReference" href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.2/@features.1"/>
-      </features>
-      <wrappedType href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/FunctionNormalizer.entitymodel#/0/@packages.0/@types.2"/>
-    </types>
-  </packages>
-</dto:LDtoModel>
diff --git a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.entitymodel.entities_bin b/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.entitymodel.entities_bin
deleted file mode 100644
index ec2cd68..0000000
--- a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/FunctionNormalizer.entitymodel.entities_bin
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<entity:LEntityModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:entity="http://osbp.eclipse.org/dsl/entity/v1" xmlns:types="http://osbp.eclipse.org/dsl/common/types/v1" xmlns:types_1="http://www.eclipse.org/xtext/common/JavaVMTypes" xmlns:xbase="http://www.eclipse.org/xtext/xbase/Xbase">
-  <packages name="org.eclipse.osbp.utils.functionnormalizer.entities">
-    <imports importedNamespace="javax.xml.bind.annotation.*"/>
-    <imports importedNamespace="org.eclipse.osbp.utils.blob.datatypes.*"/>
-    <types xsi:type="entity:LBean" name="FunctionNormalizer">
-      <annotationInfo xsi:type="types:LClass">
-        <annotations>
-          <annotation>
-            <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessorType#javax.xml.bind.annotation.XmlAccessorType"/>
-            <value xsi:type="xbase:XMemberFeatureCall">
-              <feature xsi:type="types_1:JvmEnumerationLiteral" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType.FIELD"/>
-              <memberCallTarget xsi:type="xbase:XFeatureCall">
-                <feature xsi:type="types_1:JvmEnumerationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType"/>
-              </memberCallTarget>
-            </value>
-          </annotation>
-        </annotations>
-      </annotationInfo>
-      <features xsi:type="entity:LBeanAttribute" name="name">
-        <annotationInfo xsi:type="entity:LBeanFeature">
-          <annotations>
-            <annotation>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAttribute#javax.xml.bind.annotation.XmlAttribute"/>
-            </annotation>
-          </annotations>
-        </annotationInfo>
-        <type href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/functionNormalizer.datatypes#/0/@packages.0/@types.17"/>
-      </features>
-      <features xsi:type="entity:LBeanAttribute" name="returnType">
-        <annotationInfo xsi:type="entity:LBeanFeature">
-          <annotations>
-            <annotation>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAttribute#javax.xml.bind.annotation.XmlAttribute"/>
-            </annotation>
-          </annotations>
-        </annotationInfo>
-        <type href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/functionNormalizer.datatypes#/0/@packages.0/@types.17"/>
-      </features>
-    </types>
-    <types xsi:type="entity:LBean" name="FunctionType">
-      <annotationInfo xsi:type="types:LClass">
-        <annotations>
-          <annotation>
-            <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessorType#javax.xml.bind.annotation.XmlAccessorType"/>
-            <value xsi:type="xbase:XMemberFeatureCall">
-              <feature xsi:type="types_1:JvmEnumerationLiteral" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType.FIELD"/>
-              <memberCallTarget xsi:type="xbase:XFeatureCall">
-                <feature xsi:type="types_1:JvmEnumerationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType"/>
-              </memberCallTarget>
-            </value>
-          </annotation>
-        </annotations>
-      </annotationInfo>
-      <features xsi:type="entity:LBeanAttribute" name="name">
-        <annotationInfo xsi:type="entity:LBeanFeature">
-          <annotations>
-            <annotation>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAttribute#javax.xml.bind.annotation.XmlAttribute"/>
-            </annotation>
-          </annotations>
-        </annotationInfo>
-        <type href="platform:/resource/org.eclipse.osbp.utils.functionnormalizer-mavenizing/src/org/eclipse/osbp/utils/functionnormalizer/functionNormalizer.datatypes#/0/@packages.0/@types.17"/>
-      </features>
-    </types>
-    <types xsi:type="entity:LBean" name="FunctionTyping">
-      <annotationInfo xsi:type="types:LClass">
-        <annotations>
-          <annotation>
-            <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlRootElement#javax.xml.bind.annotation.XmlRootElement"/>
-          </annotation>
-        </annotations>
-        <annotations>
-          <annotation>
-            <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessorType#javax.xml.bind.annotation.XmlAccessorType"/>
-            <value xsi:type="xbase:XMemberFeatureCall">
-              <feature xsi:type="types_1:JvmEnumerationLiteral" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType.FIELD"/>
-              <memberCallTarget xsi:type="xbase:XFeatureCall">
-                <feature xsi:type="types_1:JvmEnumerationType" href="java:/Objects/javax.xml.bind.annotation.XmlAccessType#javax.xml.bind.annotation.XmlAccessType"/>
-              </memberCallTarget>
-            </value>
-          </annotation>
-        </annotations>
-      </annotationInfo>
-      <features xsi:type="entity:LBeanReference" name="types" type="//@packages.0/@types.1">
-        <multiplicity lower="MANY"/>
-        <annotationInfo xsi:type="entity:LBeanFeature">
-          <annotations>
-            <annotation>
-              <elementValuePairs>
-                <value xsi:type="xbase:XStringLiteral" value="functionType"/>
-                <element href="java:/Objects/javax.xml.bind.annotation.XmlElementWrapper#javax.xml.bind.annotation.XmlElementWrapper.name()"/>
-              </elementValuePairs>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlElementWrapper#javax.xml.bind.annotation.XmlElementWrapper"/>
-            </annotation>
-          </annotations>
-          <annotations>
-            <annotation>
-              <elementValuePairs>
-                <value xsi:type="xbase:XStringLiteral" value="key"/>
-                <element href="java:/Objects/javax.xml.bind.annotation.XmlElement#javax.xml.bind.annotation.XmlElement.name()"/>
-              </elementValuePairs>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlElement#javax.xml.bind.annotation.XmlElement"/>
-            </annotation>
-          </annotations>
-        </annotationInfo>
-      </features>
-      <features xsi:type="entity:LBeanReference" name="normalizer" type="//@packages.0/@types.0">
-        <multiplicity lower="MANY"/>
-        <annotationInfo xsi:type="entity:LBeanFeature">
-          <annotations>
-            <annotation>
-              <elementValuePairs>
-                <value xsi:type="xbase:XStringLiteral" value="normalizer"/>
-                <element href="java:/Objects/javax.xml.bind.annotation.XmlElementWrapper#javax.xml.bind.annotation.XmlElementWrapper.name()"/>
-              </elementValuePairs>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlElementWrapper#javax.xml.bind.annotation.XmlElementWrapper"/>
-            </annotation>
-          </annotations>
-          <annotations>
-            <annotation>
-              <elementValuePairs>
-                <value xsi:type="xbase:XStringLiteral" value="function"/>
-                <element href="java:/Objects/javax.xml.bind.annotation.XmlElement#javax.xml.bind.annotation.XmlElement.name()"/>
-              </elementValuePairs>
-              <annotationType xsi:type="types_1:JvmAnnotationType" href="java:/Objects/javax.xml.bind.annotation.XmlElement#javax.xml.bind.annotation.XmlElement"/>
-            </annotation>
-          </annotations>
-        </annotationInfo>
-      </features>
-    </types>
-  </packages>
-</entity:LEntityModel>
diff --git a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/functionNormalizer.datatypes.datatypes_bin b/org.eclipse.osbp.utils.functionnormalizer/modelsbin/functionNormalizer.datatypes.datatypes_bin
deleted file mode 100644
index 907c63f..0000000
--- a/org.eclipse.osbp.utils.functionnormalizer/modelsbin/functionNormalizer.datatypes.datatypes_bin
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<types:LCommonModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:types="http://osbp.eclipse.org/dsl/common/types/v1" xmlns:types_1="http://www.eclipse.org/xtext/common/JavaVMTypes">
-  <packages name="org.eclipse.osbp.utils.blob.datatypes">
-    <types xsi:type="types:LDataType" name="boolean" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Boolean#java.lang.Boolean"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="short" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Short#java.lang.Short"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="int" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Integer#java.lang.Integer"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="long" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Long#java.lang.Long"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="double" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Double#java.lang.Double"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="float" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Float#java.lang.Float"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="character" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Character#java.lang.Character"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="byte" asPrimitive="true">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Byte#java.lang.Byte"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Boolean">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Boolean#java.lang.Boolean"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Short">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Short#java.lang.Short"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Int">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Integer#java.lang.Integer"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Long">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Long#java.lang.Long"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Double">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Double#java.lang.Double"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Float">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Float#java.lang.Float"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Character">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Character#java.lang.Character"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Byte">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.Byte#java.lang.Byte"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="BigDecimal">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.math.BigDecimal#java.math.BigDecimal"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="String">
-      <jvmTypeReference xsi:type="types_1:JvmParameterizedTypeReference">
-        <type xsi:type="types_1:JvmGenericType" href="java:/Objects/java.lang.String#java.lang.String"/>
-      </jvmTypeReference>
-    </types>
-    <types xsi:type="types:LDataType" name="Date" date="true"/>
-    <types xsi:type="types:LDataType" name="datetype" date="true"/>
-    <types xsi:type="types:LDataType" name="timetype" date="true" dateType="TIME"/>
-    <types xsi:type="types:LDataType" name="blobtype" asBlob="true"/>
-  </packages>
-</types:LCommonModel>