diff --git a/com.avaloq.tools.ddk.runtime.source.feature/.project b/com.avaloq.tools.ddk.runtime.source.feature/.project
deleted file mode 100644
index 5112671c0f..0000000000
--- a/com.avaloq.tools.ddk.runtime.source.feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.avaloq.tools.ddk.runtime.source.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/build.properties b/com.avaloq.tools.ddk.runtime.source.feature/build.properties
deleted file mode 100644
index 82ab19c62d..0000000000
--- a/com.avaloq.tools.ddk.runtime.source.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml b/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
deleted file mode 100644
index a90a7731a7..0000000000
--- a/com.avaloq.tools.ddk.runtime.source.feature/feature.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.avaloq.tools.ddk.runtime.source.feature"
-      label="com.avaloq.tools.ddk.runtime.source.feature"
-      version="16.2.0.qualifier"
-      provider-name="Avaloq Group AG">
-
-   <plugin
-         id="com.avaloq.tools.ddk.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.common.types.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.common.types.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.common.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.check.runtime.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.check.runtime.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.checkcfg.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.checkcfg.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.checkcfg.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.typesystem.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.builder.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.builder.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml b/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
deleted file mode 100644
index 4b91c6f605..0000000000
--- a/com.avaloq.tools.ddk.runtime.source.feature/pom.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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>
-    <artifactId>ddk-parent</artifactId>
-    <groupId>com.avaloq.tools.ddk</groupId>
-    <version>16.2.0-SNAPSHOT</version>
-    <relativePath>../ddk-parent</relativePath>
-  </parent>
-
-  <artifactId>com.avaloq.tools.ddk.runtime.source.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
\ No newline at end of file
diff --git a/com.avaloq.tools.ddk.source.feature/.project b/com.avaloq.tools.ddk.source.feature/.project
deleted file mode 100644
index 8101c66738..0000000000
--- a/com.avaloq.tools.ddk.source.feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.avaloq.tools.ddk.source.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/com.avaloq.tools.ddk.source.feature/build.properties b/com.avaloq.tools.ddk.source.feature/build.properties
deleted file mode 100644
index 82ab19c62d..0000000000
--- a/com.avaloq.tools.ddk.source.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/com.avaloq.tools.ddk.source.feature/feature.xml b/com.avaloq.tools.ddk.source.feature/feature.xml
deleted file mode 100644
index 84e656afe1..0000000000
--- a/com.avaloq.tools.ddk.source.feature/feature.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.avaloq.tools.ddk.source.feature"
-      label="com.avaloq.tools.ddk.source.feature"
-      version="16.2.0.qualifier"
-      provider-name="Avaloq Group AG">
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.export.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.export.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.export.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.generator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.scope.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.scope.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.scope.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.valid.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.valid.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.valid.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.scope.generator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.export.generator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.expression.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.expression.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.expression.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.format.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.format.generator.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.format.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.format.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.xtext.test.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.test.core.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.avaloq.tools.ddk.test.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/com.avaloq.tools.ddk.source.feature/pom.xml b/com.avaloq.tools.ddk.source.feature/pom.xml
deleted file mode 100644
index 4ed855eddb..0000000000
--- a/com.avaloq.tools.ddk.source.feature/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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>
-    <artifactId>ddk-parent</artifactId>
-    <groupId>com.avaloq.tools.ddk</groupId>
-    <version>16.2.0-SNAPSHOT</version>
-    <relativePath>../ddk-parent</relativePath>
-  </parent>
-
-  <artifactId>com.avaloq.tools.ddk.source.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/ddk-parent/pom.xml b/ddk-parent/pom.xml
index 159942586f..ecb5b27a4f 100644
--- a/ddk-parent/pom.xml
+++ b/ddk-parent/pom.xml
@@ -63,8 +63,6 @@
     <module>../ddk-repository</module>
     <module>../com.avaloq.tools.ddk.runtime.feature</module>
     <module>../com.avaloq.tools.ddk.feature</module>
-    <module>../com.avaloq.tools.ddk.runtime.source.feature</module>
-    <module>../com.avaloq.tools.ddk.source.feature</module>
     <module>../com.avaloq.tools.ddk</module>
     <module>../com.avaloq.tools.ddk.xtext</module>
     <module>../com.avaloq.tools.ddk.xtext.builder</module>
diff --git a/ddk-repository/category.xml b/ddk-repository/category.xml
index 6083d857df..83bc5fe768 100644
--- a/ddk-repository/category.xml
+++ b/ddk-repository/category.xml
@@ -3,15 +3,9 @@
    <feature url="features/com.avaloq.tools.ddk.feature_16.2.0.qualifier.jar" id="com.avaloq.tools.ddk.feature" version="16.2.0.qualifier">
       <category name="com.avaloq.tools.ddk.sdk"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.source.feature_16.2.0.qualifier.jar" id="com.avaloq.tools.ddk.source.feature" version="16.2.0.qualifier">
-      <category name="com.avaloq.tools.ddk.sdk"/>
-   </feature>
    <feature url="features/com.avaloq.tools.ddk.runtime.feature_16.2.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.feature" version="16.2.0.qualifier">
       <category name="com.avaloq.tools.ddk.runtime"/>
    </feature>
-   <feature url="features/com.avaloq.tools.ddk.runtime.source.feature_16.2.0.qualifier.jar" id="com.avaloq.tools.ddk.runtime.source.feature" version="16.2.0.qualifier">
-      <category name="com.avaloq.tools.ddk.runtime"/>
-   </feature>
    <category-def name="com.avaloq.tools.ddk.sdk" label="DSL Developer Kit"/>
    <category-def name="com.avaloq.tools.ddk.runtime" label="DSL Developer Kit Runtime"/>
 </site>
diff --git a/ddk-repository/pom.xml b/ddk-repository/pom.xml
index 21f49acfc9..c232d1d7c0 100644
--- a/ddk-repository/pom.xml
+++ b/ddk-repository/pom.xml
@@ -37,6 +37,7 @@
         <version>${tycho.version}</version>
         <configuration>
           <includeAllDependencies>false</includeAllDependencies>
+          <includeAllSources>true</includeAllSources>
           <repositoryName>DSL Developer Kit Update-Site</repositoryName>
         </configuration>
       </plugin>