diff --git a/teavm-eclipse-feature/build.properties b/teavm-eclipse-feature/build.properties
new file mode 100644
index 000000000..64f93a9f0
--- /dev/null
+++ b/teavm-eclipse-feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/teavm-eclipse-feature/feature.xml b/teavm-eclipse-feature/feature.xml
new file mode 100644
index 000000000..5e6015dfd
--- /dev/null
+++ b/teavm-eclipse-feature/feature.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="teavm.eclipse.feature"
+      label="TeaVM Eclipse support"
+      version="0.2.0.qualifier"
+      provider-name="Alexey Andreev &lt;konsoletyper@gmail.com&gt;"
+      os="aix,hpux,linux,macosx,qnx,solaris,win32"
+      ws="carbon,cocoa,gtk,motif,photon,win32,wpf"
+      arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <plugin
+         id="teavm-eclipse-plugin"
+         os="aix,hpux,linux,macosx,qnx,solaris,win32"
+         ws="carbon,cocoa,gtk,motif,photon,win32,wpf"
+         arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/teavm-eclipse-plugin/.classpath b/teavm-eclipse-plugin/.classpath
new file mode 100644
index 000000000..4a2005457
--- /dev/null
+++ b/teavm-eclipse-plugin/.classpath
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/asm-5.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-commons-5.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-debug-all-4.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-tree-5.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.9.13.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax-websocket-client-impl-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax-websocket-server-impl-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax.annotation-api-1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax.websocket-api-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-annotations-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-http-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-io-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-jndi-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-plus-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-security-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-server-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-servlet-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-util-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-webapp-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jetty-xml-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/logback-classic-1.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/logback-core-1.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/teavm-core-0.2-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-api-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-client-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-common-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-server-9.2.1.v20140609.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/websocket-servlet-9.2.1.v20140609.jar"/>
+	<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/main/java"/>
+	<classpathentry kind="output" path="target"/>
+</classpath>
diff --git a/teavm-eclipse-plugin/.gitignore b/teavm-eclipse-plugin/.gitignore
index d3f7a8a94..61b2b4207 100644
--- a/teavm-eclipse-plugin/.gitignore
+++ b/teavm-eclipse-plugin/.gitignore
@@ -1,5 +1,2 @@
-/.settings
 /lib
-/target
-/.classpath
-/.project
+/target
\ No newline at end of file
diff --git a/teavm-eclipse-plugin/.project b/teavm-eclipse-plugin/.project
new file mode 100644
index 000000000..f240a85f5
--- /dev/null
+++ b/teavm-eclipse-plugin/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>teavm-eclipse-plugin</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/teavm-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs b/teavm-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f42de363a
--- /dev/null
+++ b/teavm-eclipse-plugin/.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/teavm-eclipse-plugin/META-INF/MANIFEST.MF b/teavm-eclipse-plugin/META-INF/MANIFEST.MF
index 11ce4a80d..319289525 100644
--- a/teavm-eclipse-plugin/META-INF/MANIFEST.MF
+++ b/teavm-eclipse-plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TeaVM plugin for Eclipse
 Bundle-SymbolicName: teavm-eclipse-plugin;singleton:=true
-Bundle-Version: 0.2.0.SNAPSHOT
+Bundle-Version: 0.2.0.qualifer
 Bundle-Vendor: Alexey Andreev <konsoletyper@gmail.com>
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
@@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.ui.editors;bundle-version="3.8.100",
  org.eclipse.ui.ide;bundle-version="3.9.0",
  org.eclipse.jdt.ui;bundle-version="3.9.2"
-Bundle-ClassPath: lib/asm-5.0.1.jar,
+Bundle-ClassPath: .,
+ lib/asm-5.0.1.jar,
  lib/asm-commons-5.0.1.jar,
  lib/asm-debug-all-4.2.jar,
  lib/asm-tree-5.0.1.jar,
@@ -40,6 +41,8 @@ Bundle-ClassPath: lib/asm-5.0.1.jar,
  lib/jetty-util-9.2.1.v20140609.jar,
  lib/jetty-webapp-9.2.1.v20140609.jar,
  lib/jetty-xml-9.2.1.v20140609.jar,
+ lib/logback-classic-1.1.2.jar,
+ lib/logback-core-1.1.2.jar,
  lib/slf4j-api-1.7.7.jar,
  lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,
  lib/teavm-core-0.2-SNAPSHOT.jar,
@@ -47,9 +50,8 @@ Bundle-ClassPath: lib/asm-5.0.1.jar,
  lib/websocket-client-9.2.1.v20140609.jar,
  lib/websocket-common-9.2.1.v20140609.jar,
  lib/websocket-server-9.2.1.v20140609.jar,
