diff --git a/org.xpect.releng/feature.xml b/org.xpect.releng/feature.xml
deleted file mode 100644
index b38e8422..00000000
--- a/org.xpect.releng/feature.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.xpect.workspace"
-      label="Xpect Workspace"
-      version="0.2.0.qualifier">
-
-   <includes
-         id="org.xpect.sdk"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.xpect.releng"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.xpect.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-        
-   <plugin
-         id="org.xpect.xtext.lib.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-	<plugin
-         id="org.eclipse.xtext.example.arithmetics.xpect.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-    <plugin
-         id="org.eclipse.xtext.example.domainmodel.xpect.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/org.xpect.releng/Xpect.setup b/org.xpect.sdk/Xpect.setup
similarity index 95%
rename from org.xpect.releng/Xpect.setup
rename to org.xpect.sdk/Xpect.setup
index 0d3fdd64..6e0d843f 100644
--- a/org.xpect.releng/Xpect.setup
+++ b/org.xpect.sdk/Xpect.setup
@@ -86,7 +86,17 @@
         <requirement
             name="de.itemis.xtext.antlr.sdk.feature.group"/>
         <requirement
-            name="org.xpect.workspace.feature.group"/>
+            name="org.xpect.sdk.feature.group"/>
+        <requirement
+            name="org.xpect.releng"/>
+        <requirement
+            name="org.xpect.tests"/>
+        <requirement
+            name="org.xpect.xtext.lib.tests"/>
+        <requirement
+            name="org.eclipse.xtext.example.arithmetics.xpect.tests"/>
+        <requirement
+            name="org.eclipse.xtext.example.domainmodel.xpect.tests"/>
         <sourceLocator
             rootFolder="${git.clone.location}"/>
         <repositoryList