diff --git a/core/pom.xml b/core/pom.xml
index 49b0697..7c1c93b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,7 +41,6 @@
 		<module>plugins/org.eclipse.dltk.validators.externalchecker</module>
 		<module>plugins/org.eclipse.dltk.validators.ui</module>
 		<module>update.site</module>
-		<module>tests/org.eclipse.dltk.core.tests</module>
-		<module>tests/org.eclipse.dltk.formatter.tests</module>
+		<module>tests</module>
 	</modules>
 </project>
diff --git a/core/tests/org.eclipse.dltk.core.tests/pom.xml b/core/tests/org.eclipse.dltk.core.tests/pom.xml
index 56faf15..c0230cc 100644
--- a/core/tests/org.eclipse.dltk.core.tests/pom.xml
+++ b/core/tests/org.eclipse.dltk.core.tests/pom.xml
@@ -3,10 +3,10 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>core</artifactId>
+    <artifactId>core.tests</artifactId>
     <groupId>org.eclipse.dltk.core</groupId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../</relativePath>
   </parent>
   <groupId>org.eclipse.dltk.core</groupId>
   <artifactId>org.eclipse.dltk.core.tests</artifactId>
diff --git a/core/tests/org.eclipse.dltk.core.tests/src/org/eclipse/dltk/core/tests/AllTests.java b/core/tests/org.eclipse.dltk.core.tests/src/org/eclipse/dltk/core/tests/AllTests.java
index 811f68c..0f1afe0 100644
--- a/core/tests/org.eclipse.dltk.core.tests/src/org/eclipse/dltk/core/tests/AllTests.java
+++ b/core/tests/org.eclipse.dltk.core.tests/src/org/eclipse/dltk/core/tests/AllTests.java
@@ -12,18 +12,22 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.dltk.core.tests.builder.BuildParticipantManagerTests;
 import org.eclipse.dltk.core.tests.buildpath.BuildpathTests;
+import org.eclipse.dltk.core.tests.cache.CacheTests;
 import org.eclipse.dltk.core.tests.compiler.CompilerCharOperationTests;
 import org.eclipse.dltk.core.tests.compiler.CompilerUtilTests;
 import org.eclipse.dltk.core.tests.ddp.CoreDDPTests;
 import org.eclipse.dltk.core.tests.launching.EnvironmentResolverTests;
 import org.eclipse.dltk.core.tests.launching.InterpreterConfigTests;
+import org.eclipse.dltk.core.tests.launching.ScriptLaunchingTests;
 import org.eclipse.dltk.core.tests.mixin.MixinIndexTests;
 import org.eclipse.dltk.core.tests.mixin.MixinModelTests;
 import org.eclipse.dltk.core.tests.model.BufferTests;
 import org.eclipse.dltk.core.tests.model.ModelMembersTests;
 import org.eclipse.dltk.core.tests.model.NamespaceTests;
 import org.eclipse.dltk.core.tests.model.WorkingCopyTests;
+import org.eclipse.dltk.core.tests.parser.SourceParserTests;
 import org.eclipse.dltk.core.tests.util.CharacterStackTests;
 import org.eclipse.dltk.core.tests.utils.CharOperationTests;
 import org.eclipse.dltk.core.tests.utils.InternalCoreUtilTest;
