diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8920bdd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+**/bin/
+**/target/
+**.java._trace
+**git.properties
+**/target/
+**/.metadata/
+
+**/emf-gen/**/.gitignore
+**/src-gen/**/.gitignore
+**/git.properties
+**/*.java._trace
+**/*.log
+**/*.log.properties
+
+**/bin/
+**/build/
+*.class
+*.ctrl
+**/Debug/
+.DS_Store
+*.ear
+*.war
+
+**/*.actionbin
+**/*.blipbin
+**/*.chartbin
+**/*.cubebin
+**/*.datatypebin
+**/*.dtobin
+**/*.entitybin
+**/*.servicebin
+**/*.tablebin
+**/*.uibin
+**/*.uisemanticbin
+**/*.xtendbin
+**/*.xtextbin
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml
index fcde2d6..106f6d9 100644
--- a/jenkins.build.config.xml
+++ b/jenkins.build.config.xml
@@ -15,6 +15,6 @@
 <jenkins>
 	<!-- DO NOT EDIT BELOW THIS LINE -->
         <jenkins.build.dependencies>
-                <jenkins.build.dependency>org.eclipse.osbp.dsl</jenkins.build.dependency>
+                <jenkins.build.dependency>org.eclipse.osbp.xtext.oxtype</jenkins.build.dependency>
         </jenkins.build.dependencies>
 </jenkins>
diff --git a/org.eclipse.osbp.xtext.addons.feature/.gitignore b/org.eclipse.osbp.xtext.addons.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.xtext.addons.feature/feature.xml b/org.eclipse.osbp.xtext.addons.feature/feature.xml
index e9a5df7..9821a5c 100644
--- a/org.eclipse.osbp.xtext.addons.feature/feature.xml
+++ b/org.eclipse.osbp.xtext.addons.feature/feature.xml
@@ -14,7 +14,8 @@
         id="org.eclipse.osbp.xtext.addons.feature"
         label="%featureName"
         version="0.9.0.qualifier"
-        provider-name="%providerName">
+        provider-name="%providerName"
+		plugin="org.eclipse.osbp.xtext.addons">
         
     <description>
         %description
diff --git a/org.eclipse.osbp.xtext.addons/.classpath b/org.eclipse.osbp.xtext.addons/.classpath
new file mode 100644
index 0000000..2f5ffb2
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.classpath
@@ -0,0 +1,8 @@
+<?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-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.xtext.addons/.gitignore b/org.eclipse.osbp.xtext.addons/.gitignore
new file mode 100644
index 0000000..09e3bc9
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,11 @@
+//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=src/test/generated-sources/xtend
+BuilderConfiguration.is_project_specific=true
+eclipse.preferences.version=1
+is_project_specific=true
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.sourceFolder.emf-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true
diff --git a/org.eclipse.osbp.xtext.addons/META-INF/MANIFEST.MF b/org.eclipse.osbp.xtext.addons/META-INF/MANIFEST.MF
index 40641bb..d088fb5 100644
--- a/org.eclipse.osbp.xtext.addons/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.xtext.addons/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.osbp.xtext.addons.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.osbp.dsl.xtext.lazyresolver.api;version="0.9.0",
- org.osgi.framework;version="1.3.0"
+Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.7.3,2.8.0)",
- org.eclipse.xtext;bundle-version="[2.7.3,2.8.0)",
- org.eclipse.osbp.gitinfo;bundle-version="[0.9.0,0.10.0)"
+Require-Bundle: org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.osbp.gitinfo;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.osbp.xtext.oxtype;bundle-version="[0.9.0,0.10.0)"
 Export-Package: org.eclipse.osbp.xtext.addons;version="0.9.0"
 Bundle-Vendor: Eclipse OSBP
diff --git a/org.eclipse.osbp.xtext.addons/src/org/eclipse/osbp/xtext/addons/EObjectHelper.java b/org.eclipse.osbp.xtext.addons/src/org/eclipse/osbp/xtext/addons/EObjectHelper.java
index 716ce9d..4dca276 100644
--- a/org.eclipse.osbp.xtext.addons/src/org/eclipse/osbp/xtext/addons/EObjectHelper.java
+++ b/org.eclipse.osbp.xtext.addons/src/org/eclipse/osbp/xtext/addons/EObjectHelper.java
@@ -15,7 +15,7 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.osbp.dsl.xtext.lazyresolver.api.ISemanticLoadingResource;
+import org.eclipse.osbp.xtext.oxtype.resource.ISemanticLoadingResource;
 
 public class EObjectHelper {
 
diff --git a/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/.gitignore b/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/.gitignore
new file mode 100644
index 0000000..3f911f0
--- /dev/null
+++ b/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/.gitignore
@@ -0,0 +1,2 @@
+/.AdvancedJvmModelGenerator.xtendbin
+/AdvancedJvmModelGenerator.java
diff --git a/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/AdvancedJvmModelGenerator.java b/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/AdvancedJvmModelGenerator.java
index 18589f5..4cd00b2 100644
--- a/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/AdvancedJvmModelGenerator.java
+++ b/org.eclipse.osbp.xtext.addons/xtend-gen/org/eclipse/osbp/xtext/addons/AdvancedJvmModelGenerator.java
@@ -16,7 +16,6 @@
 
 import javax.inject.Inject;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.xtext.xbase.compiler.JvmModelGenerator;
 import org.eclipse.xtext.xbase.jvmmodel.JvmAnnotationReferenceBuilder;
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypeReferenceBuilder;
@@ -37,11 +36,7 @@
   protected JvmTypeReferenceBuilder _typeReferenceBuilder;
   
   public void setBuilder(final Resource resource) {
-    ResourceSet _resourceSet = resource.getResourceSet();
-    JvmAnnotationReferenceBuilder _create = this.annotationRefBuilderFactory.create(_resourceSet);
-    this._annotationTypesBuilder = _create;
-    ResourceSet _resourceSet_1 = resource.getResourceSet();
-    JvmTypeReferenceBuilder _create_1 = this.typeRefBuilderFactory.create(_resourceSet_1);
-    this._typeReferenceBuilder = _create_1;
+    this._annotationTypesBuilder = this.annotationRefBuilderFactory.create(resource.getResourceSet());
+    this._typeReferenceBuilder = this.typeRefBuilderFactory.create(resource.getResourceSet());
   }
 }