Adjust runtime to new repository structure

* Extracted features to separate projects
* Removed runtime folder and renamed runtime-prefixed folders
* Adjusted pom files

62 files changed, 81 insertions, 46 deletions

diff --git a/bundles/org.eclipse.rap.demo.databinding/pom.xml b/bundles/org.eclipse.rap.demo.databinding/pom.xml
index c5f02faa53..dbc900ff29 100644
--- a/bundles/org.eclipse.rap.demo.databinding/pom.xml
+++ b/bundles/org.eclipse.rap.demo.databinding/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.demo.databinding</artifactId>
diff --git a/bundles/org.eclipse.rap.demo/pom.xml b/bundles/org.eclipse.rap.demo/pom.xml
index 21395389bf..a53a95e5c2 100644
--- a/bundles/org.eclipse.rap.demo/pom.xml
+++ b/bundles/org.eclipse.rap.demo/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.demo</artifactId>
diff --git a/bundles/org.eclipse.rap.design.example/pom.xml b/bundles/org.eclipse.rap.design.example/pom.xml
index 0fe4f0a3ce..c98712ee56 100644
--- a/bundles/org.eclipse.rap.design.example/pom.xml
+++ b/bundles/org.eclipse.rap.design.example/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.design.example</artifactId>
diff --git a/bundles/org.eclipse.rap.jface.databinding/pom.xml b/bundles/org.eclipse.rap.jface.databinding/pom.xml
index 87af4f9320..dff120831d 100644
--- a/bundles/org.eclipse.rap.jface.databinding/pom.xml
+++ b/bundles/org.eclipse.rap.jface.databinding/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.jface.databinding</artifactId>
diff --git a/bundles/org.eclipse.rap.jface/pom.xml b/bundles/org.eclipse.rap.jface/pom.xml
index 9153b3508f..a03307278d 100644
--- a/bundles/org.eclipse.rap.jface/pom.xml
+++ b/bundles/org.eclipse.rap.jface/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.jface</artifactId>
diff --git a/bundles/org.eclipse.rap.junit.runtime/pom.xml b/bundles/org.eclipse.rap.junit.runtime/pom.xml
index 6509b58109..9c0467e203 100644
--- a/bundles/org.eclipse.rap.junit.runtime/pom.xml
+++ b/bundles/org.eclipse.rap.junit.runtime/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.junit.runtime</artifactId>
diff --git a/bundles/org.eclipse.rap.junit/pom.xml b/bundles/org.eclipse.rap.junit/pom.xml
index 75ffd4d094..ad6c633903 100644
--- a/bundles/org.eclipse.rap.junit/pom.xml
+++ b/bundles/org.eclipse.rap.junit/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.junit</artifactId>
diff --git a/bundles/org.eclipse.rap.rwt.osgi/pom.xml b/bundles/org.eclipse.rap.rwt.osgi/pom.xml
index 0a1c8ca3f9..c70dbdef4e 100644
--- a/bundles/org.eclipse.rap.rwt.osgi/pom.xml
+++ b/bundles/org.eclipse.rap.rwt.osgi/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.osgi</artifactId>
diff --git a/bundles/org.eclipse.rap.rwt/pom.xml b/bundles/org.eclipse.rap.rwt/pom.xml
index 74695a7501..97422090a4 100644
--- a/bundles/org.eclipse.rap.rwt/pom.xml
+++ b/bundles/org.eclipse.rap.rwt/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt</artifactId>
diff --git a/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml b/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
index ebf608e7cf..9fa79ad4e4 100644
--- a/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
+++ b/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
diff --git a/bundles/org.eclipse.rap.ui.forms/pom.xml b/bundles/org.eclipse.rap.ui.forms/pom.xml
index 843f76424c..a9ebd93895 100644
--- a/bundles/org.eclipse.rap.ui.forms/pom.xml
+++ b/bundles/org.eclipse.rap.ui.forms/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.forms</artifactId>
diff --git a/bundles/org.eclipse.rap.ui.views/pom.xml b/bundles/org.eclipse.rap.ui.views/pom.xml
index 5cc75607cf..043944340e 100644
--- a/bundles/org.eclipse.rap.ui.views/pom.xml
+++ b/bundles/org.eclipse.rap.ui.views/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.views</artifactId>
diff --git a/bundles/org.eclipse.rap.ui.workbench/pom.xml b/bundles/org.eclipse.rap.ui.workbench/pom.xml
index eac8f24515..3a06d07035 100644
--- a/bundles/org.eclipse.rap.ui.workbench/pom.xml
+++ b/bundles/org.eclipse.rap.ui.workbench/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.workbench</artifactId>
diff --git a/bundles/org.eclipse.rap.ui/pom.xml b/bundles/org.eclipse.rap.ui/pom.xml
index 83ab7a73a8..446b61d247 100644
--- a/bundles/org.eclipse.rap.ui/pom.xml
+++ b/bundles/org.eclipse.rap.ui/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui</artifactId>
diff --git a/features/org.eclipse.rap.runtime.requirements/.project b/features/org.eclipse.rap.runtime.requirements/.project
new file mode 100644
index 0000000000..3cba5f5244
--- /dev/null
+++ b/features/org.eclipse.rap.runtime.requirements/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rap.runtime.requirements</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/build.properties b/features/org.eclipse.rap.runtime.requirements/build.properties
index 9d0c46d2a4..9d0c46d2a4 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/build.properties
+++ b/features/org.eclipse.rap.runtime.requirements/build.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/epl-v10.html b/features/org.eclipse.rap.runtime.requirements/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/epl-v10.html
+++ b/features/org.eclipse.rap.runtime.requirements/epl-v10.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/feature.properties b/features/org.eclipse.rap.runtime.requirements/feature.properties
index 0ae0d3c9b4..0ae0d3c9b4 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/feature.properties
+++ b/features/org.eclipse.rap.runtime.requirements/feature.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/feature.xml b/features/org.eclipse.rap.runtime.requirements/feature.xml
index c432157773..c432157773 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/feature.xml
+++ b/features/org.eclipse.rap.runtime.requirements/feature.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/license.html b/features/org.eclipse.rap.runtime.requirements/license.html
index f19c483b9c..f19c483b9c 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/license.html
+++ b/features/org.eclipse.rap.runtime.requirements/license.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/p2.inf b/features/org.eclipse.rap.runtime.requirements/p2.inf
index 4c52a47816..4c52a47816 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/p2.inf
+++ b/features/org.eclipse.rap.runtime.requirements/p2.inf
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/pom.xml b/features/org.eclipse.rap.runtime.requirements/pom.xml
index b3450d09c0..b3450d09c0 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/pom.xml
+++ b/features/org.eclipse.rap.runtime.requirements/pom.xml
diff --git a/features/org.eclipse.rap.runtime/.project b/features/org.eclipse.rap.runtime/.project
new file mode 100644
index 0000000000..c6128a068f
--- /dev/null
+++ b/features/org.eclipse.rap.runtime/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rap.runtime</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/build.properties b/features/org.eclipse.rap.runtime/build.properties
index 6a9a2b8877..6a9a2b8877 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/build.properties
+++ b/features/org.eclipse.rap.runtime/build.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/epl-v10.html b/features/org.eclipse.rap.runtime/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/epl-v10.html
+++ b/features/org.eclipse.rap.runtime/epl-v10.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/feature.properties b/features/org.eclipse.rap.runtime/feature.properties
index 4533e2f8e3..4533e2f8e3 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/feature.properties
+++ b/features/org.eclipse.rap.runtime/feature.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/feature.xml b/features/org.eclipse.rap.runtime/feature.xml
index e8a6a9e9a7..e8a6a9e9a7 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/feature.xml
+++ b/features/org.eclipse.rap.runtime/feature.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/license.html b/features/org.eclipse.rap.runtime/license.html
index f19c483b9c..f19c483b9c 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/license.html
+++ b/features/org.eclipse.rap.runtime/license.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/p2.inf b/features/org.eclipse.rap.runtime/p2.inf
index 4c52a47816..4c52a47816 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/p2.inf
+++ b/features/org.eclipse.rap.runtime/p2.inf
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/pom.xml b/features/org.eclipse.rap.runtime/pom.xml
index 335574c15d..bb3da533a1 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/pom.xml
+++ b/features/org.eclipse.rap.runtime/pom.xml
@@ -18,6 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.runtime</artifactId>
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/category.xml b/releng/org.eclipse.rap.releng/aggregation-repository/category.xml
index 5b8f293229..5b8f293229 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/category.xml
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/category.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/pom.xml b/releng/org.eclipse.rap.releng/aggregation-repository/pom.xml
index 2635c46da5..2635c46da5 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/pom.xml
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/pom.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/build.properties b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/build.properties
index 6a9a2b8877..6a9a2b8877 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/build.properties
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/build.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/epl-v10.html b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/epl-v10.html
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/epl-v10.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/feature.properties b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/feature.properties
index 4533e2f8e3..4533e2f8e3 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/feature.properties
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/feature.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/feature.xml b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/feature.xml
index e8a6a9e9a7..e8a6a9e9a7 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/feature.xml
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/feature.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/license.html b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/license.html
index f19c483b9c..f19c483b9c 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/license.html
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/license.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-feature/p2.inf b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/p2.inf
index 4c52a47816..4c52a47816 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-feature/p2.inf
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/p2.inf
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/pom.xml b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/pom.xml
index a072204411..a072204411 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-aggregation-repository/runtime-feature/pom.xml
+++ b/releng/org.eclipse.rap.releng/aggregation-repository/runtime-feature/pom.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/build.properties b/releng/org.eclipse.rap.releng/build.properties
index 3dc1d89c59..3dc1d89c59 100755
--- a/releng/org.eclipse.rap.releng/runtime/build.properties
+++ b/releng/org.eclipse.rap.releng/build.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/category.xml b/releng/org.eclipse.rap.releng/compatibility-repository/category.xml
index 3dc4f9a63a..3dc4f9a63a 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/category.xml
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/category.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/pom.xml b/releng/org.eclipse.rap.releng/compatibility-repository/pom.xml
index 1ddea70402..1ddea70402 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/pom.xml
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/pom.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/README.txt b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/README.txt
index ea2946780a..ea2946780a 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/README.txt
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/README.txt
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/build.properties b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/build.properties
index 087eb3b7b8..087eb3b7b8 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/build.properties
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/build.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/epl-v10.html b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/epl-v10.html
index 3998fcebee..3998fcebee 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/epl-v10.html
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/epl-v10.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/feature.properties b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/feature.properties
index 92d0a212fd..92d0a212fd 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/feature.properties
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/feature.properties
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/feature.xml b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/feature.xml
index 9b2405f125..9b2405f125 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/feature.xml
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/feature.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/license.html b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/license.html
index f19c483b9c..f19c483b9c 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/license.html
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/license.html
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/p2.inf b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/p2.inf
index 4c52a47816..4c52a47816 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime.requirements-feature/p2.inf
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/p2.inf
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/pom.xml b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/pom.xml
index ed900e1fa9..ed900e1fa9 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-compatibility-repository/runtime.sdk-feature/pom.xml
+++ b/releng/org.eclipse.rap.releng/compatibility-repository/runtime.sdk-feature/pom.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/pom-aggregation.xml b/releng/org.eclipse.rap.releng/pom-aggregation.xml
index 7ce0146822..7ce0146822 100644
--- a/releng/org.eclipse.rap.releng/runtime/pom-aggregation.xml
+++ b/releng/org.eclipse.rap.releng/pom-aggregation.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/pom.xml b/releng/org.eclipse.rap.releng/pom.xml
index 608e492e2c..ca1037fea6 100644
--- a/releng/org.eclipse.rap.releng/runtime/pom.xml
+++ b/releng/org.eclipse.rap.releng/pom.xml
@@ -35,34 +35,34 @@
 
   <modules>
     <!-- Runtime projects -->
