diff --git a/features/org.eclipse.emf.validation.examples.source-feature/.gitignore b/features/org.eclipse.emf.validation.examples.source-feature/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/.project b/features/org.eclipse.emf.validation.examples.source-feature/.project
deleted file mode 100644
index db7f7ca..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.validation.examples.source-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.validation.examples.source-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/build.properties b/features/org.eclipse.emf.validation.examples.source-feature/build.properties
deleted file mode 100644
index 8805aa7..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2014 IBM Corporation and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               modeling32.png
-src.includes = feature.properties,\
-               feature.xml,\
-               modeling32.png
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/feature.properties b/features/org.eclipse.emf.validation.examples.source-feature/feature.properties
deleted file mode 100644
index f1d0a58..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/feature.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2014 IBM Corporation, Zeligsoft Inc., and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Zeligsoft - Bug 262577
-# 
-# $Id: feature.properties,v 1.9 2011/05/02 20:19:13 ahunter Exp $
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=EMF Validation Framework Examples Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=EMF Validation Framework Updates
-
-# "description" property - description of the feature
-description=EMF Validation Framework Examples (source code)
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
-
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/feature.xml b/features/org.eclipse.emf.validation.examples.source-feature/feature.xml
deleted file mode 100644
index 8c130eb..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2005, 2014 IBM Corporation and others.
-  * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   IBM - Initial API and implementation
- */
--->
-<feature
-      id="org.eclipse.emf.validation.examples.source"
-      label="%featureName"
-      version="1.14.0.qualifier"
-      provider-name="%providerName"
-      image="modeling32.png"
-      license-feature="org.eclipse.license"
-      license-feature-version="2.0.2">
-
-   <description url="https://www.eclipse.org/modeling/emf/?project=validation">
-      %description
-   </description>
-
-   <copyright url="https://www.eclipse.org/legal/epl-2.0/">
-      Copyright (c) 2005, 2015 IBM Corporation and others.
-This program and the accompanying materials are made
-available under the terms of the Eclipse Public License 2.0
-which is available at https://www.eclipse.org/legal/epl-2.0/
-
-SPDX-License-Identifier: EPL-2.0
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="https://download.eclipse.org/modeling/emf/validation/updates/releases/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.emf.validation.examples.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation.examples.general.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation.examples.ocl.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation.examples.adapter.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/modeling32.png b/features/org.eclipse.emf.validation.examples.source-feature/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
Binary files a/features/org.eclipse.emf.validation.examples.source-feature/modeling32.png and /dev/null differ
diff --git a/features/org.eclipse.emf.validation.examples.source-feature/pom.xml b/features/org.eclipse.emf.validation.examples.source-feature/pom.xml
deleted file mode 100644
index 98b6165..0000000
--- a/features/org.eclipse.emf.validation.examples.source-feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <groupId>org.eclipse.emf.validation</groupId>
-    <artifactId>org.eclipse.emf.validation.releng</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
-  </parent>
-  <groupId>org.eclipse.emf.validation.features</groupId>
-  <artifactId>org.eclipse.emf.validation.examples.source</artifactId>
-  <version>1.14.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/.gitignore b/features/org.eclipse.emf.validation.ocl.source-feature/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/.project b/features/org.eclipse.emf.validation.ocl.source-feature/.project
deleted file mode 100644
index 994d87e..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.validation.ocl.source-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.validation.ocl.source-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/build.properties b/features/org.eclipse.emf.validation.ocl.source-feature/build.properties
deleted file mode 100644
index 8805aa7..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2014 IBM Corporation and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               modeling32.png
-src.includes = feature.properties,\
-               feature.xml,\
-               modeling32.png
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/feature.properties b/features/org.eclipse.emf.validation.ocl.source-feature/feature.properties
deleted file mode 100644
index 5df469d..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/feature.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2014 IBM Corporation, Zeligsoft Inc., and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Zeligsoft - Bug 262577
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=EMF Validation Framework OCL Integration Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=EMF Validation Framework Updates
-
-# "description" property - description of the feature
-description=EMF Validation Framework OCL Integration (source code)
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
-
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/feature.xml b/features/org.eclipse.emf.validation.ocl.source-feature/feature.xml
deleted file mode 100644
index 41ededc..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/feature.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2005, 2014 IBM Corporation and others.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   IBM - Initial API and implementation
- */
--->
-<feature
-      id="org.eclipse.emf.validation.ocl.source"
-      label="%featureName"
-      version="1.14.0.qualifier"
-      provider-name="%providerName"
-      image="modeling32.png"
-      license-feature="org.eclipse.license"
-      license-feature-version="2.0.2">
-
-   <description url="https://www.eclipse.org/modeling/emf/?project=validation">
-      %description
-   </description>
-
-   <copyright url="https://www.eclipse.org/legal/epl-2.0/">
-      Copyright (c) 2005, 2015 IBM Corporation and others.
-This program and the accompanying materials are made
-available under the terms of the Eclipse Public License 2.0
-which is available at https://www.eclipse.org/legal/epl-2.0/
-
-SPDX-License-Identifier: EPL-2.0
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="https://download.eclipse.org/modeling/emf/validation/updates/releases/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.emf.validation.ocl.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/modeling32.png b/features/org.eclipse.emf.validation.ocl.source-feature/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
Binary files a/features/org.eclipse.emf.validation.ocl.source-feature/modeling32.png and /dev/null differ
diff --git a/features/org.eclipse.emf.validation.ocl.source-feature/pom.xml b/features/org.eclipse.emf.validation.ocl.source-feature/pom.xml
deleted file mode 100644
index bad77df..0000000
--- a/features/org.eclipse.emf.validation.ocl.source-feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <groupId>org.eclipse.emf.validation</groupId>
-    <artifactId>org.eclipse.emf.validation.releng</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
-  </parent>
-  <groupId>org.eclipse.emf.validation.features</groupId>
-  <artifactId>org.eclipse.emf.validation.ocl.source</artifactId>
-  <version>1.14.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/features/org.eclipse.emf.validation.sdk-feature/feature.xml b/features/org.eclipse.emf.validation.sdk-feature/feature.xml
index 47c8753..e79b98e 100644
--- a/features/org.eclipse.emf.validation.sdk-feature/feature.xml
+++ b/features/org.eclipse.emf.validation.sdk-feature/feature.xml
@@ -54,12 +54,4 @@ SPDX-License-Identifier: EPL-2.0
          id="org.eclipse.emf.validation.doc"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.emf.validation.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.emf.validation.ocl.source"