@@ -34,27 +38,34 @@
 	public static Test suite() {
 		TestSuite suite = new TestSuite("org.eclipse.dltk.core.tests.model");
 		// $JUnit-BEGIN$
+		suite.addTest(new TestSuite(BuildParticipantManagerTests.class));
+		suite.addTest(BuildpathTests.suite());
+
+		suite.addTest(new TestSuite(CacheTests.class));
+
 		suite.addTest(new TestSuite(CompilerUtilTests.class));
 		suite.addTest(new TestSuite(CompilerCharOperationTests.class));
-		suite.addTest(new TestSuite(InternalCoreUtilTest.class));
-		suite.addTest(new TestSuite(MixinIndexTests.class));
-		suite.addTest(new TestSuite(MixinModelTests.class));
-		suite.addTest(BuildpathTests.suite());
 
 		suite.addTest(CoreDDPTests.suite());
 
-		suite.addTestSuite(NamespaceTests.class);
-		suite.addTest(BufferTests.suite());
-		suite.addTest(ModelMembersTests.suite());
-		suite.addTest(WorkingCopyTests.suite());
-
+		suite.addTest(EnvironmentResolverTests.suite());
 		suite.addTest(InterpreterConfigTests.suite());
 
-		suite.addTest(EnvironmentResolverTests.suite());
+		suite.addTest(new TestSuite(MixinIndexTests.class));
+		suite.addTest(new TestSuite(MixinModelTests.class));
 
-		suite.addTest(TextUtilsTest.suite());
-		suite.addTest(CharOperationTests.suite());
+		suite.addTest(BufferTests.suite());
+		suite.addTest(ModelMembersTests.suite());
+		suite.addTestSuite(NamespaceTests.class);
+		suite.addTest(WorkingCopyTests.suite());
+
+		suite.addTest(new TestSuite(SourceParserTests.class));
+
 		suite.addTestSuite(CharacterStackTests.class);
+
+		suite.addTest(CharOperationTests.suite());
+		suite.addTest(new TestSuite(InternalCoreUtilTest.class));
+		suite.addTest(TextUtilsTest.suite());
 		// $JUnit-END$
 		return suite;
 	}
diff --git a/core/tests/org.eclipse.dltk.debug.tests/pom.xml b/core/tests/org.eclipse.dltk.debug.tests/pom.xml
new file mode 100644
index 0000000..ead5523
--- /dev/null
+++ b/core/tests/org.eclipse.dltk.debug.tests/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>core.tests</artifactId>
+    <groupId>org.eclipse.dltk.core</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.dltk.core</groupId>
+  <artifactId>org.eclipse.dltk.core.debug.tests</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <build>
+	  <plugins>
+		  <plugin>
+			  <groupId>org.eclipse.tycho</groupId>
+			  <artifactId>tycho-surefire-plugin</artifactId>
+			  <version>${tycho-version}</version>
+			  <configuration>
+				  <testSuite>org.eclipse.dltk.debug.tests</testSuite>
+				  <testClass>org.eclipse.dltk.debug.tests.AllTests</testClass>
+				  <dependencies>
+					  <dependency>
+						  <type>p2-installable-unit</type>
+						  <artifactId>org.eclipse.platform.feature.group</artifactId>
+					  </dependency>
+				  </dependencies>
+			  </configuration>
+		  </plugin>
+	  </plugins>
+  </build>
+</project>
diff --git a/core/tests/org.eclipse.dltk.formatter.tests/pom.xml b/core/tests/org.eclipse.dltk.formatter.tests/pom.xml
index 0182372..cb73531 100644
--- a/core/tests/org.eclipse.dltk.formatter.tests/pom.xml
+++ b/core/tests/org.eclipse.dltk.formatter.tests/pom.xml
@@ -2,11 +2,10 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>core</artifactId>
+    <parent>
+    <artifactId>core.tests</artifactId>
     <groupId>org.eclipse.dltk.core</groupId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
   </parent>
   <groupId>org.eclipse.dltk.core</groupId>
   <artifactId>org.eclipse.dltk.formatter.tests</artifactId>