-    <module>../../../runtime.rwt/org.eclipse.rap.rwt</module>
-    <module>../../../runtime.rwt/org.eclipse.rap.rwt.osgi</module>
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.testfixture</module>
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.cluster.testfixture</module>
-    <module>../../../runtime.ui/org.eclipse.rap.demo</module>
-    <module>../../../runtime.ui/org.eclipse.rap.demo.databinding</module>
-    <module>../../../runtime.ui/org.eclipse.rap.design.example</module>
-    <module>../../../runtime.ui/org.eclipse.rap.jface</module>
-    <module>../../../runtime.ui/org.eclipse.rap.jface.databinding</module>
-    <module>../../../runtime.ui/org.eclipse.rap.junit</module>
-    <module>../../../runtime.ui/org.eclipse.rap.junit.runtime</module>
-    <module>../../../runtime.ui/org.eclipse.rap.ui</module>
-    <module>../../../runtime.ui/org.eclipse.rap.ui.cheatsheets</module>
-    <module>../../../runtime.ui/org.eclipse.rap.ui.forms</module>
-    <module>../../../runtime.ui/org.eclipse.rap.ui.views</module>
-    <module>../../../runtime.ui/org.eclipse.rap.ui.workbench</module>
+    <module>../../bundles/org.eclipse.rap.rwt</module>
+    <module>../../bundles/org.eclipse.rap.rwt.osgi</module>
+    <module>../../bundles/org.eclipse.rap.demo</module>
+    <module>../../bundles/org.eclipse.rap.demo.databinding</module>
+    <module>../../bundles/org.eclipse.rap.design.example</module>
+    <module>../../bundles/org.eclipse.rap.jface</module>
+    <module>../../bundles/org.eclipse.rap.jface.databinding</module>
+    <module>../../bundles/org.eclipse.rap.junit</module>
+    <module>../../bundles/org.eclipse.rap.junit.runtime</module>
+    <module>../../bundles/org.eclipse.rap.ui</module>
+    <module>../../bundles/org.eclipse.rap.ui.cheatsheets</module>
+    <module>../../bundles/org.eclipse.rap.ui.forms</module>
+    <module>../../bundles/org.eclipse.rap.ui.views</module>
+    <module>../../bundles/org.eclipse.rap.ui.workbench</module>
     <!-- Test projects -->
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.test</module>
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.osgi.test</module>
-    <module>../../../runtime.ui.test/org.eclipse.rap.ui.forms.test</module>
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.themes.test</module>
+    <module>../../tests/org.eclipse.rap.rwt.testfixture</module>
+    <module>../../tests/org.eclipse.rap.rwt.cluster.testfixture</module>
+    <module>../../tests/org.eclipse.rap.rwt.test</module>
+    <module>../../tests/org.eclipse.rap.rwt.osgi.test</module>
+    <module>../../tests/org.eclipse.rap.rwt.themes.test</module>
+    <module>../../tests/org.eclipse.rap.ui.forms.test</module>
     <!--
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.cluster.test</module>
-    <module>../../../runtime.rwt.test/org.eclipse.rap.rwt.cluster.testfixture.test</module>
+    <module>../../tests/org.eclipse.rap.rwt.cluster.test</module>
+    <module>../../tests/org.eclipse.rap.rwt.cluster.testfixture.test</module>
     -->
     <!-- Packaging projects -->