-         version="0.0.0"/>
-
 </feature>
diff --git a/features/org.eclipse.emf.validation.source-feature/.gitignore b/features/org.eclipse.emf.validation.source-feature/.gitignore
deleted file mode 100644
index ea8c4bf..0000000
--- a/features/org.eclipse.emf.validation.source-feature/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target
diff --git a/features/org.eclipse.emf.validation.source-feature/.project b/features/org.eclipse.emf.validation.source-feature/.project
deleted file mode 100644
index 26d094f..0000000
--- a/features/org.eclipse.emf.validation.source-feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.emf.validation.source-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.validation.source-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.validation.source-feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/features/org.eclipse.emf.validation.source-feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.validation.source-feature/build.properties b/features/org.eclipse.emf.validation.source-feature/build.properties
deleted file mode 100644
index 8805aa7..0000000
--- a/features/org.eclipse.emf.validation.source-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2014 IBM Corporation and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               modeling32.png
-src.includes = feature.properties,\
-               feature.xml,\
-               modeling32.png
diff --git a/features/org.eclipse.emf.validation.source-feature/feature.properties b/features/org.eclipse.emf.validation.source-feature/feature.properties
deleted file mode 100644
index fbf086f..0000000
--- a/features/org.eclipse.emf.validation.source-feature/feature.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2014 IBM Corporation, Zeligsoft Inc., and others.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Zeligsoft - Bug 262577
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=EMF Validation Framework Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=EMF Validation Framework Updates
-
-# "description" property - description of the feature
-description=EMF Validation Framework (source code)
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
-
diff --git a/features/org.eclipse.emf.validation.source-feature/feature.xml b/features/org.eclipse.emf.validation.source-feature/feature.xml
deleted file mode 100644
index 27ad695..0000000
--- a/features/org.eclipse.emf.validation.source-feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright (c) 2005, 2014 IBM Corporation and others.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   IBM - Initial API and implementation
- *   Zeligsoft - Bug 263879
- */
--->
-<feature
-      id="org.eclipse.emf.validation.source"
-      label="%featureName"
-      version="1.14.0.qualifier"
-      provider-name="%providerName"
-      image="modeling32.png"
-      license-feature="org.eclipse.license"
-      license-feature-version="2.0.2">
-
-   <description url="https://www.eclipse.org/modeling/emf/?project=validation">
-      %description
-   </description>
-
-   <copyright url="https://www.eclipse.org/legal/epl-2.0/">
-      Copyright (c) 2005, 2015 IBM Corporation and others.
-This program and the accompanying materials are made
-available under the terms of the Eclipse Public License 2.0
-which is available at https://www.eclipse.org/legal/epl-2.0/
-
-SPDX-License-Identifier: EPL-2.0
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="https://download.eclipse.org/modeling/emf/validation/updates/releases/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.emf.validation.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation.ui.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.emf.validation.ui.ide.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.validation.source-feature/modeling32.png b/features/org.eclipse.emf.validation.source-feature/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
Binary files a/features/org.eclipse.emf.validation.source-feature/modeling32.png and /dev/null differ
diff --git a/features/org.eclipse.emf.validation.source-feature/pom.xml b/features/org.eclipse.emf.validation.source-feature/pom.xml
deleted file mode 100644
index ad7fd88..0000000
--- a/features/org.eclipse.emf.validation.source-feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-    <groupId>org.eclipse.emf.validation</groupId>
-    <artifactId>org.eclipse.emf.validation.releng</artifactId>
-    <version>1.14.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.emf.validation.releng/pom.xml</relativePath>
-  </parent>
-  <groupId>org.eclipse.emf.validation.features</groupId>
-  <artifactId>org.eclipse.emf.validation.source</artifactId>
-  <version>1.14.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml
index 2a26b8f..0a666c3 100644
--- a/releng/org.eclipse.emf.validation.releng/pom.xml
+++ b/releng/org.eclipse.emf.validation.releng/pom.xml
@@ -52,6 +52,12 @@
               <goal>plugin-source</goal>
             </goals>
           </execution>