diff --git a/core/tests/org.eclipse.dltk.ui.tests/pom.xml b/core/tests/org.eclipse.dltk.ui.tests/pom.xml
new file mode 100644
index 0000000..119f22c
--- /dev/null
+++ b/core/tests/org.eclipse.dltk.ui.tests/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>core</artifactId>
+    <groupId>org.eclipse.dltk.core</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.core</groupId>
+  <artifactId>org.eclipse.dltk.ui.tests</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <build>
+	  <plugins>
+		  <plugin>
+			  <groupId>org.eclipse.tycho</groupId>
+			  <artifactId>tycho-surefire-plugin</artifactId>
+			  <version>${tycho-version}</version>
+			  <configuration>
+				  <testSuite>org.eclipse.dltk.ui.tests</testSuite>
+				  <testClass>org.eclipse.dltk.ui.tests.AllTests</testClass>
+				  <useUIHarness>true</useUIHarness>
+				  <dependencies>
+					  <dependency>
+						  <type>p2-installable-unit</type>
+						  <artifactId>org.eclipse.platform.feature.group</artifactId>
+					  </dependency>
+				  </dependencies>
+			  </configuration>
+		  </plugin>
+	  </plugins>
+  </build>
+</project>
diff --git a/core/tests/org.eclipse.dltk.ui.tests/src/org/eclipse/dltk/ui/tests/refactoring/ModelElementUtilTests.java b/core/tests/org.eclipse.dltk.ui.tests/src/org/eclipse/dltk/ui/tests/refactoring/ModelElementUtilTests.java
index e614df4..468e623 100644
--- a/core/tests/org.eclipse.dltk.ui.tests/src/org/eclipse/dltk/ui/tests/refactoring/ModelElementUtilTests.java
+++ b/core/tests/org.eclipse.dltk.ui.tests/src/org/eclipse/dltk/ui/tests/refactoring/ModelElementUtilTests.java
@@ -59,7 +59,11 @@
 			checkFolders(subfolders2, new String[] { folder2.getElementName(),
 					folder2.getElementName() + "/B",
 					folder2.getElementName() + "/C" });
-		} finally {
+		}
+		catch(Throwable e) {
+			e.printStackTrace();
+		}
+		finally {
 			deleteProject(projectName);
 		}
 	}
diff --git a/core/tests/org.eclipse.dltk.ui.tests/workspace/subpackages/.project b/core/tests/org.eclipse.dltk.ui.tests/workspace/subpackages/.project
index 7bea1e2..d563b9b 100644
--- a/core/tests/org.eclipse.dltk.ui.tests/workspace/subpackages/.project
+++ b/core/tests/org.eclipse.dltk.ui.tests/workspace/subpackages/.project
@@ -5,6 +5,6 @@
 	<projects>
 	</projects>
 	<natures>
-		<nature>org.eclipse.dltk.ruby.core.nature</nature>
+		<nature>org.eclipse.dltk.core.tests.testnature</nature>
 	</natures>
 </projectDescription>
diff --git a/core/tests/org.eclipse.dltk.validators.core.tests/pom.xml b/core/tests/org.eclipse.dltk.validators.core.tests/pom.xml
new file mode 100644
index 0000000..689351a
--- /dev/null
+++ b/core/tests/org.eclipse.dltk.validators.core.tests/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>core</artifactId>
+    <groupId>org.eclipse.dltk.core</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.core</groupId>
+  <artifactId>org.eclipse.dltk.validators.core.tests</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+  <build>
+	  <plugins>
+		  <plugin>
+			  <groupId>org.eclipse.tycho</groupId>
+			  <artifactId>tycho-surefire-plugin</artifactId>
+			  <version>${tycho-version}</version>
+			  <configuration>
+				  <testSuite>org.eclipse.dltk.validators.core.tests</testSuite>
+				  <testClass>org.eclipse.dltk.validators.core.tests.AllTests</testClass>
+				  <dependencies>
+					  <dependency>
+						  <type>p2-installable-unit</type>
+						  <artifactId>org.eclipse.platform.feature.group</artifactId>
+					  </dependency>
+				  </dependencies>
+			  </configuration>
+		  </plugin>
+	  </plugins>
+  </build>
+</project>
diff --git a/core/tests/pom.xml b/core/tests/pom.xml
new file mode 100644
index 0000000..67363a0
--- /dev/null
+++ b/core/tests/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>core</artifactId>
+		<groupId>org.eclipse.dltk.core</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.dltk.core</groupId>
+	<artifactId>core.tests</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>org.eclipse.dltk.core.tests</module>
+		<module>org.eclipse.dltk.debug.tests</module>
+		<module>org.eclipse.dltk.formatter.tests</module>
+		<module>org.eclipse.dltk.validators.core.tests</module>
+		<module>org.eclipse.dltk.ui.tests</module>
+	</modules>
+</project>
diff --git a/core/update.site/assembly.xml b/core/update.site/assembly.xml
new file mode 100644
index 0000000..0f9b757
--- /dev/null
+++ b/core/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>core</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/core/update.site/pom.xml b/core/update.site/pom.xml
index e4f88e0..4d3082a 100644
--- a/core/update.site/pom.xml
+++ b/core/update.site/pom.xml
@@ -12,4 +12,28 @@
 	<artifactId>org.eclipse.dltk.core-updatesite</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
