diff --git a/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/EvolutionaryAlgorithmModelLoader.java b/src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java
similarity index 100%
rename from src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/EvolutionaryAlgorithmModelLoader.java
rename to src/core/de.evoal.core/src/main/java/de/evoal/core/main/producer/OptimisationModelLoader.java
diff --git a/src/languages/de.evoal.languages.model.ol.dsl.ide/build.properties b/src/languages/de.evoal.languages.model.ol.dsl.ide/build.properties
index 5c6bbf99f082bb19d8aa4ec89f7902c3e8936171..726c2d93385ff5e2df114913f3a822041b075a9a 100644
--- a/src/languages/de.evoal.languages.model.ol.dsl.ide/build.properties
+++ b/src/languages/de.evoal.languages.model.ol.dsl.ide/build.properties
@@ -4,3 +4,4 @@ source.. = src/,\
 bin.includes = .,\
                META-INF/
 bin.excludes = **/*.xtend
+output.. = target/classes/
diff --git a/src/languages/de.evoal.languages.model.ol.dsl.ui/plugin.xml_gen b/src/languages/de.evoal.languages.model.ol.dsl.ui/plugin.xml_gen
new file mode 100644
index 0000000000000000000000000000000000000000..a667cca854724e78ad99444ad8caee84593d1b91
--- /dev/null
+++ b/src/languages/de.evoal.languages.model.ol.dsl.ui/plugin.xml_gen
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+	<extension
+		point="org.eclipse.ui.editors">
+		<editor
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+			contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+			default="true"
+			extensions="ol"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			name="OptimisationLanguage Editor">
+		</editor>
+	</extension>
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+			commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+			<activeWhen>
+				<reference
+					definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+			commandId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.validate">
+			<activeWhen>
+				<reference
+					definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+		<!-- copy qualified name -->
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedNameHandler"
+			commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName">
+			<activeWhen>
+				<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened" />
+			</activeWhen>
+		</handler>
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedNameHandler"
+			commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName">
+			<activeWhen>
+				<and>
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.XtextEditor.opened" />
+					<iterate>
+						<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+					</iterate>
+				</and>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.core.expressions.definitions">
+		<definition id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+			<and>
+				<reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+				<with variable="activeEditor">
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+						forcePluginActivation="true"/>
+				</with>
+			</and>
+		</definition>
+		<definition id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.XtextEditor.opened">
+			<and>
+				<reference definitionId="isXtextEditorActive"/>
+				<with variable="activeEditor">
+					<test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName"
+						value="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+						forcePluginActivation="true"/>
+				</with>
+			</and>
+		</definition>
+	</extension>
+	<extension
+			point="org.eclipse.ui.preferencePages">
+		<page
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			name="OptimisationLanguage">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.coloring"
+			name="Syntax Coloring">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.templates"
+			name="Templates">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+	</extension>
+	<extension
+			point="org.eclipse.ui.propertyPages">
+		<page
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			name="OptimisationLanguage">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+			<enabledWhen>
+				<adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+			<filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+		</page>
+	</extension>
+	<extension
+		point="org.eclipse.ui.keywords">
+		<keyword
+			id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"
+			label="OptimisationLanguage"/>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Trigger expensive validation"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.validate"
+			name="Validate">
+		</command>
+		<!-- copy qualified name -->
+		<command
+			id="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+			categoryId="org.eclipse.ui.category.edit"
+			description="Copy the qualified name for the selected element"
+			name="Copy Qualified Name">
+		</command>
+		<command
+			id="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+			categoryId="org.eclipse.ui.category.edit"
+			description="Copy the qualified name for the selected element"
+			name="Copy Qualified Name">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.edit">
+			<command
+				commandId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.validate"
+				style="push"
+				tooltip="Trigger expensive validation">
+				<visibleWhen checkEnabled="false">
+					<reference
+						definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<!-- copy qualified name -->
+		<menuContribution locationURI="popup:#TextEditorContext?after=copy">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<menuContribution locationURI="menu:edit?after=copy">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.EditorCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+		<menuContribution locationURI="popup:org.eclipse.xtext.ui.outline?after=additions">
+			<command commandId="org.eclipse.xtext.ui.editor.copyqualifiedname.OutlineCopyQualifiedName"
+				style="push" tooltip="Copy Qualified Name">
+				<visibleWhen checkEnabled="false">
+					<and>
+						<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.XtextEditor.opened" />
+						<iterate>
+							<adapt type="org.eclipse.xtext.ui.editor.outline.IOutlineNode" />
+						</iterate>
+					</and>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+			commandId="org.eclipse.xtext.ui.editor.FindReferences">
+			<activeWhen>
+				<reference
+					definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.core.contenttype.contentTypes">
+		<content-type
+			base-type="org.eclipse.core.runtime.text"
+			file-extensions="ol"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.contenttype"
+			name="OptimisationLanguage File"
+			priority="normal">
+		</content-type>
+	</extension>
+	<!-- adding resource factories -->
+	<extension
+		point="org.eclipse.emf.ecore.extension_parser">
+		<parser
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+			type="ol">
+		</parser>
+	</extension>
+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+		<resourceServiceProvider
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+			uriExtension="ol">
+		</resourceServiceProvider>
+	</extension>
+	<!-- marker definitions for de.evoal.languages.model.ol.dsl.OptimisationLanguage -->
+	<extension
+			id="optimisationlanguage.check.fast"
+			name="OptimisationLanguage Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.fast"/>
+		<persistent value="true"/>
+	</extension>
+	<extension
+			id="optimisationlanguage.check.normal"
+			name="OptimisationLanguage Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.normal"/>
+		<persistent value="true"/>
+	</extension>
+	<extension
+			id="optimisationlanguage.check.expensive"
+			name="OptimisationLanguage Problem"
+			point="org.eclipse.core.resources.markers">
+		<super type="org.eclipse.xtext.ui.check.expensive"/>
+		<persistent value="true"/>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.validation.ValidatorPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.validator.preferencePage"
+			name="Errors/Warnings">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.xtext.builder.participant">
+		<participant
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
+			fileExtensions="ol"/>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compiler.preferencePage"
+			name="Compiler">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.ui.propertyPages">
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.builder.preferences.BuilderPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compiler.propertyPage"
+			name="Compiler">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+			<enabledWhen>
+				<adapt type="org.eclipse.core.resources.IProject"/>
+			</enabledWhen>
+			<filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
+			<command
+				commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
+				id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.OpenGeneratedCode"
+				style="push">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened" />
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
+			commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
+			<activeWhen>
+				<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened" />
+			</activeWhen>
+		</handler>
+	</extension>
+	<!-- Quick Outline -->
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+			<activeWhen>
+				<reference
+					definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Open the quick outline."
+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+			name="Quick Outline">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.open">
+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+				style="push"
+				tooltip="Open Quick Outline">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened"/>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<!-- quickfix marker resolution generator for de.evoal.languages.model.ol.dsl.OptimisationLanguage -->
+	<extension
+			point="org.eclipse.ui.ide.markerResolution">
+		<markerResolutionGenerator
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="de.evoal.languages.model.ol.dsl.ui.optimisationlanguage.check.fast">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+		<markerResolutionGenerator
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="de.evoal.languages.model.ol.dsl.ui.optimisationlanguage.check.normal">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+		<markerResolutionGenerator
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator"
+			markerType="de.evoal.languages.model.ol.dsl.ui.optimisationlanguage.check.expensive">
+			<attribute
+				name="FIXABLE_KEY"
+				value="true">
+			</attribute>
+		</markerResolutionGenerator>
+	</extension>
+	<!-- Rename Refactoring -->
+	<extension point="org.eclipse.ui.handlers">
+		<handler
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.DefaultRenameElementHandler"
+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+			<activeWhen>
+				<reference
+					definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.edit">
+			<command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+				style="push">
+				<visibleWhen checkEnabled="false">
+					<reference
+						definitionId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.Editor.opened">
+					</reference>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.preferencePages">
+		<page
+			category="de.evoal.languages.model.ol.dsl.OptimisationLanguage"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RefactoringPreferencePage"
+			id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.refactoring"
+			name="Refactoring">
+			<keywordReference id="de.evoal.languages.model.ol.dsl.ui.keyword_OptimisationLanguage"/>
+		</page>
+	</extension>
+	<extension point="org.eclipse.compare.contentViewers">
+		<viewer id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compare.contentViewers"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+			extensions="ol">
+		</viewer>
+		<contentTypeBinding
+			contentTypeId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.contenttype"
+			contentViewerId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compare.contentViewers" />
+	</extension>
+	<extension point="org.eclipse.compare.contentMergeViewers">
+		<viewer id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compare.contentMergeViewers"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.compare.InjectableViewerCreator"
+			extensions="ol" label="OptimisationLanguage Compare">
+		</viewer>
+		<contentTypeBinding
+			contentTypeId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.contenttype"
+			contentMergeViewerId="de.evoal.languages.model.ol.dsl.OptimisationLanguage.compare.contentMergeViewers" />
+	</extension>
+	<extension point="org.eclipse.ui.editors.documentProviders">
+		<provider id="de.evoal.languages.model.ol.dsl.OptimisationLanguage.editors.documentProviders"
+			class="de.evoal.languages.model.ol.dsl.ui.OptimisationLanguageExecutableExtensionFactory:org.eclipse.xtext.ui.editor.model.XtextDocumentProvider"
+			extensions="ol">
+		</provider>
+	</extension>
+	<extension point="org.eclipse.team.core.fileTypes">
+		<fileTypes
+			extension="ol"
+			type="text">
+		</fileTypes>
+	</extension>
+</plugin>
diff --git a/src/languages/de.evoal.languages.model.ol.dsl/build.properties b/src/languages/de.evoal.languages.model.ol.dsl/build.properties
index c24ff368064f653346c873aa6e7a60752f0bca4a..c4110d99e0220c94722d59f022af3a76e018266a 100644
--- a/src/languages/de.evoal.languages.model.ol.dsl/build.properties
+++ b/src/languages/de.evoal.languages.model.ol.dsl/build.properties
@@ -15,3 +15,4 @@ additional.bundles = org.eclipse.xtext.xbase,\
                      org.objectweb.asm,\
                      org.apache.commons.logging,\
                      org.apache.log4j
+output.. = target/classes/
diff --git a/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/AbstractOptimisationLanguageRuntimeModule.java b/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/AbstractOptimisationLanguageRuntimeModule.java
index b024b3ad7171ffc2282900cb8bb2a6e714211824..f1d2160262f6b6e84968c82be8e994a68e1b6056 100644
--- a/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/AbstractOptimisationLanguageRuntimeModule.java
+++ b/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/AbstractOptimisationLanguageRuntimeModule.java
@@ -73,7 +73,7 @@ public abstract class AbstractOptimisationLanguageRuntimeModule extends DefaultR
 	
 	public void configureFileExtensions(Binder binder) {
 		if (properties == null || properties.getProperty(Constants.FILE_EXTENSIONS) == null)
-			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("eal");
+			binder.bind(String.class).annotatedWith(Names.named(Constants.FILE_EXTENSIONS)).toInstance("ol");
 	}
 	
 	// contributed by org.eclipse.xtext.xtext.generator.grammarAccess.GrammarAccessFragment2
diff --git a/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/OptimisationLanguageStandaloneSetupGenerated.java b/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/OptimisationLanguageStandaloneSetupGenerated.java
index 0333ade8a3cba85ce8184377ab148318e10e454d..bfd55f157e2f5b7e2e561da641fe1ba3d97c3b60 100644
--- a/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/OptimisationLanguageStandaloneSetupGenerated.java
+++ b/src/languages/de.evoal.languages.model.ol.dsl/src-gen/de/evoal/languages/model/ol/dsl/OptimisationLanguageStandaloneSetupGenerated.java
@@ -32,7 +32,7 @@ public class OptimisationLanguageStandaloneSetupGenerated implements ISetup {
 		IResourceFactory resourceFactory = injector.getInstance(IResourceFactory.class);
 		IResourceServiceProvider serviceProvider = injector.getInstance(IResourceServiceProvider.class);
 		
-		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("eal", resourceFactory);
-		IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("eal", serviceProvider);
+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("ol", resourceFactory);
+		IResourceServiceProvider.Registry.INSTANCE.getExtensionToFactoryMap().put("ol", serviceProvider);
 	}
 }
diff --git a/src/languages/de.evoal.languages.model.ol.dsl/src/de/evoal/languages/model/ol/dsl/GenerateOptimisationLanguage.mwe2 b/src/languages/de.evoal.languages.model.ol.dsl/src/de/evoal/languages/model/ol/dsl/GenerateOptimisationLanguage.mwe2
index af200e045e7ad3f7678ea64adbadfd0c6ee57cd1..35272703d02c346c11e83c9f7e0b9ed302bfca5f 100644
--- a/src/languages/de.evoal.languages.model.ol.dsl/src/de/evoal/languages/model/ol/dsl/GenerateOptimisationLanguage.mwe2
+++ b/src/languages/de.evoal.languages.model.ol.dsl/src/de/evoal/languages/model/ol/dsl/GenerateOptimisationLanguage.mwe2
@@ -26,7 +26,7 @@ Workflow {
                 }
                 language = StandardLanguage {
                         name = "de.evoal.languages.model.ol.dsl.OptimisationLanguage"
-                        fileExtensions = "eal"
+                        fileExtensions = "ol"
                         referencedResource = "platform:/resource/de.evoal.languages.model.instance/model/model.genmodel"
                         referencedResource = "platform:/resource/de.evoal.languages.model.ol/model/model.genmodel"
                         referencedResource = "platform:/resource/de.evoal.languages.model.dl/model/model.genmodel"