diff --git a/teavm-eclipse/teavm-eclipse-repository/.gitignore b/teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
similarity index 100%
rename from teavm-eclipse/teavm-eclipse-repository/.gitignore
rename to teavm-eclipse/teavm-eclipse-core-plugin/.gitignore
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml b/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml
new file mode 100644
index 000000000..6d11246a2
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml
@@ -0,0 +1,100 @@
+<!--
+    Copyright 2014 Alexey Andreev.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.teavm</groupId>
+    <artifactId>teavm</artifactId>
+    <version>0.2-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <artifactId>teavm-eclipse-core-deps</artifactId>
+  <packaging>pom</packaging>
+
+  <name>TeaVM dependencies for Eclipse plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.interceptor</groupId>
+      <artifactId>javax.interceptor-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>javax.transaction-api</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.aries.spifly</groupId>
+      <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>javax-websocket-server-impl</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-classlib</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.teavm</groupId>
+      <artifactId>teavm-chrome-rdp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.9</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/lib</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
new file mode 100644
index 000000000..d0be2a3c5
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-core-plugin/pom.xml
@@ -0,0 +1,70 @@
+<!--
+    Copyright 2014 Alexey Andreev.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.teavm</groupId>
+    <artifactId>teavm</artifactId>
+    <version>0.2-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <artifactId>teavm-eclipse-repository</artifactId>
+  <version>0.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>TeaVM core packages for Eclipse</name>
+  <description>A core plugin for Eclipse that contains TeaVM itself</description>
+
+  <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.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.3.2</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>mvn</executable>
+              <arguments>
+                <item>-f</item>
+                <item>dep-pom.xml</item>
+              </arguments>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/teavm-eclipse/teavm-eclipse-feature/.project b/teavm-eclipse/teavm-eclipse-feature/.project
deleted file mode 100644
index 2de74d794..000000000
--- a/teavm-eclipse/teavm-eclipse-feature/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>teavm-eclipse-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/teavm-eclipse/teavm-eclipse-feature/teavm.target b/teavm-eclipse/teavm-eclipse-feature/teavm.target
deleted file mode 100644
index 41702f571..000000000
--- a/teavm-eclipse/teavm-eclipse-feature/teavm.target
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="TeaVM" sequenceNumber="17">
-<locations>
-<location path="${eclipse_home}" type="Profile"/>
-<location path="${workspace_loc:/teavm-eclipse-repository}/target/repository" type="Directory"/>
-</locations>
-</target>
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/.classpath b/teavm-eclipse/teavm-eclipse-m2e-plugin/.classpath
deleted file mode 100644
index e493a86d4..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/main/java"/>
-	<classpathentry kind="output" path="target"/>
-</classpath>
diff --git a/teavm-eclipse/teavm-eclipse-m2e-plugin/.project b/teavm-eclipse/teavm-eclipse-m2e-plugin/.project
deleted file mode 100644
index 778192415..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>teavm-eclipse-m2e-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/teavm-eclipse-m2e-plugin/.settings/org.eclipse.jdt.core.prefs b/teavm-eclipse/teavm-eclipse-m2e-plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363a..000000000
--- a/teavm-eclipse/teavm-eclipse-m2e-plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/teavm-eclipse-m2e-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
new file mode 100644
index 000000000..b455b84a1
--- /dev/null
+++ b/teavm-eclipse/teavm-eclipse-m2e-plugin/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2014 Alexey Andreev.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.teavm</groupId>
+    <artifactId>teavm-eclipse</artifactId>
+    <version>0.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>teavm-eclipse-m2e-plugin</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <version>0.2.0-SNAPSHOT</version>
+
+  <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>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.classpath b/teavm-eclipse/teavm-eclipse-plugin/.classpath
deleted file mode 100644
index 98ddc48ed..000000000
--- a/teavm-eclipse/teavm-eclipse-plugin/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/main/java/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.project b/teavm-eclipse/teavm-eclipse-plugin/.project
deleted file mode 100644
index 71be2fe7a..000000000
--- a/teavm-eclipse/teavm-eclipse-plugin/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/teavm-eclipse/teavm-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs b/teavm-eclipse/teavm-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f42de363a..000000000
--- a/teavm-eclipse/teavm-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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/teavm-eclipse-plugin/.settings/org.eclipse.jdt.ui.prefs b/teavm-eclipse/teavm-eclipse-plugin/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6592633f4..000000000
--- a/teavm-eclipse/teavm-eclipse-plugin/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.ondemandthreshold=90
-org.eclipse.jdt.ui.staticondemandthreshold=3
diff --git a/teavm-eclipse/teavm-eclipse-plugin/pom.xml b/teavm-eclipse/teavm-eclipse-plugin/pom.xml
index bf7ed72df..1dba381ba 100644
--- a/teavm-eclipse/teavm-eclipse-plugin/pom.xml
+++ b/teavm-eclipse/teavm-eclipse-plugin/pom.xml
@@ -24,16 +24,8 @@
     <version>0.2-SNAPSHOT</version>
   </parent>
   <artifactId>teavm-eclipse-plugin</artifactId>
