diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..128ac20
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+bin/
+target/
+**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/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.classpath b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.classpath
new file mode 100644
index 0000000..cf36b56
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.classpath
@@ -0,0 +1,7 @@
+<?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="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.gitignore b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.gitignore
new file mode 100644
index 0000000..74f6470
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.gitignore
@@ -0,0 +1,2 @@
+bin/
+*/target/*
diff --git a/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.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.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.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.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/.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.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST.MF
index af01d61..3d5a582 100644
--- a/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST.MF
@@ -5,22 +5,23 @@
 Bundle-Vendor: Eclipse OSBP
 Bundle-Version: 0.9.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.e4.core.di;bundle-version="1.1.0",
- org.eclipse.e4.core.services;bundle-version="1.2.0",
- org.eclipse.e4.tools;bundle-version="0.12.0",
- org.eclipse.e4.tools.emf.editor3x;bundle-version="0.12.0",
- org.eclipse.e4.tools.emf.liveeditor;bundle-version="0.12.0",
- org.eclipse.e4.tools.emf.ui;bundle-version="0.12.0",
- org.eclipse.e4.ui.services;bundle-version="1.1.0",
- org.eclipse.e4.ui.workbench;bundle-version="1.1.0",
+ org.eclipse.e4.core.di,
+ org.eclipse.e4.core.services,
+ org.eclipse.e4.tools,
+ org.eclipse.e4.tools.emf.editor3x,
+ org.eclipse.e4.tools.emf.liveeditor,
+ org.eclipse.e4.tools.emf.ui,
+ org.eclipse.e4.ui.dialogs,
+ org.eclipse.e4.ui.services,
+ org.eclipse.e4.ui.workbench,
  org.eclipse.osbp.e4modelextension;bundle-version="[0.9.0,0.10.0)",
  org.eclipse.emf.databinding;bundle-version="1.2.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.4.100",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.jface;bundle-version="3.8.101",
  org.eclipse.jface.databinding;bundle-version="1.6.0",
  org.eclipse.core.resources;bundle-version="3.8.1",
- org.eclipse.e4.core.contexts;bundle-version="1.3.100"
+ org.eclipse.e4.core.contexts
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.inject;version="1.0.0",
diff --git a/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST_old.MF b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST_old.MF
new file mode 100644
index 0000000..cf30fd7
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.e4tools.extension/META-INF/MANIFEST_old.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.osbp.vaaclipse.tools.e4tools.extension
+Bundle-SymbolicName: org.eclipse.osbp.vaaclipse.tools.e4tools.extension;singleton:=true
+Bundle-Vendor: Loetz GmbH&Co.KG (69115 Heidelberg, Germany)
+Bundle-Version: 0.9.0.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.e4.core.di,
+ org.eclipse.e4.core.services,
+ org.eclipse.e4.tools;bundle-version="4.5.0",
+ org.eclipse.e4.tools.emf.editor3x;bundle-version="4.5.0",
+ org.eclipse.e4.tools.emf.liveeditor;bundle-version="0.12.0",
+ org.eclipse.e4.tools.emf.ui;bundle-version="4.5.100",
+ org.eclipse.e4.ui.dialogs,
+ org.eclipse.e4.ui.services;bundle-version="1.2.100",
+ org.eclipse.e4.ui.workbench;bundle-version="1.2.100",
+ org.eclipse.osbp.e4modelextension;bundle-version="[0.9.0,0.10.0)",
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.jface;bundle-version="3.8.101",
+ org.eclipse.jface.databinding;bundle-version="1.6.0",
+ org.eclipse.core.resources;bundle-version="3.8.1",
+ org.eclipse.e4.core.contexts;bundle-version="1.3.100"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: javax.inject;version="1.0.0",
+ javax.annotation
diff --git a/org.eclipse.osbp.vaaclipse.tools.feature.ide/.gitignore b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.gitignore
new file mode 100644
index 0000000..2f7896d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.gitignore
@@ -0,0 +1 @@
+target/
diff --git a/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.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.vaaclipse.tools.feature.ide/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.feature.ide/.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.vaaclipse.tools.wizards/.classpath b/org.eclipse.osbp.vaaclipse.tools.wizards/.classpath
new file mode 100644
index 0000000..46cec6e
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.classpath
@@ -0,0 +1,7 @@
+<?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.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/org.eclipse.osbp.vaaclipse.tools.wizards/.gitignore b/org.eclipse.osbp.vaaclipse.tools.wizards/.gitignore
new file mode 100644
index 0000000..9c1822d
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.gitignore
@@ -0,0 +1,5 @@
+/target/
+/target/
+/target/
+/target/
+/target/
diff --git a/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f42de36
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.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.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.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.vaaclipse.tools.wizards/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.vaaclipse.tools.wizards/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/.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.vaaclipse.tools.wizards/META-INF/MANIFEST.MF b/org.eclipse.osbp.vaaclipse.tools.wizards/META-INF/MANIFEST.MF
index 247a16d..edf8277 100644
--- a/org.eclipse.osbp.vaaclipse.tools.wizards/META-INF/MANIFEST.MF
+++ b/org.eclipse.osbp.vaaclipse.tools.wizards/META-INF/MANIFEST.MF
@@ -14,15 +14,14 @@
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.jdt.launching;bundle-version="3.5.100",
  org.eclipse.ui.ide;bundle-version="3.6.0",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.core.databinding.beans;bundle-version="1.2.100",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.core.databinding.beans;bundle-version="[1.3.100,1.4.0)",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
+ org.eclipse.core.databinding.property;bundle-version="[1.6.0,1.7.0)",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
  org.eclipse.emf.ecore
 Bundle-Activator: org.eclipse.osbp.vaaclipse.wizards.ToolsPlugin
-Import-Package: org.eclipse.e4.internal.tools.wizards.project,
- javax.inject;version="1.0.0",
+Import-Package: javax.inject;version="1.0.0",
  javax.annotation
 Export-Package: org.eclipse.osbp.vaaclipse.wizards.project;version="0.9.0"
 Bundle-ActivationPolicy: lazy
diff --git a/pom.xml b/pom.xml
index f906dbd..3688f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,6 @@
     </prerequisites>
 
     <properties>
-        <tycho-version>0.21.0</tycho-version>
-        <tychoExtrasVersion>0.21.0</tychoExtrasVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <shiro-version>1.2.1</shiro-version>
@@ -38,14 +36,6 @@
         <icepush-gwt-version>1.0.0</icepush-gwt-version>
     </properties>
 
-<!--     <repositories> -->
-<!--         <repository> -->
-<!--             <id>e4tools</id> -->
-<!--             <url>http://download.eclipse.org/e4/downloads/drops/S-0.17-201501051100/repository</url> -->
-<!--             <layout>p2</layout> -->
-<!--         </repository> -->
-<!--     </repositories> -->
-
     <modules>
         <module>org.eclipse.osbp.vaaclipse.tools.e4tools.extension</module>
         <module>org.eclipse.osbp.vaaclipse.tools.feature.ide</module>