diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b9f0a46
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+**/bin/
+**/target/
+**._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/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.gitignore b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime.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.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime.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.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime.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.osgi.hybrid.api.runtime.feature/feature.xml b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/feature.xml
index dcb81e0..b8a1d72 100644
--- a/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/feature.xml
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime.feature/feature.xml
@@ -14,7 +14,8 @@
         id="org.eclipse.osbp.osgi.hybrid.api.runtime.feature"
         label="%featureName"
         version="0.9.0.qualifier"
-        provider-name="%providerName">
+        provider-name="%providerName"
+		plugin="org. eclipse.osbp.osgi.hybrid.api.runtime">
         
     <description>
         %description
diff --git a/org.eclipse.osbp.osgi.hybrid.api.runtime/.classpath b/org.eclipse.osbp.osgi.hybrid.api.runtime/.classpath
new file mode 100644
index 0000000..43b9862
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.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.osgi.hybrid.api.runtime/.gitignore b/org.eclipse.osbp.osgi.hybrid.api.runtime/.gitignore
new file mode 100644
index 0000000..ae3c172
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.core.resources.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..0c68a61
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.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.osgi.hybrid.api.runtime/.settings/org.eclipse.m2e.core.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.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.osgi.hybrid.api.runtime/.settings/org.eclipse.pde.core.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.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.osgi.hybrid.api.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs b/org.eclipse.osbp.osgi.hybrid.api.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..19e3115
--- /dev/null
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/.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.osgi.hybrid.api.runtime/pom.xml b/org.eclipse.osbp.osgi.hybrid.api.runtime/pom.xml
index a0a6b6f..4e973fb 100644
--- a/org.eclipse.osbp.osgi.hybrid.api.runtime/pom.xml
+++ b/org.eclipse.osbp.osgi.hybrid.api.runtime/pom.xml
@@ -54,12 +54,6 @@
             <type>eclipse-plugin</type>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osbp.utils.img</groupId>
-            <artifactId>org.eclipse.osbp.utils.img</artifactId>
-            <version>${project.version}</version>
-            <type>eclipse-plugin</type>
-        </dependency>
-        <dependency>
             <groupId>org.eclipse.osbp.authentication</groupId>
             <artifactId>org.eclipse.osbp.authentication</artifactId>
             <version>${project.version}</version>
diff --git a/pom.xml b/pom.xml
index 5f67e7c..6e6e732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
 
     <groupId>org.eclipse.osbp.osgi.hybrid.api.runtime</groupId>
     <artifactId>org.eclipse.osbp.osgi.hybrid.api.runtime.aggregator</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <url>${osbp.site.repository.url}</url>
@@ -46,22 +45,8 @@
     <modules>
         <module>org.eclipse.osbp.osgi.hybrid.api.runtime</module>
         <module>org.eclipse.osbp.osgi.hybrid.api.runtime.feature</module>
-        <!-- <module>org.eclipse.osbp.osgi.hybrid.api.runtime.p2</module> -->
     </modules>
 
-    <profiles>
-        <profile>
-            <id>build.p2</id>
-            <activation>
-                <property>
-                    <name>osbp.build.p2</name>
-                </property>
-            </activation>
-            <modules>
-                <!-- <module>org.eclipse.osbp.osgi.hybrid.api.runtime.p2</module> -->
-            </modules>
-        </profile>
-    </profiles>
     <build>
         <pluginManagement>
             <plugins>