-  <packaging>eclipse-plugin</packaging>
   <version>0.2.0-SNAPSHOT</version>
-
-  <repositories>
-    <repository>
-      <id>teavm</id>
-      <url>${project.baseUri}../teavm-eclipse-repository/target/repository</url>
-      <layout>p2</layout>
-    </repository>
-  </repositories>
+  <packaging>eclipse-plugin</packaging>
 
   <build>
     <pluginManagement>
diff --git a/teavm-eclipse/teavm-eclipse-repository/pom.xml b/teavm-eclipse/teavm-eclipse-repository/pom.xml
deleted file mode 100644
index 99035e5f8..000000000
--- a/teavm-eclipse/teavm-eclipse-repository/pom.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-    Copyright 2014 Alexey Andreev.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.teavm</groupId>
-    <artifactId>teavm</artifactId>
-    <version>0.2-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <artifactId>teavm-eclipse-repository</artifactId>
-  <packaging>pom</packaging>
-
-  <name>TeaVM thirdparty repository for Eclipse</name>
-  <description>A p2 repository for Eclipse that contains TeaVM core together with all required
-      dependencies</description>
-
-  <build>
-    <pluginManagement>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.reficio</groupId>
-        <artifactId>p2-maven-plugin</artifactId>
-        <version>1.1.0</version>
-        <executions>
-          <execution>
-            <id>make-p2</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>site</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <id>javax.interceptor:javax.interceptor-api:1.2</id>
-                </artifact>
-                <artifact>
-                  <id>javax.enterprise:cdi-api:1.2</id>
-                </artifact>
-                <artifact>
-                  <id>javax.transaction:javax.transaction-api:1.2</id>
-                </artifact>
-                <artifact>
-                  <id>org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.0.1</id>
-                </artifact>
-                <artifact>
-                  <id>org.teavm:teavm-core:${project.version}</id>
-                </artifact>
-                <artifact>
-                  <id>org.teavm:teavm-classlib:${project.version}</id>
-                </artifact>
-                <artifact>
-                  <id>org.teavm:teavm-chrome-rdp:${project.version}</id>
-                </artifact>
-                <artifact>
-                  <id>org.eclipse.jetty.websocket:javax-websocket-server-impl:${jetty.version}</id>
-                </artifact>
-                <artifact>
-                  <id>ch.qos.logback:logback-classic:1.1.2</id>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
diff --git a/teavm-eclipse/teavm-eclipse-updatesite/.project b/teavm-eclipse/teavm-eclipse-updatesite/.project
deleted file mode 100644
index a6fb38251..000000000
--- a/teavm-eclipse/teavm-eclipse-updatesite/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>