+          <execution>
+            <id>feature-source</id>
+            <goals>
+              <goal>feature-source</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -104,6 +110,28 @@
           </environments>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-repository-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <includeAllSources>true</includeAllSources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <id>attach-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -172,9 +200,6 @@
     <module>../../features/org.eclipse.emf.validation-feature</module>
     <module>../../features/org.eclipse.emf.validation.ocl-feature</module>
     <module>../../features/org.eclipse.emf.validation.examples-feature</module>
-    <module>../../features/org.eclipse.emf.validation.source-feature</module>
-    <module>../../features/org.eclipse.emf.validation.ocl.source-feature</module>
-    <module>../../features/org.eclipse.emf.validation.examples.source-feature</module>
     <module>../../features/org.eclipse.emf.validation.doc-feature</module>
     <module>../../features/org.eclipse.emf.validation.tests-feature</module>
     <module>../../features/org.eclipse.emf.validation.sdk-feature</module>
diff --git a/releng/org.eclipse.emf.validation.repository/category.xml b/releng/org.eclipse.emf.validation.repository/category.xml
index d919bb4..0e99079 100644
--- a/releng/org.eclipse.emf.validation.repository/category.xml
+++ b/releng/org.eclipse.emf.validation.repository/category.xml
@@ -9,24 +9,15 @@
    <feature url="features/org.eclipse.emf.validation.examples_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.examples" version="1.14.0.qualifier">
       <category name="emf-validation"/>
    </feature>
-   <feature url="features/org.eclipse.emf.validation.examples.source_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.examples.source" version="1.14.0.qualifier">
-      <category name="emf-validation"/>
-   </feature>
    <feature url="features/org.eclipse.emf.validation.master_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.master" version="1.14.0.qualifier">
       <category name="emf-validation"/>
    </feature>
    <feature url="features/org.eclipse.emf.validation.ocl_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.ocl" version="1.14.0.qualifier">
       <category name="emf-validation"/>
    </feature>
-   <feature url="features/org.eclipse.emf.validation.ocl.source_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.ocl.source" version="1.14.0.qualifier">
-      <category name="emf-validation"/>
-   </feature>
    <feature url="features/org.eclipse.emf.validation.sdk_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.sdk" version="1.14.0.qualifier">
       <category name="emf-validation"/>
    </feature>
-   <feature url="features/org.eclipse.emf.validation.source_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.source" version="1.14.0.qualifier">
-      <category name="emf-validation"/>
-   </feature>
    <feature url="features/org.eclipse.emf.validation.tests_1.14.0.qualifier.jar" id="org.eclipse.emf.validation.tests" version="1.14.0.qualifier">
       <category name="emf-validation"/>
    </feature>