-    <module>runtime-feature</module>
-    <module>runtime-repository</module>
+    <module>../../features/org.eclipse.rap.runtime</module>
+    <module>repository</module>
   </modules>
 
   <repositories>
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-repository/category.xml b/releng/org.eclipse.rap.releng/repository/category.xml
index ae5fb63757..ae5fb63757 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-repository/category.xml
+++ b/releng/org.eclipse.rap.releng/repository/category.xml
diff --git a/releng/org.eclipse.rap.releng/runtime/runtime-repository/pom.xml b/releng/org.eclipse.rap.releng/repository/pom.xml
index a40f4c4de4..a40f4c4de4 100644
--- a/releng/org.eclipse.rap.releng/runtime/runtime-repository/pom.xml
+++ b/releng/org.eclipse.rap.releng/repository/pom.xml
diff --git a/tests/org.eclipse.rap.rwt.cluster.test/pom.xml b/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
index 4a0b3c7300..3610207c70 100644
--- a/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.test</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
index 0f25ba74af..8cfa7d9e85 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.testfixture.test</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml b/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
index 38f8540582..4cd346331f 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.testfixture</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
index 3fad45105c..3b3df4cd79 100644
--- a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.osgi.test</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.test/pom.xml b/tests/org.eclipse.rap.rwt.test/pom.xml
index d736fe47a4..5269cf2d9a 100644
--- a/tests/org.eclipse.rap.rwt.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.test</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.testfixture/pom.xml b/tests/org.eclipse.rap.rwt.testfixture/pom.xml
index 6c0646e1b2..2c489619d3 100644
--- a/tests/org.eclipse.rap.rwt.testfixture/pom.xml
+++ b/tests/org.eclipse.rap.rwt.testfixture/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.testfixture</artifactId>
diff --git a/tests/org.eclipse.rap.rwt.themes.test/pom.xml b/tests/org.eclipse.rap.rwt.themes.test/pom.xml
index 4935f42472..a80e9c17bc 100644
--- a/tests/org.eclipse.rap.rwt.themes.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.themes.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.themes.test</artifactId>
diff --git a/tests/org.eclipse.rap.ui.forms.test/pom.xml b/tests/org.eclipse.rap.ui.forms.test/pom.xml
index 244e90ad76..7e7d361f8d 100644
--- a/tests/org.eclipse.rap.ui.forms.test/pom.xml
+++ b/tests/org.eclipse.rap.ui.forms.test/pom.xml
@@ -18,7 +18,7 @@
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
     <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../releng/org.eclipse.rap.releng/runtime/pom.xml</relativePath>
+    <relativePath>../../releng/org.eclipse.rap.releng/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.forms.test</artifactId>