index c2b4d3e..bcc3679 100644
--- a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
+++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
@@ -38,8 +38,8 @@
 
    <requires>
       <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="4.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn_feature" version="4.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn.context_feature" version="3.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn_feature" version="3.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
new file mode 100644
index 0000000..8bc4289
--- /dev/null
+++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>mylyn</artifactId>
+    <groupId>org.eclipse.dltk.mylyn</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.mylyn</groupId>
+  <artifactId>org.eclipse.dltk.mylyn-feature</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml b/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
index 87e0bd1..813ef2e 100644
--- a/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
+++ b/mylyn/features/org.eclipse.dltk.mylyn.sdk/feature.xml
@@ -13,13 +13,12 @@
    <license url="%licenseURL">
       %license
    </license>
-
-   <includes
-         id="org.eclipse.dltk.mylyn"
-         version="0.0.0"/>
-
-   <includes
+   
+   <plugin
          id="org.eclipse.dltk.mylyn.source"
-         version="0.0.0"/>
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
new file mode 100644
index 0000000..55e9539
--- /dev/null
+++ b/mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>mylyn</artifactId>
+    <groupId>org.eclipse.dltk.mylyn</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.mylyn</groupId>
+  <artifactId>org.eclipse.dltk.mylyn.sdk</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
index 826a17a..405a17b 100644
--- a/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
+++ b/mylyn/plugins/org.eclipse.dltk.mylyn/META-INF/MANIFEST.MF
@@ -15,15 +15,15 @@
  org.eclipse.ui.forms,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench.texteditor,
- org.eclipse.mylyn.context.core;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.context.ui;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.commons.core;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.commons.ui;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.ui;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.resources.ui;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.monitor.core;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.tasks.ui;bundle-version="[4.0.0,4.0.0)",
- org.eclipse.mylyn.ide.ui;bundle-version="[4.0.0,4.0.0)",
+ org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.resources.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.mylyn.ide.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.ui;bundle-version="4.0.0",
  org.eclipse.dltk.launching;bundle-version="4.0.0",
diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/pom.xml b/mylyn/plugins/org.eclipse.dltk.mylyn/pom.xml
new file mode 100644
index 0000000..6e38b1a
--- /dev/null
+++ b/mylyn/plugins/org.eclipse.dltk.mylyn/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>mylyn</artifactId>
+    <groupId>org.eclipse.dltk.mylyn</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.mylyn</groupId>
+  <artifactId>org.eclipse.dltk.mylyn</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/mylyn/pom.xml b/mylyn/pom.xml
new file mode 100644
index 0000000..95d81a5
--- /dev/null
+++ b/mylyn/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.eclipse.dltk.mylyn</groupId>
+	<artifactId>mylyn</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<parent>
+		<artifactId>dltk</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../build/pom.xml</relativePath>
+		<groupId>org.eclipse.dltk</groupId>
+	</parent>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>features/org.eclipse.dltk.mylyn-feature</module>
+		<module>features/org.eclipse.dltk.mylyn.sdk</module>
+		<module>plugins/org.eclipse.dltk.mylyn</module>
+		<module>update.site</module>
+	</modules>
+</project>
diff --git a/mylyn/update.site/.cvsignore b/mylyn/update.site/.cvsignore
new file mode 100644
index 0000000..d567ba0
--- /dev/null
+++ b/mylyn/update.site/.cvsignore
@@ -0,0 +1,2 @@
+bin
+target
diff --git a/mylyn/update.site/assembly.xml b/mylyn/update.site/assembly.xml
new file mode 100644
index 0000000..6614323
--- /dev/null
+++ b/mylyn/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>mylyn</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/mylyn/update.site/pom.xml b/mylyn/update.site/pom.xml
new file mode 100644
index 0000000..964ad56
--- /dev/null
+++ b/mylyn/update.site/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>mylyn</artifactId>
+		<groupId>org.eclipse.dltk.mylyn</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.dltk.mylyn</groupId>
+	<artifactId>org.eclipse.dltk.mylyn-updatesite</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/mylyn/update.site/site.xml b/mylyn/update.site/site.xml
new file mode 100644
index 0000000..9d5d407
--- /dev/null
+++ b/mylyn/update.site/site.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.dltk.mylyn_4.0.0.qualifier.jar" id="org.eclipse.dltk.mylyn" version="4.0.0.qualifier"/>
+   <feature url="features/org.eclipse.dltk.mylyn.sdk_4.0.0.qualifier.jar" id="org.eclipse.dltk.mylyn.sdk" version="4.0.0.qualifier"/>
+</site>
diff --git a/rse/features/org.eclipse.dltk.rse-feature/feature.xml b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
index b5028bf..caa2d9c 100644
--- a/rse/features/org.eclipse.dltk.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.dltk.rse-feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.dltk.rse"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -38,7 +38,7 @@
 
    <requires>
       <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
