diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
index d9f32c1..310159c 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/.classpath
@@ -4,5 +4,26 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="bin" sourcepath="bin"/>
+	<classpathentry kind="lib" path="lib/animal-sniffer-annotations.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
+	<classpathentry kind="lib" path="lib/antlr4-runtime.jar"/>
+	<classpathentry kind="lib" path="lib/antlr4.jar"/>
+	<classpathentry kind="lib" path="lib/asm.jar"/>
+	<classpathentry kind="lib" path="lib/bcel.jar"/>
+	<classpathentry kind="lib" path="lib/checker-qual.jar"/>
+	<classpathentry kind="lib" path="lib/commons-io.jar"/>
+	<classpathentry kind="lib" path="lib/error_prone_annotations.jar"/>
+	<classpathentry kind="lib" path="lib/failureaccess.jar"/>
+	<classpathentry kind="lib" path="lib/guava.jar"/>
+	<classpathentry kind="lib" path="lib/icu4j.jar"/>
+	<classpathentry kind="lib" path="lib/j2objc-annotations.jar"/>
+	<classpathentry kind="lib" path="lib/javassist.jar"/>
+	<classpathentry kind="lib" path="lib/JavaTXcompiler.jar"/>
+	<classpathentry kind="lib" path="lib/javax.json.jar"/>
+	<classpathentry kind="lib" path="lib/jsr305.jar"/>
+	<classpathentry kind="lib" path="lib/listenablefuture.jar"/>
+	<classpathentry kind="lib" path="lib/org.abego.treelayout.core.jar"/>
+	<classpathentry kind="lib" path="lib/reflections.jar"/>
+	<classpathentry kind="lib" path="lib/ST4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
index 2a2fc38..59d0a4c 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
@@ -6,18 +6,55 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: de.dhbwstuttgart
 Bundle-Activator: typinferenzplugin.Activator
 Require-Bundle: org.eclipse.ui,
+ javax.inject,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
+ org.eclipse.jdt.ui,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench,
  org.eclipse.core.resources,
+ org.eclipse.swt,
+ org.eclipse.osgi,
+ org.eclipse.jface,
+ org.eclipse.e4.ui.services,
+ org.eclipse.e4.ui.workbench,
+ org.eclipse.e4.ui.di,
+ org.eclipse.e4.core.di.annotations,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.equinox.p2.operations,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.ds,
+ org.eclipse.equinox.event,
+ org.eclipse.equinox.p2.repository;bundle-version="2.3.200",
+ org.eclipse.equinox.p2.metadata;bundle-version="2.3.100",
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
- org.eclipse.equinox.ds; visibility:=reexport,
- de.dhbwstuttgart.JavaCompilerCoreOsgi
+ org.eclipse.equinox.ds; visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
- bin
-Provide-Capability: osgi.ee;osgi.ee="JavaSE";version:List="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8"
+ lib/animal-sniffer-annotations.jar,
+ lib/antlr4.jar,
+ lib/antlr4-runtime.jar,
+ lib/antlr-runtime.jar,
+ lib/asm.jar,
+ lib/bcel.jar,
+ lib/checker-qual.jar,
+ lib/commons-io.jar,
+ lib/error_prone_annotations.jar,
+ lib/failureaccess.jar,
+ lib/guava.jar,
+ lib/icu4j.jar,
+ lib/j2objc-annotations.jar,
+ lib/javassist.jar,
+ lib/JavaTXcompiler.jar,
+ lib/javax.json.jar,
+ lib/jsr305.jar,
+ lib/listenablefuture.jar,
+ lib/org.abego.treelayout.core.jar,
+ lib/reflections.jar,
+ lib/ST4.jar,
+ bin,
+ typinferenzplugin
+Import-Package: javax.annotation;version="1.2.0"
 Automatic-Module-Name: TypinferenzPlugin
diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
index db1d5c7..20449d1 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/build.properties
@@ -4,6 +4,7 @@ bin.includes = plugin.xml,\
                icons/,\
                src/,\
                bin/,\
-               build.properties
+               build.properties,\
+               lib/
 src.includes = src/
 
diff --git a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
index 92e34a7..d498041 100644
--- a/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
+++ b/JavaCompilerPlugin/features/JavaCompilerPlugin.Feature/feature.xml
@@ -16,13 +16,6 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
-         id="de.dhbwstuttgart.JavaCompilerCoreOsgi"
-         download-size="0"
-         install-size="0"
-         version="0.1.0"
-         unpack="false"/>
-
    <plugin
          id="TypinferenzPlugin"
          download-size="0"