- lib/websocket-servlet-9.2.1.v20140609.jar,
- .,
- lib/logback-classic-1.1.2.jar,
- lib/logback-core-1.1.2.jar
+ lib/websocket-servlet-9.2.1.v20140609.jar
 Export-Package: org.teavm.eclipse.debugger,
  org.teavm.eclipse.debugger.ui
+Import-Package: org.teavm.chromerdp;version="0.2.0",
+ org.teavm.debugging;version="0.2.0"
diff --git a/teavm-eclipse-plugin/build.properties b/teavm-eclipse-plugin/build.properties
index b7c5afb9c..c73e6cfde 100644
--- a/teavm-eclipse-plugin/build.properties
+++ b/teavm-eclipse-plugin/build.properties
@@ -3,42 +3,73 @@ output.. = target/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               lib/asm-5.0.1.jar,\
-               lib/websocket-servlet-9.2.1.v20140609.jar,\
-               lib/websocket-server-9.2.1.v20140609.jar,\
-               lib/websocket-common-9.2.1.v20140609.jar,\
-               lib/websocket-client-9.2.1.v20140609.jar,\
-               lib/websocket-api-9.2.1.v20140609.jar,\
-               lib/teavm-core-0.2-SNAPSHOT.jar,\
-               lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,\
-               lib/slf4j-api-1.7.7.jar,\
-               lib/jetty-xml-9.2.1.v20140609.jar,\
-               lib/jetty-webapp-9.2.1.v20140609.jar,\
-               lib/jetty-util-9.2.1.v20140609.jar,\
-               lib/jetty-servlet-9.2.1.v20140609.jar,\
-               lib/jetty-server-9.2.1.v20140609.jar,\
-               lib/jetty-security-9.2.1.v20140609.jar,\
-               lib/jetty-plus-9.2.1.v20140609.jar,\
-               lib/jetty-jndi-9.2.1.v20140609.jar,\
-               lib/jetty-io-9.2.1.v20140609.jar,\
-               lib/jetty-http-9.2.1.v20140609.jar,\
-               lib/jetty-annotations-9.2.1.v20140609.jar,\
-               lib/javax.websocket-api-1.0.jar,\
-               lib/javax.servlet-api-3.1.0.jar,\
-               lib/javax.annotation-api-1.2.jar,\
-               lib/javax-websocket-server-impl-9.2.1.v20140609.jar,\
-               lib/javax-websocket-client-impl-9.2.1.v20140609.jar,\
-               lib/jackson-mapper-asl-1.9.13.jar,\
-               lib/jackson-core-asl-1.9.13.jar,\
-               lib/commons-io-2.4.jar,\
-               lib/asm-tree-5.0.1.jar,\
-               lib/asm-debug-all-4.2.jar,\
-               lib/asm-commons-5.0.1.jar,\
                logback.xml,\
+               lib/,\
+               lib/asm-5.0.1.jar,\
+               lib/asm-commons-5.0.1.jar,\
+               lib/asm-debug-all-4.2.jar,\
+               lib/asm-tree-5.0.1.jar,\
+               lib/commons-io-2.4.jar,\
+               lib/jackson-core-asl-1.9.13.jar,\
+               lib/jackson-mapper-asl-1.9.13.jar,\
+               lib/javax-websocket-client-impl-9.2.1.v20140609.jar,\
+               lib/javax-websocket-server-impl-9.2.1.v20140609.jar,\
+               lib/javax.annotation-api-1.2.jar,\
+               lib/javax.servlet-api-3.1.0.jar,\
+               lib/javax.websocket-api-1.0.jar,\
+               lib/jetty-annotations-9.2.1.v20140609.jar,\
+               lib/jetty-http-9.2.1.v20140609.jar,\
+               lib/jetty-io-9.2.1.v20140609.jar,\
+               lib/jetty-jndi-9.2.1.v20140609.jar,\
+               lib/jetty-plus-9.2.1.v20140609.jar,\
+               lib/jetty-security-9.2.1.v20140609.jar,\
+               lib/jetty-server-9.2.1.v20140609.jar,\
+               lib/jetty-servlet-9.2.1.v20140609.jar,\
+               lib/jetty-util-9.2.1.v20140609.jar,\
+               lib/jetty-webapp-9.2.1.v20140609.jar,\
+               lib/jetty-xml-9.2.1.v20140609.jar,\
+               lib/logback-classic-1.1.2.jar,\
                lib/logback-core-1.1.2.jar,\
