diff --git a/features/org.eclipse.dltk.python-feature/feature.xml b/features/org.eclipse.dltk.python-feature/feature.xml
index a449a59..4953394 100644
--- a/features/org.eclipse.dltk.python-feature/feature.xml
+++ b/features/org.eclipse.dltk.python-feature/feature.xml
@@ -17,7 +17,7 @@
 <feature
       id="org.eclipse.dltk.python"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -39,7 +39,7 @@
 
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.4.0" match="compatible"/>
-      <import feature="org.eclipse.dltk.core" version="2.0.0" match="compatible"/>
+      <import feature="org.eclipse.dltk.core" version="4.0.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.dltk.python-feature/pom.xml b/features/org.eclipse.dltk.python-feature/pom.xml
new file mode 100644
index 0000000..e15fd0b
--- /dev/null
+++ b/features/org.eclipse.dltk.python-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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python-feature</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.dltk.python.sdk/feature.xml b/features/org.eclipse.dltk.python.sdk/feature.xml
index 2f0c8a4..c6fb2a2 100644
--- a/features/org.eclipse.dltk.python.sdk/feature.xml
+++ b/features/org.eclipse.dltk.python.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.dltk.python.sdk"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="4.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -14,12 +14,46 @@
       %license
    </license>
 
-   <includes
-         id="org.eclipse.dltk.python"
-         version="0.0.0"/>
+  <plugin
+         id="org.eclipse.dltk.python.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
-   <includes
-         id="org.eclipse.dltk.python.source"
-         version="0.0.0"/>
+   <plugin
+         id="org.eclipse.dltk.python.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.python.debug.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.python.debug.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.python.launching.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.dltk.python.activestatedebugger.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/features/org.eclipse.dltk.python.sdk/pom.xml b/features/org.eclipse.dltk.python.sdk/pom.xml
new file mode 100644
index 0000000..d9c28bd
--- /dev/null
+++ b/features/org.eclipse.dltk.python.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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.sdk</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.activestatedebugger/pom.xml b/plugins/org.eclipse.dltk.python.activestatedebugger/pom.xml
new file mode 100644
index 0000000..4ce9dbf
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.activestatedebugger/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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.activestatedebugger</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.core/pom.xml b/plugins/org.eclipse.dltk.python.core/pom.xml
new file mode 100644
index 0000000..8fccb33
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.core</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.debug.ui/pom.xml b/plugins/org.eclipse.dltk.python.debug.ui/pom.xml
new file mode 100644
index 0000000..d9c3f23
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.debug.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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.debug.ui</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.debug/pom.xml b/plugins/org.eclipse.dltk.python.debug/pom.xml
new file mode 100644
index 0000000..c096ff5
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.debug/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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.debug</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.launching/pom.xml b/plugins/org.eclipse.dltk.python.launching/pom.xml
new file mode 100644
index 0000000..064b73d
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.launching/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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.launching</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/plugins/org.eclipse.dltk.python.ui/pom.xml b/plugins/org.eclipse.dltk.python.ui/pom.xml
new file mode 100644
index 0000000..4e5589e
--- /dev/null
+++ b/plugins/org.eclipse.dltk.python.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>python</artifactId>
+    <groupId>org.eclipse.dltk.python</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <groupId>org.eclipse.dltk.python</groupId>
+  <artifactId>org.eclipse.dltk.python.ui</artifactId>
+  <version>4.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..856d48e
--- /dev/null
+++ b/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>
+	<groupId>org.eclipse.dltk.python</groupId>
+	<artifactId>python</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.python-feature</module>
+		<module>features/org.eclipse.dltk.python.sdk</module>
+		<module>plugins/org.eclipse.dltk.python.activestatedebugger</module>
+		<module>plugins/org.eclipse.dltk.python.core</module>
+		<module>plugins/org.eclipse.dltk.python.debug</module>
+		<module>plugins/org.eclipse.dltk.python.debug.ui</module>
+		<module>plugins/org.eclipse.dltk.python.launching</module>
+		<module>plugins/org.eclipse.dltk.python.ui</module>
+		<module>update.site</module>
+	</modules>
+</project>
diff --git a/update.site/.cvsignore b/update.site/.cvsignore
new file mode 100644
index 0000000..d567ba0
--- /dev/null
+++ b/update.site/.cvsignore
@@ -0,0 +1,2 @@
+bin
+target
diff --git a/update.site/assembly.xml b/update.site/assembly.xml
new file mode 100644
index 0000000..80c0bea
--- /dev/null
+++ b/update.site/assembly.xml
@@ -0,0 +1,13 @@
+<assembly>
+  <id>python</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/update.site/pom.xml b/update.site/pom.xml
new file mode 100644
index 0000000..68cf823
--- /dev/null
+++ b/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>python</artifactId>
+		<groupId>org.eclipse.dltk.python</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.eclipse.dltk.python</groupId>
+	<artifactId>org.eclipse.dltk.python-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/update.site/site.xml b/update.site/site.xml
new file mode 100644
index 0000000..1c27bf7
--- /dev/null
+++ b/update.site/site.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.dltk.python_4.0.0.qualifier.jar" id="org.eclipse.dltk.python" version="4.0.0.qualifier"/>
+   <feature url="features/org.eclipse.dltk.python.sdk_4.0.0.qualifier.jar" id="org.eclipse.dltk.python.sdk" version="4.0.0.qualifier"/>
+</site>