-      <import feature="org.eclipse.rse.core" version="4.0.0" match="compatible"/>
+      <import feature="org.eclipse.rse.core" version="3.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/rse/features/org.eclipse.dltk.rse-feature/pom.xml b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
new file mode 100644
index 0000000..477724e
--- /dev/null
+++ b/rse/features/org.eclipse.dltk.rse-feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rse</artifactId>
+    <groupId>org.eclipse.dltk.rse</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.rse</groupId>
+  <artifactId>org.eclipse.dltk.rse-feature</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/rse/features/org.eclipse.dltk.rse.sdk/feature.xml b/rse/features/org.eclipse.dltk.rse.sdk/feature.xml
index 11b03cf..d82e9c4 100644
--- a/rse/features/org.eclipse.dltk.rse.sdk/feature.xml
+++ b/rse/features/org.eclipse.dltk.rse.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.rse.sdk"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -14,12 +14,25 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.dltk.rse"
-         version="0.0.0"/>
+  <plugin
+         id="org.eclipse.dltk.rse.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.eclipse.dltk.rse.source"
-         version="0.0.0"/>
+   <plugin
+         id="org.eclipse.dltk.rse.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.ssh.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/rse/features/org.eclipse.dltk.rse.sdk/pom.xml b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
new file mode 100644
index 0000000..c137f53
--- /dev/null
+++ b/rse/features/org.eclipse.dltk.rse.sdk/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rse</artifactId>
+    <groupId>org.eclipse.dltk.rse</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.rse</groupId>
+  <artifactId>org.eclipse.dltk.rse.sdk</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
index 7037aad..8eca9ac 100644
--- a/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.rse.core;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.core.internal.rse.DLTKRSEPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -13,11 +13,11 @@
  org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.launching;bundle-version="4.0.0",
  org.eclipse.dltk.ssh.core;bundle-version="1.0.0",
- org.eclipse.rse.core;bundle-version="4.0.0",
- org.eclipse.rse.subsystems.files.core;bundle-version="4.0.0",
- org.eclipse.rse.subsystems.shells.core;bundle-version="4.0.0",
+ org.eclipse.rse.core,
+ org.eclipse.rse.subsystems.files.core,
+ org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.efs,
- org.eclipse.rse.services;bundle-version="4.0.0",
+ org.eclipse.rse.services,
  org.eclipse.rse.connectorservice.ssh;resolution:=optional,
  org.eclipse.rse.services.ssh;bundle-version="4.0.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/rse/plugins/org.eclipse.dltk.rse.core/pom.xml b/rse/plugins/org.eclipse.dltk.rse.core/pom.xml
new file mode 100644
index 0000000..261ac02
--- /dev/null
+++ b/rse/plugins/org.eclipse.dltk.rse.core/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rse</artifactId>
+    <groupId>org.eclipse.dltk.rse</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.rse</groupId>
+  <artifactId>org.eclipse.dltk.rse.core</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
index d6107bd..6a6f70a 100644
--- a/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.rse.ui/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.rse.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.internal.ui.rse.DLTKRSEUI
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.dltk.rse.core;bundle-version="2.0.0",
+ org.eclipse.dltk.rse.core;bundle-version="4.0.0",
  org.eclipse.dltk.core;bundle-version="4.0.0",
  org.eclipse.dltk.ui;bundle-version="4.0.0",
  org.eclipse.rse.ui,