-               lib/logback-classic-1.1.2.jar
-source.lib/teavm-core-0.2-SNAPSHOT.jar = 
-jars.compile.order = .,\
-                     lib/teavm-core-0.2-SNAPSHOT.jar,\
-                     lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar
-source.lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar = 
+               lib/slf4j-api-1.7.7.jar,\
+               lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,\
+               lib/teavm-core-0.2-SNAPSHOT.jar,\
+               lib/websocket-api-9.2.1.v20140609.jar,\
+               lib/websocket-client-9.2.1.v20140609.jar,\
+               lib/websocket-common-9.2.1.v20140609.jar,\
+               lib/websocket-server-9.2.1.v20140609.jar,\
+               lib/websocket-servlet-9.2.1.v20140609.jar
+jars.compile.order = .
+jars.extra.classpath = logback.xml,\
+                       lib/asm-5.0.1.jar,\
+                       lib/asm-commons-5.0.1.jar,\
+                       lib/asm-debug-all-4.2.jar,\
+                       lib/asm-tree-5.0.1.jar,\
+                       lib/commons-io-2.4.jar,\
+                       lib/jackson-core-asl-1.9.13.jar,\
+                       lib/jackson-mapper-asl-1.9.13.jar,\
+                       lib/javax-websocket-client-impl-9.2.1.v20140609.jar,\
+                       lib/javax-websocket-server-impl-9.2.1.v20140609.jar,\
+                       lib/javax.annotation-api-1.2.jar,\
+                       lib/javax.servlet-api-3.1.0.jar,\
+                       lib/javax.websocket-api-1.0.jar,\
+                       lib/jetty-annotations-9.2.1.v20140609.jar,\
+                       lib/jetty-http-9.2.1.v20140609.jar,\
+                       lib/jetty-io-9.2.1.v20140609.jar,\
+                       lib/jetty-jndi-9.2.1.v20140609.jar,\
+                       lib/jetty-plus-9.2.1.v20140609.jar,\
+                       lib/jetty-security-9.2.1.v20140609.jar,\
+                       lib/jetty-server-9.2.1.v20140609.jar,\
+                       lib/jetty-servlet-9.2.1.v20140609.jar,\
+                       lib/jetty-util-9.2.1.v20140609.jar,\
+                       lib/jetty-webapp-9.2.1.v20140609.jar,\
+                       lib/jetty-xml-9.2.1.v20140609.jar,\
+                       lib/logback-classic-1.1.2.jar,\
+                       lib/logback-core-1.1.2.jar,\
+                       lib/slf4j-api-1.7.7.jar,\
+                       lib/teavm-chrome-rdp-0.2-SNAPSHOT.jar,\
+                       lib/teavm-core-0.2-SNAPSHOT.jar,\
+                       lib/websocket-api-9.2.1.v20140609.jar,\
+                       lib/websocket-client-9.2.1.v20140609.jar,\
+                       lib/websocket-common-9.2.1.v20140609.jar,\
+                       lib/websocket-server-9.2.1.v20140609.jar,\
+                       lib/websocket-servlet-9.2.1.v20140609.jar
diff --git a/teavm-eclipse-plugin/pom.xml b/teavm-eclipse-plugin/pom.xml
index 303b0399b..693d3687f 100644
--- a/teavm-eclipse-plugin/pom.xml
+++ b/teavm-eclipse-plugin/pom.xml
@@ -8,8 +8,8 @@
     <artifactId>teavm</artifactId>
     <version>0.2-SNAPSHOT</version>
   </parent>
-  <artifactId>teavm-eclipse</artifactId>
-  <packaging>bundle</packaging>
+  <artifactId>teavm-eclipse-plugin</artifactId>
+  <packaging>pom</packaging>
 
   <dependencies>
     <dependency>
@@ -30,28 +30,34 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>tycho-packaging-plugin</artifactId>
+          <version>${tycho.version}</version>
+          <configuration>
+            <strictVersions>false</strictVersions>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.teavm.eclipse.*</Export-Package>
-            <Bundle-SymbolicName>teavm-eclipse</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.8</version>
-        <goals>
-          <goal>dependency:copy-dependencies</goal>
-        </goals>
-        <configuration>
-          <outputDirectory>${basedir}/lib</outputDirectory>
-        </configuration>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/lib</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/teavm-eclipse-updatesite/.project b/teavm-eclipse-updatesite/.project
new file mode 100644
index 000000000..dfe9370ed
--- /dev/null
+++ b/teavm-eclipse-updatesite/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>teavm-eclipse-updatesite</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.UpdateSiteBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.UpdateSiteNature</nature>
+	</natures>
+</projectDescription>
diff --git a/teavm-eclipse-updatesite/site.xml b/teavm-eclipse-updatesite/site.xml
new file mode 100644
index 000000000..f0df67aac
--- /dev/null
+++ b/teavm-eclipse-updatesite/site.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description name="TeaVM update site">
+      TeaVM update site
+   </description>
+   <feature url="features/teavm.eclipse.feature_0.2.0.201408031543.jar" id="teavm.eclipse.feature" version="0.2.0.201408031543" os="aix,hpux,linux,macosx,qnx,solaris,win32" ws="carbon,cocoa,gtk,motif,photon,win32,wpf" arch="ia64,ia64_32,PA_RISC,ppc,sparc,x86,x86_64">
+      <category name="teavm"/>
+   </feature>
+   <category-def name="teavm" label="TeaVM"/>
+</site>