diff --git a/rse/plugins/org.eclipse.dltk.rse.ui/pom.xml b/rse/plugins/org.eclipse.dltk.rse.ui/pom.xml
new file mode 100644
index 0000000..284adb2
--- /dev/null
+++ b/rse/plugins/org.eclipse.dltk.rse.ui/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rse</artifactId>
+    <groupId>org.eclipse.dltk.rse</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.rse</groupId>
+  <artifactId>org.eclipse.dltk.rse.ui</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/rse/plugins/org.eclipse.dltk.rse/pom.xml b/rse/plugins/org.eclipse.dltk.rse/pom.xml
new file mode 100644
index 0000000..66e2227
--- /dev/null
+++ b/rse/plugins/org.eclipse.dltk.rse/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>rse</artifactId>
+		<groupId>org.eclipse.dltk.rse</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+	<groupId>org.eclipse.dltk.rse</groupId>
+	<artifactId>org.eclipse.dltk.rse</artifactId>
+	<version>4.0.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version> 
+				<configuration>
+					<usePdeSourceRoots>false</usePdeSourceRoots>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
index be82993..da00bc8 100644
--- a/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dltk.ssh.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dltk.ssh.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.eclipse.dltk.ssh.internal.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/rse/plugins/org.eclipse.dltk.ssh.core/pom.xml b/rse/plugins/org.eclipse.dltk.ssh.core/pom.xml
new file mode 100644
index 0000000..c846adc
--- /dev/null
+++ b/rse/plugins/org.eclipse.dltk.ssh.core/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>rse</artifactId>
+    <groupId>org.eclipse.dltk.rse</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.rse</groupId>
+  <artifactId>org.eclipse.dltk.ssh.core</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/rse/pom.xml b/rse/pom.xml
new file mode 100644
index 0000000..21c57c8
--- /dev/null
+++ b/rse/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.eclipse.dltk.rse</groupId>
+	<artifactId>rse</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<parent>
+		<artifactId>dltk</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../build/pom.xml</relativePath>
+		<groupId>org.eclipse.dltk</groupId>
+	</parent>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>features/org.eclipse.dltk.rse-feature</module>
+		<module>features/org.eclipse.dltk.rse.sdk</module>
+		<module>plugins/org.eclipse.dltk.rse</module>
+		<module>plugins/org.eclipse.dltk.rse.core</module>
+		<module>plugins/org.eclipse.dltk.rse.ui</module>
+		<module>plugins/org.eclipse.dltk.ssh.core</module>
+		<module>update.site</module>
+	</modules>
+</project>
diff --git a/rse/update.site/.cvsignore b/rse/update.site/.cvsignore
new file mode 100644
index 0000000..d567ba0
--- /dev/null
+++ b/rse/update.site/.cvsignore
@@ -0,0 +1,2 @@
+bin
+target
diff --git a/rse/update.site/assembly.xml b/rse/update.site/assembly.xml
new file mode 100644
index 0000000..66119c7
--- /dev/null
+++ b/rse/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>rse</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/site</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/rse/update.site/pom.xml b/rse/update.site/pom.xml
new file mode 100644
index 0000000..78bdc3a
--- /dev/null
+++ b/rse/update.site/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>rse</artifactId>
+		<groupId>org.eclipse.dltk.rse</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.dltk.rse</groupId>
+	<artifactId>org.eclipse.dltk.rse-updatesite</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-update-site</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+					<finalName>dltk</finalName>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/rse/update.site/site.xml b/rse/update.site/site.xml
new file mode 100644
index 0000000..6a57e57
--- /dev/null
+++ b/rse/update.site/site.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.dltk.rse_4.0.0.qualifier.jar" id="org.eclipse.dltk.rse" version="4.0.0.qualifier"/>
+   <feature url="features/org.eclipse.dltk.rse.sdk_4.0.0.qualifier.jar" id="org.eclipse.dltk.rse.sdk" version="4.0.0.qualifier"/>
+</site>