diff --git a/org.eclipse.triquetrum.common/.classpath b/examples/org.eclipse.triquetrum.processing.service.impl.example/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.common/.classpath
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/.classpath
diff --git a/org.eclipse.triquetrum.core.feature/.gitignore b/examples/org.eclipse.triquetrum.processing.service.impl.example/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/.gitignore
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/.gitignore
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/.project b/examples/org.eclipse.triquetrum.processing.service.impl.example/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/.project
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/.project
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/META-INF/MANIFEST.MF b/examples/org.eclipse.triquetrum.processing.service.impl.example/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/META-INF/MANIFEST.MF
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/OSGI-INF/MathsProcessingService.xml b/examples/org.eclipse.triquetrum.processing.service.impl.example/OSGI-INF/MathsProcessingService.xml
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/OSGI-INF/MathsProcessingService.xml
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/OSGI-INF/MathsProcessingService.xml
diff --git a/org.eclipse.triquetrum.common/about.html b/examples/org.eclipse.triquetrum.processing.service.impl.example/about.html
similarity index 100%
rename from org.eclipse.triquetrum.common/about.html
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/about.html
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/build.properties b/examples/org.eclipse.triquetrum.processing.service.impl.example/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/build.properties
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/build.properties
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/src/main/java/org/eclipse/triquetrum/processing/service/impl/example/MathsProcessingService.java b/examples/org.eclipse.triquetrum.processing.service.impl.example/src/main/java/org/eclipse/triquetrum/processing/service/impl/example/MathsProcessingService.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/src/main/java/org/eclipse/triquetrum/processing/service/impl/example/MathsProcessingService.java
rename to examples/org.eclipse.triquetrum.processing.service.impl.example/src/main/java/org/eclipse/triquetrum/processing/service/impl/example/MathsProcessingService.java
diff --git a/examples/pom.xml b/examples/pom.xml
index 4a816705..1504bdb4 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -10,7 +10,7 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<parent>
-		<groupId>triquetrum</groupId>
+		<groupId>org.eclipse.triquetrum</groupId>
 		<artifactId>org.eclipse.triquetrum.build</artifactId>
 		<version>0.2.0-SNAPSHOT</version>
 	</parent>
@@ -20,10 +20,11 @@
 	<packaging>pom</packaging>
 	
   <modules>
+    <module>org.eclipse.triquetrum.processing.service.impl.example</module>
+    <module>org.eclipse.triquetrum.python.service.example</module>
     <module>org.eclipse.triquetrum.workflow.actor.plot</module>
     <module>org.eclipse.triquetrum.workflow.actor.plot.palette</module>
     <module>org.eclipse.triquetrum.workflow.actor.plot.feature</module>
-    <module>org.eclipse.triquetrum.python.service.example</module>
   </modules>
 	
 </project>
diff --git a/org.eclipse.triquetrum.processing.actor/.gitignore b/features/org.eclipse.triquetrum.core.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/.gitignore
rename to features/org.eclipse.triquetrum.core.feature/.gitignore
diff --git a/org.eclipse.triquetrum.core.feature/.project b/features/org.eclipse.triquetrum.core.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/.project
rename to features/org.eclipse.triquetrum.core.feature/.project
diff --git a/org.eclipse.triquetrum.core.feature/build.properties b/features/org.eclipse.triquetrum.core.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/build.properties
rename to features/org.eclipse.triquetrum.core.feature/build.properties
diff --git a/org.eclipse.triquetrum.core.feature/epl-v10.html b/features/org.eclipse.triquetrum.core.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.core.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.core.feature/feature.properties b/features/org.eclipse.triquetrum.core.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/feature.properties
rename to features/org.eclipse.triquetrum.core.feature/feature.properties
diff --git a/org.eclipse.triquetrum.core.feature/feature.xml b/features/org.eclipse.triquetrum.core.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/feature.xml
rename to features/org.eclipse.triquetrum.core.feature/feature.xml
diff --git a/org.eclipse.triquetrum.core.feature/license.html b/features/org.eclipse.triquetrum.core.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/license.html
rename to features/org.eclipse.triquetrum.core.feature/license.html
diff --git a/org.eclipse.triquetrum.core.feature/notice.html b/features/org.eclipse.triquetrum.core.feature/notice.html
similarity index 100%
rename from org.eclipse.triquetrum.core.feature/notice.html
rename to features/org.eclipse.triquetrum.core.feature/notice.html
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/.gitignore b/features/org.eclipse.triquetrum.ptolemy.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/.gitignore
rename to features/org.eclipse.triquetrum.ptolemy.feature/.gitignore
diff --git a/org.eclipse.triquetrum.ptolemy.feature/.project b/features/org.eclipse.triquetrum.ptolemy.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/.project
rename to features/org.eclipse.triquetrum.ptolemy.feature/.project
diff --git a/org.eclipse.triquetrum.ptolemy.feature/about.ini b/features/org.eclipse.triquetrum.ptolemy.feature/about.ini
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/about.ini
rename to features/org.eclipse.triquetrum.ptolemy.feature/about.ini
diff --git a/org.eclipse.triquetrum.ptolemy.feature/about.mappings b/features/org.eclipse.triquetrum.ptolemy.feature/about.mappings
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/about.mappings
rename to features/org.eclipse.triquetrum.ptolemy.feature/about.mappings
diff --git a/org.eclipse.triquetrum.ptolemy.feature/about.properties b/features/org.eclipse.triquetrum.ptolemy.feature/about.properties
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/about.properties
rename to features/org.eclipse.triquetrum.ptolemy.feature/about.properties
diff --git a/org.eclipse.triquetrum.ptolemy.feature/build.properties b/features/org.eclipse.triquetrum.ptolemy.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/build.properties
rename to features/org.eclipse.triquetrum.ptolemy.feature/build.properties
diff --git a/org.eclipse.triquetrum.ptolemy.feature/epl-v10.html b/features/org.eclipse.triquetrum.ptolemy.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.ptolemy.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.ptolemy.feature/feature.properties b/features/org.eclipse.triquetrum.ptolemy.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/feature.properties
rename to features/org.eclipse.triquetrum.ptolemy.feature/feature.properties
diff --git a/org.eclipse.triquetrum.ptolemy.feature/feature.xml b/features/org.eclipse.triquetrum.ptolemy.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/feature.xml
rename to features/org.eclipse.triquetrum.ptolemy.feature/feature.xml
diff --git a/org.eclipse.triquetrum.ptolemy.feature/license.html b/features/org.eclipse.triquetrum.ptolemy.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/license.html
rename to features/org.eclipse.triquetrum.ptolemy.feature/license.html
diff --git a/org.eclipse.triquetrum.ptolemy.feature/ptolemy32.png b/features/org.eclipse.triquetrum.ptolemy.feature/ptolemy32.png
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/ptolemy32.png
rename to features/org.eclipse.triquetrum.ptolemy.feature/ptolemy32.png
diff --git a/org.eclipse.triquetrum.ptolemy.feature/.gitignore b/features/org.eclipse.triquetrum.python.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.ptolemy.feature/.gitignore
rename to features/org.eclipse.triquetrum.python.feature/.gitignore
diff --git a/org.eclipse.triquetrum.python.feature/.project b/features/org.eclipse.triquetrum.python.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/.project
rename to features/org.eclipse.triquetrum.python.feature/.project
diff --git a/org.eclipse.triquetrum.python.feature/build.properties b/features/org.eclipse.triquetrum.python.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/build.properties
rename to features/org.eclipse.triquetrum.python.feature/build.properties
diff --git a/org.eclipse.triquetrum.python.feature/epl-v10.html b/features/org.eclipse.triquetrum.python.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.python.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.python.feature/feature.properties b/features/org.eclipse.triquetrum.python.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/feature.properties
rename to features/org.eclipse.triquetrum.python.feature/feature.properties
diff --git a/org.eclipse.triquetrum.python.feature/feature.xml b/features/org.eclipse.triquetrum.python.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/feature.xml
rename to features/org.eclipse.triquetrum.python.feature/feature.xml
diff --git a/org.eclipse.triquetrum.python.feature/license.html b/features/org.eclipse.triquetrum.python.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/license.html
rename to features/org.eclipse.triquetrum.python.feature/license.html
diff --git a/org.eclipse.triquetrum.python.actor.palette/.gitignore b/features/org.eclipse.triquetrum.rcp.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/.gitignore
rename to features/org.eclipse.triquetrum.rcp.feature/.gitignore
diff --git a/org.eclipse.triquetrum.rcp.feature/.project b/features/org.eclipse.triquetrum.rcp.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/.project
rename to features/org.eclipse.triquetrum.rcp.feature/.project
diff --git a/org.eclipse.triquetrum.rcp.feature/build.properties b/features/org.eclipse.triquetrum.rcp.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/build.properties
rename to features/org.eclipse.triquetrum.rcp.feature/build.properties
diff --git a/org.eclipse.triquetrum.rcp.feature/epl-v10.html b/features/org.eclipse.triquetrum.rcp.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.rcp.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.rcp.feature/feature.properties b/features/org.eclipse.triquetrum.rcp.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/feature.properties
rename to features/org.eclipse.triquetrum.rcp.feature/feature.properties
diff --git a/org.eclipse.triquetrum.rcp.feature/feature.xml b/features/org.eclipse.triquetrum.rcp.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/feature.xml
rename to features/org.eclipse.triquetrum.rcp.feature/feature.xml
diff --git a/org.eclipse.triquetrum.rcp.feature/license.html b/features/org.eclipse.triquetrum.rcp.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/license.html
rename to features/org.eclipse.triquetrum.rcp.feature/license.html
diff --git a/org.eclipse.triquetrum.python.actor/.gitignore b/features/org.eclipse.triquetrum.thirdparty.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/.gitignore
rename to features/org.eclipse.triquetrum.thirdparty.feature/.gitignore
diff --git a/org.eclipse.triquetrum.thirdparty.feature/.project b/features/org.eclipse.triquetrum.thirdparty.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/.project
rename to features/org.eclipse.triquetrum.thirdparty.feature/.project
diff --git a/org.eclipse.triquetrum.thirdparty.feature/build.properties b/features/org.eclipse.triquetrum.thirdparty.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/build.properties
rename to features/org.eclipse.triquetrum.thirdparty.feature/build.properties
diff --git a/org.eclipse.triquetrum.thirdparty.feature/epl-v10.html b/features/org.eclipse.triquetrum.thirdparty.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.thirdparty.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.thirdparty.feature/feature.properties b/features/org.eclipse.triquetrum.thirdparty.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/feature.properties
rename to features/org.eclipse.triquetrum.thirdparty.feature/feature.properties
diff --git a/org.eclipse.triquetrum.thirdparty.feature/feature.xml b/features/org.eclipse.triquetrum.thirdparty.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/feature.xml
rename to features/org.eclipse.triquetrum.thirdparty.feature/feature.xml
diff --git a/org.eclipse.triquetrum.thirdparty.feature/license.html b/features/org.eclipse.triquetrum.thirdparty.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/license.html
rename to features/org.eclipse.triquetrum.thirdparty.feature/license.html
diff --git a/org.eclipse.triquetrum.python.feature/.gitignore b/features/org.eclipse.triquetrum.workflow.core.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.python.feature/.gitignore
rename to features/org.eclipse.triquetrum.workflow.core.feature/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.core.feature/.project b/features/org.eclipse.triquetrum.workflow.core.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/.project
rename to features/org.eclipse.triquetrum.workflow.core.feature/.project
diff --git a/org.eclipse.triquetrum.workflow.core.feature/build.properties b/features/org.eclipse.triquetrum.workflow.core.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/build.properties
rename to features/org.eclipse.triquetrum.workflow.core.feature/build.properties
diff --git a/org.eclipse.triquetrum.workflow.core.feature/epl-v10.html b/features/org.eclipse.triquetrum.workflow.core.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.workflow.core.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.workflow.core.feature/feature.properties b/features/org.eclipse.triquetrum.workflow.core.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/feature.properties
rename to features/org.eclipse.triquetrum.workflow.core.feature/feature.properties
diff --git a/org.eclipse.triquetrum.workflow.core.feature/feature.xml b/features/org.eclipse.triquetrum.workflow.core.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/feature.xml
rename to features/org.eclipse.triquetrum.workflow.core.feature/feature.xml
diff --git a/org.eclipse.triquetrum.workflow.core.feature/license.html b/features/org.eclipse.triquetrum.workflow.core.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/license.html
rename to features/org.eclipse.triquetrum.workflow.core.feature/license.html
diff --git a/org.eclipse.triquetrum.rcp.feature/.gitignore b/features/org.eclipse.triquetrum.workflow.rcp.feature/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.rcp.feature/.gitignore
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/.project b/features/org.eclipse.triquetrum.workflow.rcp.feature/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/.project
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/.project
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/build.properties b/features/org.eclipse.triquetrum.workflow.rcp.feature/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/build.properties
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/build.properties
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/epl-v10.html b/features/org.eclipse.triquetrum.workflow.rcp.feature/epl-v10.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/epl-v10.html
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/epl-v10.html
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/feature.properties b/features/org.eclipse.triquetrum.workflow.rcp.feature/feature.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/feature.properties
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/feature.properties
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/feature.xml b/features/org.eclipse.triquetrum.workflow.rcp.feature/feature.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/feature.xml
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/feature.xml
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/license.html b/features/org.eclipse.triquetrum.workflow.rcp.feature/license.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/license.html
rename to features/org.eclipse.triquetrum.workflow.rcp.feature/license.html
diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644
index 00000000..2d7acb61
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+	initial API and implementation and/or initial documentation -->
+
+<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">
+
+	<parent>
+		<groupId>org.eclipse.triquetrum</groupId>
+		<artifactId>org.eclipse.triquetrum.build</artifactId>
+		<version>0.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.triquetrum.features</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>org.eclipse.triquetrum.core.feature</module>
+    <module>org.eclipse.triquetrum.ptolemy.feature</module>
+    <module>org.eclipse.triquetrum.python.feature</module>
+    <module>org.eclipse.triquetrum.rcp.feature</module>
+    <module>org.eclipse.triquetrum.thirdparty.feature</module>
+    <module>org.eclipse.triquetrum.workflow.core.feature</module>
+    <module>org.eclipse.triquetrum.workflow.rcp.feature</module>
+  </modules>
+	
+</project>
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index d8f726aa..5fa171f9 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -9,10 +9,7 @@
   </properties>
   
   <modelVersion>4.0.0</modelVersion>
-  <groupId>triquetrum</groupId>
-
-  <!-- Changed artifactId to org.eclipse.triquetrum.build -->
-  <!-- artifactId>triquetrum</artifactId -->
+  <groupId>org.eclipse.triquetrum</groupId>
   <artifactId>javadoc</artifactId>
 
   <version>0.2.0-SNAPSHOT</version>
@@ -21,73 +18,73 @@
   <dependencies>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.common</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.logging.dvp</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.processing.api</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.validation.api</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.actor.ui</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>    
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.api</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.editor</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.editor.palette</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
     
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.execution.impl</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.model</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.model.edit</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.model.editor</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
@@ -96,7 +93,7 @@
     <!-- Don't include org.eclipse.triquetrum.workflow.model.viewmodel, there are no .java files there -->
     
     <dependency>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.workflow.ui</artifactId>
       <version>0.2.0-SNAPSHOT</version>
     </dependency>
diff --git a/org.eclipse.triquetrum.workflow.repository.test/META-INF/MANIFEST.MF b/org.eclipse.triquetrum.workflow.repository.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 3e557f9e..00000000
--- a/org.eclipse.triquetrum.workflow.repository.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Triquetrum workflow execution tests (Incubation)
-Bundle-SymbolicName: org.eclipse.triquetrum.workflow.execution.test
-Bundle-Version: 0.2.0.qualifier
-Fragment-Host: org.eclipse.triquetrum.workflow.repository.impl.filesystem;bundle-version="0.2.0.qualifier"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: Eclipse Triquetrum
-Import-Package: junit.framework;version="4.12.0",
- org.apache.commons.io;version="2.2.0",
- org.eclipse.triquetrum.workflow.util;version="0.1.0",
- ptolemy.actor.lib;version="11.0.0",
- ptolemy.domains.sdf.kernel;version="11.0.0"
diff --git a/org.eclipse.triquetrum.workflow.repository.test/src/test/java/org/eclipse/triquetrum/workflow/execution/test/WorkFlowRepositoryTest1.java b/org.eclipse.triquetrum.workflow.repository.test/src/test/java/org/eclipse/triquetrum/workflow/execution/test/WorkFlowRepositoryTest1.java
deleted file mode 100644
index 1a2624e6..00000000
--- a/org.eclipse.triquetrum.workflow.repository.test/src/test/java/org/eclipse/triquetrum/workflow/execution/test/WorkFlowRepositoryTest1.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2016 iSencia Belgium NV.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Erwin De Ley - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.triquetrum.workflow.execution.test;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.io.FileUtils;
-import org.eclipse.triquetrum.workflow.DuplicateEntryException;
-import org.eclipse.triquetrum.workflow.EntryNotFoundException;
-import org.eclipse.triquetrum.workflow.ModelHandle;
-import org.eclipse.triquetrum.workflow.WorkflowRepositoryService;
-import org.eclipse.triquetrum.workflow.repository.impl.filesystem.WorkflowRepositoryServiceImpl;
-import org.eclipse.triquetrum.workflow.util.WorkflowUtils;
-import org.ptolemy.commons.VersionSpecification;
-
-import junit.framework.TestCase;
-import ptolemy.actor.CompositeActor;
-import ptolemy.actor.TypedCompositeActor;
-import ptolemy.actor.lib.Const;
-import ptolemy.actor.lib.Discard;
-import ptolemy.domains.sdf.kernel.SDFDirector;
-
-public class WorkFlowRepositoryTest1 extends TestCase {
-
-  private static final String HELLO_WORLD_FLOWNAME = "HelloWorld";
-  private static final String HELLO_CODE = "HELLO";
-  private static final String HELLO_CODE2 = "HELLO2";
-  private static final String HELLO_CODE3 = "HELLO3";
-
-  private static final File userHome = new File(System.getProperty("user.home"));
-  private static final File defaultRootFolderPath = new File(userHome, ".triquetrum/workflow-repository");
-  private static final String REPOS_ROOTFOLDER = System.getProperty("org.eclipse.triquetrum.workflow.repository.root", defaultRootFolderPath.getAbsolutePath());
-
-  public static WorkflowRepositoryService repositoryService;
-
-  @Override
-  protected void setUp() throws Exception {
-    if (repositoryService == null) {
-      File repositoryRootFolder = new File(REPOS_ROOTFOLDER);
-      FileUtils.deleteDirectory(repositoryRootFolder);
-      repositoryService = new WorkflowRepositoryServiceImpl(repositoryRootFolder);
-    } else {
-      // this is a bit of a hack, assuming that when we run this test on a REST client facade,
-      // the system property for the backing repos root folder has been set to the same location
-      // for the server-side and this test-client-side.
-      // we need to ensure the repos is cleared before each test, to avoid DuplicateEntryExceptions....
-      File repositoryRootFolder = new File(REPOS_ROOTFOLDER);
-      FileUtils.deleteDirectory(repositoryRootFolder);
-      repositoryRootFolder.mkdirs();
-    }
-  }
-
-  public void testCommitFlowForCode() throws Exception {
-    try {
-      ModelHandle handle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-      assertNotNull("A non-null handle should be returned", handle);
-      assertEquals("Wrong flow code", HELLO_CODE, handle.getCode());
-      assertEquals("Wrong version spec", VersionSpecification.parse("1.0.0"), handle.getVersion());
-      assertNotNull("Flow's commit resource location should be not-null", handle.getResourceLocation());
-      assertEquals("Wrong flow name", HELLO_WORLD_FLOWNAME, handle.getModel().getName());
-      assertNotNull("Committed flow shas lost its director", handle.getModel().getDirector());
-      assertNotNull("MOML should be not null", handle.getRawModelDefinition());
-      assertFalse("MOML should be not empty", handle.getRawModelDefinition().isEmpty());
-    } catch (DuplicateEntryException e) {
-      fail("First flow commit should not fail with DuplicatEntryException");
-    }
-  }
-
-  public void testDelete() throws Exception {
-    ModelHandle handle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle[] handles = repositoryService.delete(HELLO_CODE);
-    assertNotNull("Handles from delete() should be not-null", handles);
-    assertEquals("Handles from delete() should contain one entry", 1, handles.length);
-    assertEquals("Handles from delete() should contain committed flow", handle, handles[0]);
-    try {
-      repositoryService.getAllModelRevisions(HELLO_CODE);
-      fail("After deletion, no revisions should be found anymore");
-    } catch (EntryNotFoundException e) {
-      // this is what is expected
-    }
-  }
-
-  public void testGetActiveFlow() throws Exception {
-    ModelHandle commitHandle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle activeHandle = repositoryService.getActiveModel(HELLO_CODE);
-
-    assertEquals("Committed flow not returned as active flow", commitHandle, activeHandle);
-  }
-
-  public void testMostRecentFlowAfterCommit() throws Exception {
-    ModelHandle commitHandle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle mostRecentHandle = repositoryService.getMostRecentModel(HELLO_CODE);
-
-    assertEquals("Committed flow not returned as most recent flow", commitHandle, mostRecentHandle);
-  }
-
-  public void testMostRecentAfterUpdateWithActivate() throws Exception {
-    ModelHandle commitHandle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-
-    Map<String, String> paramOverrides = new HashMap<>();
-    paramOverrides.put("const.value", "12345");
-    CompositeActor f = WorkflowUtils.applyParameterSettings(commitHandle, null, paramOverrides);
-
-    ModelHandle updatedHandle = repositoryService.update(commitHandle, f, true);
-    ModelHandle mostRecentHandle = repositoryService.getMostRecentModel(HELLO_CODE);
-
-    assertFalse("Most recent handle should not be the originally committed one", mostRecentHandle.equals(commitHandle));
-    assertEquals("Most recent handle should be the updated one", updatedHandle, mostRecentHandle);
-  }
-
-  public void testMostRecentAfterUpdateWithoutActivate() throws Exception {
-    ModelHandle commitHandle = repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-
-    Map<String, String> paramOverrides = new HashMap<>();
-    paramOverrides.put("const.value", "12345");
-    CompositeActor f = WorkflowUtils.applyParameterSettings(commitHandle, null, paramOverrides);
-
-    ModelHandle updatedHandle = repositoryService.update(commitHandle, f, false);
-    ModelHandle mostRecentHandle = repositoryService.getMostRecentModel(HELLO_CODE);
-
-    assertFalse("Most recent handle should not be the originally committed one", mostRecentHandle.equals(commitHandle));
-    assertEquals("Most recent handle should be the updated one", updatedHandle, mostRecentHandle);
-  }
-
-  public void testGetAllFlowCodes() throws Exception {
-    repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    repositoryService.commit(HELLO_CODE2, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    repositoryService.commit(HELLO_CODE3, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    repositoryService.commit(buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-
-    String[] allFlowCodes = repositoryService.getAllModelCodes();
-    assertEquals("Repository should know 4 codes", 4, allFlowCodes.length);
-    List<String> codesAsList = Arrays.asList(allFlowCodes);
-    assertTrue("Repository should know " + HELLO_CODE, codesAsList.contains(HELLO_CODE));
-    assertTrue("Repository should know " + HELLO_CODE2, codesAsList.contains(HELLO_CODE2));
-    assertTrue("Repository should know " + HELLO_CODE3, codesAsList.contains(HELLO_CODE3));
-    assertTrue("Repository should know " + HELLO_WORLD_FLOWNAME, codesAsList.contains(HELLO_WORLD_FLOWNAME));
-  }
-
-  public void testUpdateAndActivation() throws Exception {
-    repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle activeHandle = repositoryService.getActiveModel(HELLO_CODE);
-
-    Map<String, String> paramOverrides = new HashMap<>();
-    paramOverrides.put("const.value", "12345");
-    CompositeActor f = WorkflowUtils.applyParameterSettings(activeHandle, null, paramOverrides);
-
-    ModelHandle updatedHandle = repositoryService.update(activeHandle, f, true);
-    ModelHandle activeHandle2 = repositoryService.getActiveModel(HELLO_CODE);
-
-    assertFalse("Updated handle should not be the previously active one", activeHandle.equals(updatedHandle));
-    assertEquals("Updated handle should be the new active one", activeHandle2, updatedHandle);
-    assertEquals("Code should remain the same for an update", activeHandle.getCode(), updatedHandle.getCode());
-    assertTrue("Version must have increased after update", updatedHandle.getVersion().compareTo(activeHandle.getVersion()) > 0);
-  }
-
-  public void testUpdateAndLaterActivation() throws Exception {
-    repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle activeHandle = repositoryService.getActiveModel(HELLO_CODE);
-
-    Map<String, String> paramOverrides = new HashMap<>();
-    paramOverrides.put("const.value", "12345");
-    CompositeActor f = WorkflowUtils.applyParameterSettings(activeHandle, null, paramOverrides);
-
-    ModelHandle updatedHandle = repositoryService.update(activeHandle, f, false);
-
-    ModelHandle previouslyActiveHandle = repositoryService.activateModelRevision(updatedHandle);
-    ModelHandle activeHandle2 = repositoryService.getActiveModel(HELLO_CODE);
-
-    assertFalse("Updated handle should not be the previously active one", activeHandle.equals(updatedHandle));
-    assertEquals("Previously active handle should be the originally committed one", activeHandle, previouslyActiveHandle);
-    assertEquals("Updated handle should be the new active one", activeHandle2, updatedHandle);
-    assertEquals("Code should remain the same for an update followed by an activation", activeHandle.getCode(), updatedHandle.getCode());
-    assertTrue("Version must have increased after update", updatedHandle.getVersion().compareTo(activeHandle.getVersion()) > 0);
-  }
-
-  public void testUpdateWithoutActivation() throws Exception {
-    repositoryService.commit(HELLO_CODE, buildTrivialFlow(HELLO_WORLD_FLOWNAME));
-    ModelHandle activeHandle = repositoryService.getActiveModel(HELLO_CODE);
-
-    Map<String, String> paramOverrides = new HashMap<>();
-    paramOverrides.put("const.value", "12345");
-    CompositeActor f = WorkflowUtils.applyParameterSettings(activeHandle, null, paramOverrides);
-
-    ModelHandle updatedHandle = repositoryService.update(activeHandle, f, false);
-    ModelHandle activeHandle2 = repositoryService.getActiveModel(HELLO_CODE);
-
-    assertFalse("Updated handle should not be the previously active one", activeHandle.equals(updatedHandle));
-    assertEquals("Code should remain the same for an update", activeHandle.getCode(), updatedHandle.getCode());
-    assertTrue("Version must have increased after update", updatedHandle.getVersion().compareTo(activeHandle.getVersion()) > 0);
-    assertEquals("Active flow should not have changed", activeHandle, activeHandle2);
-  }
-
-  public TypedCompositeActor buildTrivialFlow(String wfName) throws Exception {
-    TypedCompositeActor compositeActor = new TypedCompositeActor();
-    compositeActor.setName(wfName);
-    compositeActor.setDirector(new SDFDirector(compositeActor, "director"));
-    Const source = new Const(compositeActor, "const");
-    Discard sink = new Discard(compositeActor, "sink");
-    compositeActor.connect(source.output, sink.input);
-    return compositeActor;
-  }
-
-}
diff --git a/org.eclipse.triquetrum.processing.actor/.classpath b/plugins/core/org.eclipse.triquetrum.common/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/.classpath
rename to plugins/core/org.eclipse.triquetrum.common/.classpath
diff --git a/org.eclipse.triquetrum.common/.gitignore b/plugins/core/org.eclipse.triquetrum.common/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.common/.gitignore
rename to plugins/core/org.eclipse.triquetrum.common/.gitignore
diff --git a/org.eclipse.triquetrum.common/.project b/plugins/core/org.eclipse.triquetrum.common/.project
similarity index 100%
rename from org.eclipse.triquetrum.common/.project
rename to plugins/core/org.eclipse.triquetrum.common/.project
diff --git a/org.eclipse.triquetrum.common/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.common/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.common/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.common/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.logging.dvp/about.html b/plugins/core/org.eclipse.triquetrum.common/about.html
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/about.html
rename to plugins/core/org.eclipse.triquetrum.common/about.html
diff --git a/org.eclipse.triquetrum.common/build.properties b/plugins/core/org.eclipse.triquetrum.common/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.common/build.properties
rename to plugins/core/org.eclipse.triquetrum.common/build.properties
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Enumerated.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Enumerated.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Enumerated.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Enumerated.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCategory.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCategory.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCategory.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCategory.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCode.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCode.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCode.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ErrorCode.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Event.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Event.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Event.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/Event.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/EventListener.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/EventListener.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/EventListener.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/EventListener.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ProcessingStatus.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ProcessingStatus.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ProcessingStatus.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/ProcessingStatus.java
diff --git a/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/TriqException.java b/plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/TriqException.java
similarity index 100%
rename from org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/TriqException.java
rename to plugins/core/org.eclipse.triquetrum.common/src/main/java/org/eclipse/triquetrum/TriqException.java
diff --git a/org.eclipse.triquetrum.common/triquetrumCleanUpSettings.xml b/plugins/core/org.eclipse.triquetrum.common/triquetrumCleanUpSettings.xml
similarity index 100%
rename from org.eclipse.triquetrum.common/triquetrumCleanUpSettings.xml
rename to plugins/core/org.eclipse.triquetrum.common/triquetrumCleanUpSettings.xml
diff --git a/org.eclipse.triquetrum.common/triquetrumFormatterSettings.xml b/plugins/core/org.eclipse.triquetrum.common/triquetrumFormatterSettings.xml
similarity index 100%
rename from org.eclipse.triquetrum.common/triquetrumFormatterSettings.xml
rename to plugins/core/org.eclipse.triquetrum.common/triquetrumFormatterSettings.xml
diff --git a/org.eclipse.triquetrum.logging.dvp/.classpath b/plugins/core/org.eclipse.triquetrum.logging.dvp/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/.classpath
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/.classpath
diff --git a/org.eclipse.triquetrum.logging.dvp/.gitignore b/plugins/core/org.eclipse.triquetrum.logging.dvp/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/.gitignore
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/.gitignore
diff --git a/org.eclipse.triquetrum.logging.dvp/.project b/plugins/core/org.eclipse.triquetrum.logging.dvp/.project
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/.project
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/.project
diff --git a/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.actor/about.html b/plugins/core/org.eclipse.triquetrum.logging.dvp/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/about.html
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/about.html
diff --git a/org.eclipse.triquetrum.logging.dvp/build.properties b/plugins/core/org.eclipse.triquetrum.logging.dvp/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/build.properties
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/build.properties
diff --git a/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties b/plugins/core/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties
similarity index 100%
rename from org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties
rename to plugins/core/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties
diff --git a/org.eclipse.triquetrum.processing.api/.classpath b/plugins/core/org.eclipse.triquetrum.processing.actor/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/.classpath
rename to plugins/core/org.eclipse.triquetrum.processing.actor/.classpath
diff --git a/org.eclipse.triquetrum.repository/.gitignore b/plugins/core/org.eclipse.triquetrum.processing.actor/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.repository/.gitignore
rename to plugins/core/org.eclipse.triquetrum.processing.actor/.gitignore
diff --git a/org.eclipse.triquetrum.processing.actor/.project b/plugins/core/org.eclipse.triquetrum.processing.actor/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/.project
rename to plugins/core/org.eclipse.triquetrum.processing.actor/.project
diff --git a/org.eclipse.triquetrum.processing.actor/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.processing.actor/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.processing.actor/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.actor/META-INF/p2.inf b/plugins/core/org.eclipse.triquetrum.processing.actor/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/META-INF/p2.inf
rename to plugins/core/org.eclipse.triquetrum.processing.actor/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.processing.api/about.html b/plugins/core/org.eclipse.triquetrum.processing.actor/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/about.html
rename to plugins/core/org.eclipse.triquetrum.processing.actor/about.html
diff --git a/org.eclipse.triquetrum.processing.actor/build.properties b/plugins/core/org.eclipse.triquetrum.processing.actor/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/build.properties
rename to plugins/core/org.eclipse.triquetrum.processing.actor/build.properties
diff --git a/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/TaskBasedActor.java b/plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/TaskBasedActor.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/TaskBasedActor.java
rename to plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/TaskBasedActor.java
diff --git a/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/activator/Activator.java b/plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/activator/Activator.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/activator/Activator.java
rename to plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/activator/Activator.java
diff --git a/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/util/AttributeFromTokenBuilder.java b/plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/util/AttributeFromTokenBuilder.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/util/AttributeFromTokenBuilder.java
rename to plugins/core/org.eclipse.triquetrum.processing.actor/src/main/java/org/eclipse/triquetrum/processing/actor/util/AttributeFromTokenBuilder.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/.classpath b/plugins/core/org.eclipse.triquetrum.processing.api/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/.classpath
rename to plugins/core/org.eclipse.triquetrum.processing.api/.classpath
diff --git a/org.eclipse.triquetrum.processing.api/.gitignore b/plugins/core/org.eclipse.triquetrum.processing.api/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/.gitignore
rename to plugins/core/org.eclipse.triquetrum.processing.api/.gitignore
diff --git a/org.eclipse.triquetrum.processing.api/.project b/plugins/core/org.eclipse.triquetrum.processing.api/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/.project
rename to plugins/core/org.eclipse.triquetrum.processing.api/.project
diff --git a/org.eclipse.triquetrum.processing.api/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.processing.api/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.processing.api/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.model.impl/about.html b/plugins/core/org.eclipse.triquetrum.processing.api/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/about.html
rename to plugins/core/org.eclipse.triquetrum.processing.api/about.html
diff --git a/org.eclipse.triquetrum.processing.api/about.ini b/plugins/core/org.eclipse.triquetrum.processing.api/about.ini
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/about.ini
rename to plugins/core/org.eclipse.triquetrum.processing.api/about.ini
diff --git a/org.eclipse.triquetrum.processing.api/about.mappings b/plugins/core/org.eclipse.triquetrum.processing.api/about.mappings
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/about.mappings
rename to plugins/core/org.eclipse.triquetrum.processing.api/about.mappings
diff --git a/org.eclipse.triquetrum.processing.api/about.properties b/plugins/core/org.eclipse.triquetrum.processing.api/about.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/about.properties
rename to plugins/core/org.eclipse.triquetrum.processing.api/about.properties
diff --git a/org.eclipse.triquetrum.processing.api/build.properties b/plugins/core/org.eclipse.triquetrum.processing.api/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/build.properties
rename to plugins/core/org.eclipse.triquetrum.processing.api/build.properties
diff --git a/org.eclipse.triquetrum.processing.api/eclipse32.png b/plugins/core/org.eclipse.triquetrum.processing.api/eclipse32.png
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/eclipse32.png
rename to plugins/core/org.eclipse.triquetrum.processing.api/eclipse32.png
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ErrorCode.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ErrorCode.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ErrorCode.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ErrorCode.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ProcessingException.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ProcessingException.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ProcessingException.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/ProcessingException.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Attribute.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Attribute.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Attribute.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Attribute.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/AttributeHolder.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/AttributeHolder.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/AttributeHolder.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/AttributeHolder.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/DataType.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/DataType.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/DataType.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/DataType.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Identifiable.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Identifiable.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Identifiable.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Identifiable.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/NamedValue.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/NamedValue.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/NamedValue.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/NamedValue.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingErrorEvent.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingErrorEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingErrorEvent.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingErrorEvent.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingEvent.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingEvent.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ProcessingEvent.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultBlock.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultBlock.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultBlock.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultBlock.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultItem.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultItem.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultItem.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ResultItem.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ServiceTask.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ServiceTask.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ServiceTask.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/ServiceTask.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Task.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Task.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Task.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/Task.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactory.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactory.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactory.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactoryTracker.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactoryTracker.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactoryTracker.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/model/TriqFactoryTracker.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBroker.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBroker.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBroker.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBroker.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBrokerTracker.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBrokerTracker.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBrokerTracker.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingBrokerTracker.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingService.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingService.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingService.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskProcessingService.java
diff --git a/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskValidationService.java b/plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskValidationService.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskValidationService.java
rename to plugins/core/org.eclipse.triquetrum.processing.api/src/main/java/org/eclipse/triquetrum/processing/service/TaskValidationService.java
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/.classpath b/plugins/core/org.eclipse.triquetrum.processing.model.impl/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/.classpath
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/.classpath
diff --git a/org.eclipse.triquetrum.processing.model.impl/.gitignore b/plugins/core/org.eclipse.triquetrum.processing.model.impl/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/.gitignore
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/.gitignore
diff --git a/org.eclipse.triquetrum.processing.model.impl/.project b/plugins/core/org.eclipse.triquetrum.processing.model.impl/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/.project
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/.project
diff --git a/org.eclipse.triquetrum.processing.model.impl/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.processing.model.impl/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.model.impl/OSGI-INF/TriqFactory.xml b/plugins/core/org.eclipse.triquetrum.processing.model.impl/OSGI-INF/TriqFactory.xml
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/OSGI-INF/TriqFactory.xml
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/OSGI-INF/TriqFactory.xml
diff --git a/org.eclipse.triquetrum.processing.service.impl.example/about.html b/plugins/core/org.eclipse.triquetrum.processing.model.impl/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl.example/about.html
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/about.html
diff --git a/org.eclipse.triquetrum.processing.model.impl/build.properties b/plugins/core/org.eclipse.triquetrum.processing.model.impl/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/build.properties
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/build.properties
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AbstractIdentifiable.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AbstractIdentifiable.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AbstractIdentifiable.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AbstractIdentifiable.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeHolderImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeHolderImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeHolderImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeHolderImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/AttributeImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/NamedValueImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/NamedValueImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/NamedValueImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/NamedValueImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingErrorEventImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingErrorEventImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingErrorEventImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingErrorEventImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingEventImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingEventImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingEventImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ProcessingEventImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultBlockImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultBlockImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultBlockImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultBlockImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultItemImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultItemImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultItemImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/ResultItemImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TaskImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TaskImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TaskImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TaskImpl.java
diff --git a/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TriqFactoryImpl.java b/plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TriqFactoryImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TriqFactoryImpl.java
rename to plugins/core/org.eclipse.triquetrum.processing.model.impl/src/main/java/org/eclipse/triquetrum/processing/model/impl/TriqFactoryImpl.java
diff --git a/org.eclipse.triquetrum.processing.service.impl/.classpath b/plugins/core/org.eclipse.triquetrum.processing.service.impl/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/.classpath
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/.classpath
diff --git a/org.eclipse.triquetrum.processing.service.impl/.gitignore b/plugins/core/org.eclipse.triquetrum.processing.service.impl/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/.gitignore
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/.gitignore
diff --git a/org.eclipse.triquetrum.processing.service.impl/.project b/plugins/core/org.eclipse.triquetrum.processing.service.impl/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/.project
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/.project
diff --git a/org.eclipse.triquetrum.processing.service.impl/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.processing.service.impl/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.service.impl/META-INF/p2.inf b/plugins/core/org.eclipse.triquetrum.processing.service.impl/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/META-INF/p2.inf
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.processing.service.impl/OSGI-INF/TaskProcessingBroker.xml b/plugins/core/org.eclipse.triquetrum.processing.service.impl/OSGI-INF/TaskProcessingBroker.xml
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/OSGI-INF/TaskProcessingBroker.xml
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/OSGI-INF/TaskProcessingBroker.xml
diff --git a/org.eclipse.triquetrum.processing.service.impl/about.html b/plugins/core/org.eclipse.triquetrum.processing.service.impl/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/about.html
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/about.html
diff --git a/org.eclipse.triquetrum.processing.service.impl/build.properties b/plugins/core/org.eclipse.triquetrum.processing.service.impl/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/build.properties
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/build.properties
diff --git a/org.eclipse.triquetrum.processing.service.impl/src/main/java/org/eclipse/triquetrum/processing/service/impl/DefaultTaskProcessingBroker.java b/plugins/core/org.eclipse.triquetrum.processing.service.impl/src/main/java/org/eclipse/triquetrum/processing/service/impl/DefaultTaskProcessingBroker.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.service.impl/src/main/java/org/eclipse/triquetrum/processing/service/impl/DefaultTaskProcessingBroker.java
rename to plugins/core/org.eclipse.triquetrum.processing.service.impl/src/main/java/org/eclipse/triquetrum/processing/service/impl/DefaultTaskProcessingBroker.java
diff --git a/org.eclipse.triquetrum.python.actor/.classpath b/plugins/core/org.eclipse.triquetrum.validation.api/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/.classpath
rename to plugins/core/org.eclipse.triquetrum.validation.api/.classpath
diff --git a/org.eclipse.triquetrum.processing.test/.gitignore b/plugins/core/org.eclipse.triquetrum.validation.api/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/.gitignore
rename to plugins/core/org.eclipse.triquetrum.validation.api/.gitignore
diff --git a/org.eclipse.triquetrum.validation.api/.project b/plugins/core/org.eclipse.triquetrum.validation.api/.project
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/.project
rename to plugins/core/org.eclipse.triquetrum.validation.api/.project
diff --git a/org.eclipse.triquetrum.validation.api/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.validation.api/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.validation.api/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.processing.test/about.html b/plugins/core/org.eclipse.triquetrum.validation.api/about.html
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/about.html
rename to plugins/core/org.eclipse.triquetrum.validation.api/about.html
diff --git a/org.eclipse.triquetrum.validation.api/build.properties b/plugins/core/org.eclipse.triquetrum.validation.api/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/build.properties
rename to plugins/core/org.eclipse.triquetrum.validation.api/build.properties
diff --git a/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ErrorCode.java b/plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ErrorCode.java
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ErrorCode.java
rename to plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ErrorCode.java
diff --git a/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ValidationException.java b/plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ValidationException.java
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ValidationException.java
rename to plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/ValidationException.java
diff --git a/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/service/ValidationService.java b/plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/service/ValidationService.java
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/service/ValidationService.java
rename to plugins/core/org.eclipse.triquetrum.validation.api/src/main/java/org/eclipse/triquetrum/validation/service/ValidationService.java
diff --git a/org.eclipse.triquetrum.validation.api/.classpath b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/.classpath
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.classpath
diff --git a/org.eclipse.triquetrum.validation.api/.gitignore b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/.gitignore
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/.project b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/.project
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/.project
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.python.actor/META-INF/p2.inf b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/META-INF/p2.inf
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/OSGI-INF/AocProviderFromRepository.xml b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/OSGI-INF/AocProviderFromRepository.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/OSGI-INF/AocProviderFromRepository.xml
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/OSGI-INF/AocProviderFromRepository.xml
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/build.properties b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/build.properties
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/build.properties
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/src/main/java/org/eclipse/triquetrum/workflow/aoc/repository/AocProviderFromRepository.java b/plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/src/main/java/org/eclipse/triquetrum/workflow/aoc/repository/AocProviderFromRepository.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/src/main/java/org/eclipse/triquetrum/workflow/aoc/repository/AocProviderFromRepository.java
rename to plugins/core/org.eclipse.triquetrum.workflow.aoc.repository/src/main/java/org/eclipse/triquetrum/workflow/aoc/repository/AocProviderFromRepository.java
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/.classpath b/plugins/core/org.eclipse.triquetrum.workflow.api/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/.classpath
rename to plugins/core/org.eclipse.triquetrum.workflow.api/.classpath
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/.gitignore b/plugins/core/org.eclipse.triquetrum.workflow.api/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/.gitignore
rename to plugins/core/org.eclipse.triquetrum.workflow.api/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.api/.project b/plugins/core/org.eclipse.triquetrum.workflow.api/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/.project
rename to plugins/core/org.eclipse.triquetrum.workflow.api/.project
diff --git a/org.eclipse.triquetrum.workflow.api/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.workflow.api/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.workflow.api/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.api/OSGI-INF/WorkflowRepositoryRegistry.xml b/plugins/core/org.eclipse.triquetrum.workflow.api/OSGI-INF/WorkflowRepositoryRegistry.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/OSGI-INF/WorkflowRepositoryRegistry.xml
rename to plugins/core/org.eclipse.triquetrum.workflow.api/OSGI-INF/WorkflowRepositoryRegistry.xml
diff --git a/org.eclipse.triquetrum.python.actor.palette/about.html b/plugins/core/org.eclipse.triquetrum.workflow.api/about.html
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/about.html
rename to plugins/core/org.eclipse.triquetrum.workflow.api/about.html
diff --git a/org.eclipse.triquetrum.workflow.api/about.ini b/plugins/core/org.eclipse.triquetrum.workflow.api/about.ini
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/about.ini
rename to plugins/core/org.eclipse.triquetrum.workflow.api/about.ini
diff --git a/org.eclipse.triquetrum.python.service/about.mappings b/plugins/core/org.eclipse.triquetrum.workflow.api/about.mappings
similarity index 100%
rename from org.eclipse.triquetrum.python.service/about.mappings
rename to plugins/core/org.eclipse.triquetrum.workflow.api/about.mappings
diff --git a/org.eclipse.triquetrum.workflow.api/about.properties b/plugins/core/org.eclipse.triquetrum.workflow.api/about.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/about.properties
rename to plugins/core/org.eclipse.triquetrum.workflow.api/about.properties
diff --git a/org.eclipse.triquetrum.workflow.api/build.properties b/plugins/core/org.eclipse.triquetrum.workflow.api/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/build.properties
rename to plugins/core/org.eclipse.triquetrum.workflow.api/build.properties
diff --git a/org.eclipse.triquetrum.workflow.api/eclipse32.png b/plugins/core/org.eclipse.triquetrum.workflow.api/eclipse32.png
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/eclipse32.png
rename to plugins/core/org.eclipse.triquetrum.workflow.api/eclipse32.png
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/DuplicateEntryException.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/DuplicateEntryException.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/DuplicateEntryException.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/DuplicateEntryException.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/EntryNotFoundException.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/EntryNotFoundException.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/EntryNotFoundException.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/EntryNotFoundException.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ErrorCode.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ErrorCode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ErrorCode.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ErrorCode.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ModelHandle.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ModelHandle.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ModelHandle.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ModelHandle.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEvent.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEvent.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEvent.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEventListener.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEventListener.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEventListener.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessEventListener.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessHandle.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessHandle.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessHandle.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/ProcessHandle.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowExecutionService.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowExecutionService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowExecutionService.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowExecutionService.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowNotExecutingException.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowNotExecutingException.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowNotExecutingException.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowNotExecutingException.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryRegistry.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryRegistry.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryRegistry.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryRegistry.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryService.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryService.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/WorkflowRepositoryService.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/BreakpointSuspendEvent.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/BreakpointSuspendEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/BreakpointSuspendEvent.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/BreakpointSuspendEvent.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/ResumeEvent.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/ResumeEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/ResumeEvent.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/ResumeEvent.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/SuspendEvent.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/SuspendEvent.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/SuspendEvent.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/event/SuspendEvent.java
diff --git a/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/util/WorkflowUtils.java b/plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/util/WorkflowUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/util/WorkflowUtils.java
rename to plugins/core/org.eclipse.triquetrum.workflow.api/src/main/java/org/eclipse/triquetrum/workflow/util/WorkflowUtils.java
diff --git a/org.eclipse.triquetrum.workflow.api/.classpath b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/.classpath
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.classpath
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.gitignore b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.gitignore
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/.project b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/.project
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.project
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/.settings/org.eclipse.pde.core.prefs b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/.settings/org.eclipse.pde.core.prefs
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.python.service/META-INF/p2.inf b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.python.service/META-INF/p2.inf
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/OSGI-INF/WorkflowExecutionService.xml b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/OSGI-INF/WorkflowExecutionService.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/OSGI-INF/WorkflowExecutionService.xml
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/OSGI-INF/WorkflowExecutionService.xml
diff --git a/org.eclipse.triquetrum.python.actor/about.html b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/about.html
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/about.html
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/about.html
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/build.properties b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/build.properties
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/build.properties
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ModelHandleImpl.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ModelHandleImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ModelHandleImpl.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ModelHandleImpl.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ProcessHandleImpl.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ProcessHandleImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ProcessHandleImpl.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/ProcessHandleImpl.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/WorkflowExecutionServiceImpl.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/WorkflowExecutionServiceImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/WorkflowExecutionServiceImpl.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/WorkflowExecutionServiceImpl.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/ActorBreakpointListener.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/ActorBreakpointListener.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/ActorBreakpointListener.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/ActorBreakpointListener.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/PortBreakpointListener.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/PortBreakpointListener.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/PortBreakpointListener.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/debug/PortBreakpointListener.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/CancellableTask.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/CancellableTask.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/CancellableTask.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/CancellableTask.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionFuture.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionFuture.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionFuture.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionFuture.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionTask.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionTask.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionTask.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutionTask.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutor.java b/plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutor.java
rename to plugins/core/org.eclipse.triquetrum.workflow.execution.impl/src/main/java/org/eclipse/triquetrum/workflow/execution/impl/executor/WorkflowExecutor.java
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/.classpath b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/.classpath
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.classpath
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/.gitignore b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/.gitignore
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.project b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/.project
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.project
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/MANIFEST.MF b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/MANIFEST.MF
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/META-INF/p2.inf b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/META-INF/p2.inf
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.python.service/about.html b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/about.html
similarity index 100%
rename from org.eclipse.triquetrum.python.service/about.html
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/about.html
diff --git a/org.eclipse.triquetrum.python.actor/build.properties b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/build.properties
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/build.properties
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/ModelHandleImpl.java b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/ModelHandleImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/ModelHandleImpl.java
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/ModelHandleImpl.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryPreferencesSupplier.java b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryPreferencesSupplier.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryPreferencesSupplier.java
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryPreferencesSupplier.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryServiceImpl.java b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryServiceImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryServiceImpl.java
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/WorkflowRepositoryServiceImpl.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/activator/Activator.java b/plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/activator/Activator.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/activator/Activator.java
rename to plugins/core/org.eclipse.triquetrum.workflow.repository.impl.filesystem/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/activator/Activator.java
diff --git a/plugins/core/pom.xml b/plugins/core/pom.xml
new file mode 100644
index 00000000..3f26e77d
--- /dev/null
+++ b/plugins/core/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+	initial API and implementation and/or initial documentation -->
+
+<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">
+
+	<parent>
+		<groupId>org.eclipse.triquetrum</groupId>
+		<artifactId>org.eclipse.triquetrum.plugins</artifactId>
+		<version>0.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.triquetrum.plugins</groupId>
+	<artifactId>core</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>org.eclipse.triquetrum.common</module>
+    <module>org.eclipse.triquetrum.logging.dvp</module>
+    <module>org.eclipse.triquetrum.processing.actor</module>
+    <module>org.eclipse.triquetrum.processing.api</module>
+    <module>org.eclipse.triquetrum.processing.model.impl</module>
+    <module>org.eclipse.triquetrum.processing.service.impl</module>
+    <module>org.eclipse.triquetrum.validation.api</module>
+    <module>org.eclipse.triquetrum.workflow.aoc.repository</module>
+    <module>org.eclipse.triquetrum.workflow.api</module>
+    <module>org.eclipse.triquetrum.workflow.execution.impl</module>
+    <module>org.eclipse.triquetrum.workflow.repository.impl.filesystem</module>
+  </modules>
+	
+</project>
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.classpath
diff --git a/org.eclipse.triquetrum.workflow.api/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/.project b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/.project
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.aoc.repository/META-INF/p2.inf b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.aoc.repository/META-INF/p2.inf
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.repository/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/about.html
similarity index 100%
rename from org.eclipse.triquetrum.repository/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/about.html
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/build.properties
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/DisplayJavaSWT.java b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/DisplayJavaSWT.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/DisplayJavaSWT.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/DisplayJavaSWT.java
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/activator/Activator.java b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/activator/Activator.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/activator/Activator.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/java/org/eclipse/triquetrum/workflow/actor/ui/activator/Activator.java
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/src/main/resources/org/eclipse/triquetrum/workflow/actor/ui/ActorModule.properties b/plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/resources/org/eclipse/triquetrum/workflow/actor/ui/ActorModule.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/src/main/resources/org/eclipse/triquetrum/workflow/actor/ui/ActorModule.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.actor.ui/src/main/resources/org/eclipse/triquetrum/workflow/actor/ui/ActorModule.properties
diff --git a/org.eclipse.triquetrum.thirdparty.feature/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.thirdparty.feature/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/.project b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.project
diff --git a/org.eclipse.triquetrum.python.actor.palette/.settings/org.eclipse.pde.core.prefs b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/.settings/org.eclipse.pde.core.prefs
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/about.html
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/about.html
diff --git a/org.eclipse.triquetrum.python.actor.palette/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/build.properties
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/AddSubtractIcon.svg b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/AddSubtractIcon.svg
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/AddSubtractIcon.svg
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/AddSubtractIcon.svg
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/CSVReaderIcon.svg b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/CSVReaderIcon.svg
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/CSVReaderIcon.svg
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/CSVReaderIcon.svg
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/MovingAverageIcon.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/MovingAverageIcon.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/MovingAverageIcon.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/MovingAverageIcon.xml
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordAssemblerIcon.svg b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordAssemblerIcon.svg
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/RecordAssemblerIcon.svg
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordAssemblerIcon.svg
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordDisassemblerIcon.svg b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordDisassemblerIcon.svg
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/RecordDisassemblerIcon.svg
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/RecordDisassemblerIcon.svg
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/Sinewave.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/Sinewave.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/Sinewave.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/Sinewave.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/SinewaveIcon.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/SinewaveIcon.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/SinewaveIcon.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/SinewaveIcon.xml
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/actor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/actor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/actor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/actor.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/annotate.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/annotate.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/annotate.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/annotate.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/composite.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/composite.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/composite.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/composite.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/director.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/director.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/director.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/director.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/display.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/display.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/display.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/display.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/input.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/input.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/input.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/input.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/output.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/output.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/output.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/output.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/series.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/series.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/series.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/series.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/sink.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/sink.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/sink.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/sink.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/source.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/source.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/source.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/source.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/test.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/test.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/test.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/test.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/trash.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/trash.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/trash.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/trash.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/icons/value_field.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/value_field.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/icons/value_field.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/icons/value_field.gif
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor.palette/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.editor/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.editor/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/.classpath
diff --git a/org.eclipse.triquetrum.update/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.editor/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.update/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.editor/.project b/plugins/editor/org.eclipse.triquetrum.workflow.editor/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/.project
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/.settings/org.eclipse.pde.core.prefs b/plugins/editor/org.eclipse.triquetrum.workflow.editor/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/.settings/org.eclipse.pde.core.prefs
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.triquetrum.workflow.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.editor/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.editor/META-INF/p2.inf b/plugins/editor/org.eclipse.triquetrum.workflow.editor/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/META-INF/p2.inf
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.editor/OSGI-INF/attributesRendererService.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor/OSGI-INF/attributesRendererService.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/OSGI-INF/attributesRendererService.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/OSGI-INF/attributesRendererService.xml
diff --git a/org.eclipse.triquetrum.workflow.editor/OSGI-INF/colorRendererService.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor/OSGI-INF/colorRendererService.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/OSGI-INF/colorRendererService.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/OSGI-INF/colorRendererService.xml
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.editor/about.html
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/about.html
diff --git a/org.eclipse.triquetrum.workflow.editor/about.ini b/plugins/editor/org.eclipse.triquetrum.workflow.editor/about.ini
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/about.ini
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/about.ini
diff --git a/org.eclipse.triquetrum.workflow.api/about.mappings b/plugins/editor/org.eclipse.triquetrum.workflow.editor/about.mappings
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/about.mappings
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/about.mappings
diff --git a/org.eclipse.triquetrum.workflow.editor/about.properties b/plugins/editor/org.eclipse.triquetrum.workflow.editor/about.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/about.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/about.properties
diff --git a/org.eclipse.triquetrum.workflow.editor/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.editor/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/build.properties
diff --git a/org.eclipse.triquetrum.workflow.editor/eclipse32.png b/plugins/editor/org.eclipse.triquetrum.workflow.editor/eclipse32.png
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/eclipse32.png
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/eclipse32.png
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/actor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/actor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/actor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/actor.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/color-palette.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/color-palette.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/color-palette.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/color-palette.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/composite.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/composite.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/composite.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/composite.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/configure.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/configure.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/configure.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/configure.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/connection.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/connection.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/connection.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/connection.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/director.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/director.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/director.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/director.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/fldr_obj.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/fldr_obj.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/fldr_obj.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/fldr_obj.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/input.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/input.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/input.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/input.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/model.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/model.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/model.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/model.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/output.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/output.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/output.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/output.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/parameter.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/parameter.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/parameter.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/parameter.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/pause_workflow.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/pause_workflow.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/pause_workflow.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/pause_workflow.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/resume_workflow.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/resume_workflow.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/resume_workflow.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/resume_workflow.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/run_workflow.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/run_workflow.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/run_workflow.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/run_workflow.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/step_workflow.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/step_workflow.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/step_workflow.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/step_workflow.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/stop_workflow.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/stop_workflow.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/stop_workflow.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/stop_workflow.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/thumbnail.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/thumbnail.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/thumbnail.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/thumbnail.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/icons/tree.gif b/plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/tree.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/icons/tree.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/icons/tree.gif
diff --git a/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumDreistab_00-50px.jpg b/plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumDreistab_00-50px.jpg
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumDreistab_00-50px.jpg
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumDreistab_00-50px.jpg
diff --git a/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumScreenShot50.png b/plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumScreenShot50.png
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumScreenShot50.png
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/images/TriquetrumScreenShot50.png
diff --git a/org.eclipse.triquetrum.workflow.editor/intro/overview.css b/plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/overview.css
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/intro/overview.css
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/overview.css
diff --git a/org.eclipse.triquetrum.workflow.editor/intro/overview.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/overview.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/intro/overview.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/intro/overview.xml
diff --git a/org.eclipse.triquetrum.workflow.editor/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.editor/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.editor/plugin_customization.ini b/plugins/editor/org.eclipse.triquetrum.workflow.editor/plugin_customization.ini
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/plugin_customization.ini
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/plugin_customization.ini
diff --git a/org.eclipse.triquetrum.workflow.editor/schema/org.eclipse.triquetrum.workflow.editor.paletteContribution.exsd b/plugins/editor/org.eclipse.triquetrum.workflow.editor/schema/org.eclipse.triquetrum.workflow.editor.paletteContribution.exsd
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/schema/org.eclipse.triquetrum.workflow.editor.paletteContribution.exsd
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/schema/org.eclipse.triquetrum.workflow.editor.paletteContribution.exsd
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/BoCategory.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/BoCategory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/BoCategory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/BoCategory.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Category.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Category.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Category.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Category.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ExecutionStatusManager.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ExecutionStatusManager.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ExecutionStatusManager.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ExecutionStatusManager.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageConstants.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageConstants.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageConstants.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageConstants.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/ImageProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Messages.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Messages.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Messages.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/Messages.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/PortCategory.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/PortCategory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/PortCategory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/PortCategory.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramBehavior.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramBehavior.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramBehavior.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramBehavior.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramEditor.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramEditor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramEditor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramEditor.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramTypeProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramTypeProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramTypeProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqDiagramTypeProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqEditorPlugin.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqEditorPlugin.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqEditorPlugin.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqEditorPlugin.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqFeatureProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqFeatureProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqFeatureProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqFeatureProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqToolBehaviorProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqToolBehaviorProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqToolBehaviorProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/TriqToolBehaviorProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/actions/RunAction.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/actions/RunAction.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/actions/RunAction.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/actions/RunAction.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AbstractExecutionManagementFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AbstractExecutionManagementFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AbstractExecutionManagementFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AbstractExecutionManagementFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorDeleteFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorDeleteFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorDeleteFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorDeleteFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorUpdateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorUpdateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorUpdateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ActorUpdateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationChangeColorFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationChangeColorFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationChangeColorFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationChangeColorFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationResizeFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationResizeFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationResizeFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationResizeFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationUpdateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationUpdateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationUpdateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/AnnotationUpdateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorCollapseExpandFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorCollapseExpandFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorCollapseExpandFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/CompositeActorCollapseExpandFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionCreateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionCreateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionCreateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionCreateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionDeleteFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionDeleteFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionDeleteFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionDeleteFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionReconnectFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionReconnectFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionReconnectFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionReconnectFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionRemoveFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionRemoveFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionRemoveFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ConnectionRemoveFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorUpdateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorUpdateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorUpdateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/DirectorUpdateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/FeatureConstants.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/FeatureConstants.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/FeatureConstants.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/FeatureConstants.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementConfigureFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementConfigureFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementConfigureFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementConfigureFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCopyFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCopyFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCopyFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCopyFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCreateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCreateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCreateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementCreateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementLayoutFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementLayoutFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementLayoutFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementLayoutFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementNameDirectEditFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementNameDirectEditFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementNameDirectEditFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementNameDirectEditFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementPasteFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementPasteFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementPasteFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementPasteFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementResizeFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementResizeFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementResizeFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ModelElementResizeFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterUpdateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterUpdateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterUpdateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ParameterUpdateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PauseFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PauseFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PauseFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PauseFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PortUpdateFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PortUpdateFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PortUpdateFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/PortUpdateFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ResumeFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ResumeFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ResumeFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/ResumeFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/RunFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/RunFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/RunFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/RunFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/StopFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/StopFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/StopFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/StopFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/VertexAddFeature.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/VertexAddFeature.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/VertexAddFeature.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/features/VertexAddFeature.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRenderer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRenderer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRenderer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRenderer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRendererService.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRendererService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRendererService.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/AttributesControlSWTRendererService.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlRenderer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlRenderer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlRenderer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlRenderer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlSWTRendererService.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlSWTRendererService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlSWTRendererService.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/form/controls/ColorControlSWTRendererService.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/DiagramEditorOutlinePage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/DiagramEditorOutlinePage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/DiagramEditorOutlinePage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/DiagramEditorOutlinePage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineContainerEditPart.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineContainerEditPart.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineContainerEditPart.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineContainerEditPart.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineEditPart.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineEditPart.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineEditPart.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlineEditPart.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlinePartFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlinePartFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlinePartFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/OutlinePartFactory.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/TriqOutlineTreeViewer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/TriqOutlineTreeViewer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/TriqOutlineTreeViewer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/outline/tree/TriqOutlineTreeViewer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/LibraryManager.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/LibraryManager.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/LibraryManager.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/LibraryManager.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/PaletteTreeNode.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/PaletteTreeNode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/PaletteTreeNode.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/PaletteTreeNode.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteBehavior.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteBehavior.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteBehavior.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteBehavior.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteRoot.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteRoot.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteRoot.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/TriqPaletteRoot.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/UserLibraryPaletteEntryProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/UserLibraryPaletteEntryProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/UserLibraryPaletteEntryProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/UserLibraryPaletteEntryProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteConfigurationElement.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteConfigurationElement.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteConfigurationElement.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteConfigurationElement.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteEntryProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteEntryProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteEntryProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/spi/PaletteEntryProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteEntryEditPart.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteEntryEditPart.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteEntryEditPart.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteEntryEditPart.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteLabelProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteLabelProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteLabelProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteLabelProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeEditPartFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeEditPartFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeEditPartFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeEditPartFactory.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeNodeEditPart.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeNodeEditPart.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeNodeEditPart.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeNodeEditPart.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewerProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewerProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewerProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/PaletteTreeViewerProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransfer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransfer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransfer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransfer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransferDragListener.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransferDragListener.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransferDragListener.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/palette/ui/TreeViewerTransferDragListener.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/preferences/ui/TriqPreferencePage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/preferences/ui/TriqPreferencePage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/preferences/ui/TriqPreferencePage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/preferences/ui/TriqPreferencePage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjFilter.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjFilter.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjFilter.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjFilter.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjSection.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjSection.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjSection.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/properties/TriqNamedObjSection.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/AbstractCustomModelElementShape.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/AbstractCustomModelElementShape.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/AbstractCustomModelElementShape.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/AbstractCustomModelElementShape.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ActorShapes.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ActorShapes.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ActorShapes.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ActorShapes.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/PortShapes.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/PortShapes.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/PortShapes.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/PortShapes.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ShapeUtils.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ShapeUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ShapeUtils.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ShapeUtils.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGarFactorytracker.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGarFactorytracker.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGarFactorytracker.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGarFactorytracker.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGraphicsAlgorithmRendererFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGraphicsAlgorithmRendererFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGraphicsAlgorithmRendererFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/TriqGraphicsAlgorithmRendererFactory.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/AbstractDrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/AbstractDrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/AbstractDrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/AbstractDrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/DrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/DrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/DrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/DrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/ImageDrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/ImageDrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/ImageDrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/ImageDrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/LineDrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/LineDrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/LineDrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/LineDrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/PtolemyModelElementShape.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/PtolemyModelElementShape.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/PtolemyModelElementShape.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/PtolemyModelElementShape.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/RectangleDrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/RectangleDrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/RectangleDrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/RectangleDrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/TextDrawingStrategy.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/TextDrawingStrategy.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/TextDrawingStrategy.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/ptolemy/TextDrawingStrategy.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SVGFigure.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SVGFigure.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SVGFigure.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SVGFigure.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SimpleImageTranscoder.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SimpleImageTranscoder.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SimpleImageTranscoder.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SimpleImageTranscoder.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SvgModelElementShape.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SvgModelElementShape.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SvgModelElementShape.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/shapes/svg/SvgModelElementShape.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/BuildDiagramElementsFromPtolemyElementCommand.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/BuildDiagramElementsFromPtolemyElementCommand.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/BuildDiagramElementsFromPtolemyElementCommand.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/BuildDiagramElementsFromPtolemyElementCommand.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EclipseUtils.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EclipseUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EclipseUtils.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EclipseUtils.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EditorUtils.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EditorUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EditorUtils.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/EditorUtils.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/FileService.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/FileService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/FileService.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/FileService.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/PortAnchorPair.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/PortAnchorPair.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/PortAnchorPair.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/util/PortAnchorPair.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/NamedObjDialog.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/NamedObjDialog.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/NamedObjDialog.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/NamedObjDialog.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqReferenceService.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqReferenceService.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqReferenceService.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqReferenceService.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqSelectionSynchronizer.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqSelectionSynchronizer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqSelectionSynchronizer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/views/TriqSelectionSynchronizer.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/AbstractWizardPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/AbstractWizardPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/AbstractWizardPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/AbstractWizardPage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/CreateDiagramWizard.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/CreateDiagramWizard.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/CreateDiagramWizard.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/CreateDiagramWizard.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramNameWizardPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramNameWizardPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramNameWizardPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramNameWizardPage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramTypeWizardPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramTypeWizardPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramTypeWizardPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/DiagramTypeWizardPage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizard.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizard.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizard.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizard.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizardPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizardPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizardPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ExportToMomlWizardPage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/FillDiagramFromPtolemyModelCommand.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/FillDiagramFromPtolemyModelCommand.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/FillDiagramFromPtolemyModelCommand.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/FillDiagramFromPtolemyModelCommand.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ITextProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ITextProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ITextProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ITextProvider.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizard.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizard.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizard.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizard.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizardPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizardPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizardPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/ImportFromMomlWizardPage.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/MomlExportOperation.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/MomlExportOperation.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/MomlExportOperation.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/MomlExportOperation.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/WizardUtils.java b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/WizardUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/WizardUtils.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/java/org/eclipse/triquetrum/workflow/editor/wizard/WizardUtils.java
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/resources/helloworld.moml b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/resources/helloworld.moml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/resources/helloworld.moml
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/resources/helloworld.moml
diff --git a/org.eclipse.triquetrum.workflow.editor/src/main/resources/messages.properties b/plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/resources/messages.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/src/main/resources/messages.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.editor/src/main/resources/messages.properties
diff --git a/org.eclipse.triquetrum.workflow.model.edit/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.classpath
diff --git a/org.eclipse.triquetrum.workflow.core.feature/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.core.feature/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.model.edit/.project b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/.project
diff --git a/org.eclipse.triquetrum.workflow.model.edit/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.target.platform/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/about.html
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/about.html
diff --git a/org.eclipse.triquetrum.workflow.model.edit/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/build.properties
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeActor_director_Director.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeActor_director_Director.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeActor_director_Director.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeActor_director_Director.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Actor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Actor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Actor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Actor.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeActor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeActor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeActor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeActor.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeEntity.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeEntity.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeEntity.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_CompositeEntity.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Entity.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Entity.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Entity.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_entities_Entity.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_relations_Relation.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_relations_Relation.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_relations_Relation.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateCompositeEntity_relations_Relation.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_inputPorts_Port.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_inputPorts_Port.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_inputPorts_Port.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_inputPorts_Port.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_outputPorts_Port.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_outputPorts_Port.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_outputPorts_Port.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_outputPorts_Port.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_parameters_Parameter.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_parameters_Parameter.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_parameters_Parameter.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_parameters_Parameter.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_ports_Port.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_ports_Port.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_ports_Port.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateEntity_ports_Port.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Annotation.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Annotation.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Annotation.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Annotation.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Attribute.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Attribute.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Attribute.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Attribute.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Director.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Director.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Director.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Director.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Location.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Location.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Location.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Location.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Parameter.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Parameter.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Parameter.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Parameter.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Vertex.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Vertex.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Vertex.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/ctool16/CreateNamedObj_attributes_Vertex.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Actor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Actor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Actor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Actor.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Annotation.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Annotation.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Annotation.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Annotation.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Attribute.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Attribute.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Attribute.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Attribute.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeActor.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeActor.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeActor.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeActor.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeEntity.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeEntity.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeEntity.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/CompositeEntity.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Director.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Director.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Director.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Director.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Entity.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Entity.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Entity.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Entity.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Location.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Location.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Location.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Location.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/NamedObj.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/NamedObj.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/NamedObj.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/NamedObj.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Parameter.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Parameter.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Parameter.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Parameter.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Port.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Port.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Port.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Port.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Relation.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Relation.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Relation.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Relation.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Vertex.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Vertex.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Vertex.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/icons/full/obj16/Vertex.gif
diff --git a/org.eclipse.triquetrum.workflow.model.edit/plugin.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/plugin.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/plugin.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/plugin.properties
diff --git a/org.eclipse.triquetrum.workflow.model.edit/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ActorItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ActorItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ActorItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ActorItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AnnotationItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AnnotationItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AnnotationItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AnnotationItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AttributeItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AttributeItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AttributeItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/AttributeItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeActorItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeActorItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeActorItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeActorItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeEntityItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeEntityItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeEntityItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/CompositeEntityItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/DirectorItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/DirectorItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/DirectorItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/DirectorItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/EntityItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/EntityItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/EntityItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/EntityItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/LocationItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/LocationItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/LocationItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/LocationItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/NamedObjItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/NamedObjItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/NamedObjItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/NamedObjItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ParameterItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ParameterItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ParameterItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/ParameterItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/PortItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/PortItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/PortItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/PortItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/RelationItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/RelationItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/RelationItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/RelationItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriqItemProviderAdapterFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriqItemProviderAdapterFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriqItemProviderAdapterFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriqItemProviderAdapterFactory.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriquetrumEditPlugin.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriquetrumEditPlugin.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriquetrumEditPlugin.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/TriquetrumEditPlugin.java
diff --git a/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/VertexItemProvider.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/VertexItemProvider.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/VertexItemProvider.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.edit/src/main/java/org/eclipse/triquetrum/workflow/model/provider/VertexItemProvider.java
diff --git a/org.eclipse.triquetrum.workflow.model.editor/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.classpath
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.model.editor/.project b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/.project
diff --git a/org.eclipse.triquetrum.workflow.model.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.validation.api/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/about.html
similarity index 100%
rename from org.eclipse.triquetrum.validation.api/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/about.html
diff --git a/org.eclipse.triquetrum.workflow.model.editor/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/build.properties
diff --git a/org.eclipse.triquetrum.workflow.model.editor/icons/full/obj16/TriqModelFile.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/icons/full/obj16/TriqModelFile.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/icons/full/obj16/TriqModelFile.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/icons/full/obj16/TriqModelFile.gif
diff --git a/org.eclipse.triquetrum.workflow.model.editor/icons/full/wizban/NewTriq.gif b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/icons/full/wizban/NewTriq.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/icons/full/wizban/NewTriq.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/icons/full/wizban/NewTriq.gif
diff --git a/org.eclipse.triquetrum.workflow.model.editor/plugin.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/plugin.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/plugin.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/plugin.properties
diff --git a/org.eclipse.triquetrum.workflow.model.editor/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqActionBarContributor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqActionBarContributor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqActionBarContributor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqActionBarContributor.java
diff --git a/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqEditor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqEditor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqEditor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqEditor.java
diff --git a/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqModelWizard.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqModelWizard.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqModelWizard.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriqModelWizard.java
diff --git a/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorAdvisor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorAdvisor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorAdvisor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorAdvisor.java
diff --git a/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorPlugin.java b/plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorPlugin.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorPlugin.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.editor/src/main/java/org/eclipse/triquetrum/workflow/model/presentation/TriquetrumEditorPlugin.java
diff --git a/org.eclipse.triquetrum.workflow.editor/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/.project b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/.project
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.actor.ui/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.actor.ui/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/about.html
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/build.properties
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Actor.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Actor.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Actor.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Actor.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Annotation.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Annotation.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Annotation.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Annotation.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Attribute.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Attribute.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Attribute.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Attribute.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/CompositeActor.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/CompositeActor.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/CompositeActor.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/CompositeActor.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Director.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Director.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Director.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Director.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Parameter.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Parameter.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Parameter.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Parameter.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Port.view b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Port.view
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Port.view
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/Port.view
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/TableValidationColumnOff.template b/plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/TableValidationColumnOff.template
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/TableValidationColumnOff.template
rename to plugins/editor/org.eclipse.triquetrum.workflow.model.viewmodel/viewmodels/TableValidationColumnOff.template
diff --git a/org.eclipse.triquetrum.workflow.model/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.model/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/.classpath
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.model/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.model/.project b/plugins/editor/org.eclipse.triquetrum.workflow.model/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/.project
diff --git a/org.eclipse.triquetrum.workflow.model/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.model/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.api/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.model/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.api/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/about.html
diff --git a/org.eclipse.triquetrum.workflow.model/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/build.properties
diff --git a/org.eclipse.triquetrum.workflow.model/model/triquetrum.ecore b/plugins/editor/org.eclipse.triquetrum.workflow.model/model/triquetrum.ecore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/model/triquetrum.ecore
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/model/triquetrum.ecore
diff --git a/org.eclipse.triquetrum.workflow.model/model/triquetrum.genmodel b/plugins/editor/org.eclipse.triquetrum.workflow.model/model/triquetrum.genmodel
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/model/triquetrum.genmodel
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/model/triquetrum.genmodel
diff --git a/org.eclipse.triquetrum.workflow.model/plugin.properties b/plugins/editor/org.eclipse.triquetrum.workflow.model/plugin.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/plugin.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/plugin.properties
diff --git a/org.eclipse.triquetrum.workflow.model/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.model/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Actor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Actor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Actor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Actor.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Annotation.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Annotation.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Annotation.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Annotation.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Attribute.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Attribute.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Attribute.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Attribute.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeActor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeActor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeActor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeActor.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeEntity.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeEntity.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeEntity.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/CompositeEntity.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Direction.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Direction.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Direction.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Direction.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Director.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Director.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Director.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Director.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Entity.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Entity.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Entity.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Entity.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Linkable.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Linkable.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Linkable.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Linkable.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Location.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Location.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Location.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Location.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/NamedObj.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/NamedObj.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/NamedObj.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/NamedObj.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Parameter.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Parameter.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Parameter.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Parameter.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Port.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Port.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Port.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Port.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Relation.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Relation.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Relation.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Relation.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqFactory.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqPackage.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqPackage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqPackage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/TriqPackage.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Vertex.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Vertex.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Vertex.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/Vertex.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ActorImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ActorImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ActorImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ActorImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AnnotationImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AnnotationImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AnnotationImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AnnotationImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AttributeImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AttributeImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AttributeImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/AttributeImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeActorImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeActorImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeActorImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeActorImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeEntityImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeEntityImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeEntityImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/CompositeEntityImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/DirectorImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/DirectorImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/DirectorImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/DirectorImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/EntityImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/EntityImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/EntityImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/EntityImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/LocationImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/LocationImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/LocationImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/LocationImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/NamedObjImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/NamedObjImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/NamedObjImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/NamedObjImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ParameterImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ParameterImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ParameterImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/ParameterImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/PortImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/PortImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/PortImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/PortImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/RelationImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/RelationImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/RelationImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/RelationImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqFactoryImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqFactoryImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqFactoryImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqFactoryImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqPackageImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqPackageImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqPackageImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/TriqPackageImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/VertexImpl.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/VertexImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/VertexImpl.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/impl/VertexImpl.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderAndApplierVisitor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderAndApplierVisitor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderAndApplierVisitor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderAndApplierVisitor.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderVisitor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderVisitor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderVisitor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectBuilderVisitor.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectLinkerVisitor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectLinkerVisitor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectLinkerVisitor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtObjectLinkerVisitor.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtolemyUtil.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtolemyUtil.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtolemyUtil.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/PtolemyUtil.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/RemoveGraphicalClassesForTriquetrum.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/RemoveGraphicalClassesForTriquetrum.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/RemoveGraphicalClassesForTriquetrum.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/RemoveGraphicalClassesForTriquetrum.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/SubstituteClassesForTriquetrum.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/SubstituteClassesForTriquetrum.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/SubstituteClassesForTriquetrum.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/SubstituteClassesForTriquetrum.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqAdapterFactory.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqAdapterFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqAdapterFactory.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqAdapterFactory.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqSwitch.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqSwitch.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqSwitch.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/TriqSwitch.java
diff --git a/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/Visitor.java b/plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/Visitor.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/Visitor.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.model/src/main/java/org/eclipse/triquetrum/workflow/model/util/Visitor.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.classpath
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.project b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/.project
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/META-INF/p2.inf b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/META-INF/p2.inf
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/about.html
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/build.properties
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferenceInitializer.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferenceInitializer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferenceInitializer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferenceInitializer.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferencePage.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferencePage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferencePage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryPreferencePage.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryUIPlugin.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryUIPlugin.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryUIPlugin.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/impl/filesystem/preferences/ui/WorkflowRepositoryUIPlugin.java
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.classpath
diff --git a/org.eclipse.triquetrum.workflow.model.edit/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/.project b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.project
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.editor/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/about.html
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/build.properties
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/activate.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/activate.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/activate.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/activate.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/delete.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/delete.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/delete.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/delete.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/import.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/import.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/import.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/import.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/model.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/model.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/model.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/model.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/repositories.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/repositories.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/repositories.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/repositories.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/repository.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/repository.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/repository.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/repository.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/icons/version.gif b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/version.gif
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/icons/version.gif
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/icons/version.gif
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/plugin.xml b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/plugin.xml
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/RepositoryPlugin.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/RepositoryPlugin.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/RepositoryPlugin.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/RepositoryPlugin.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/properties/ModelPropertyPage.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/properties/ModelPropertyPage.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/properties/ModelPropertyPage.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/properties/ModelPropertyPage.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/AbstractTreeNode.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/AbstractTreeNode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/AbstractTreeNode.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/AbstractTreeNode.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelCodeTreeNode.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelCodeTreeNode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelCodeTreeNode.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelCodeTreeNode.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelHandleTreeNode.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelHandleTreeNode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelHandleTreeNode.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/ModelHandleTreeNode.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryTreeNode.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryTreeNode.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryTreeNode.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryTreeNode.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryView.java b/plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryView.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryView.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.repository.ui/src/main/java/org/eclipse/triquetrum/workflow/repository/ui/views/WorkflowRepositoryView.java
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/.classpath b/plugins/editor/org.eclipse.triquetrum.workflow.ui/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/.classpath
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/.classpath
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/.gitignore b/plugins/editor/org.eclipse.triquetrum.workflow.ui/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/.gitignore
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.ui/.project b/plugins/editor/org.eclipse.triquetrum.workflow.ui/.project
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/.project
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/.project
diff --git a/org.eclipse.triquetrum.workflow.ui/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.triquetrum.workflow.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/META-INF/MANIFEST.MF
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/p2.inf b/plugins/editor/org.eclipse.triquetrum.workflow.ui/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/META-INF/p2.inf
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.execution.impl/about.html b/plugins/editor/org.eclipse.triquetrum.workflow.ui/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.execution.impl/about.html
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/about.html
diff --git a/org.eclipse.triquetrum.workflow.ui/build.properties b/plugins/editor/org.eclipse.triquetrum.workflow.ui/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/build.properties
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/build.properties
diff --git a/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/AbstractPlaceableSWT.java b/plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/AbstractPlaceableSWT.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/AbstractPlaceableSWT.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/AbstractPlaceableSWT.java
diff --git a/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SWTContainer.java b/plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SWTContainer.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SWTContainer.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SWTContainer.java
diff --git a/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SizeAttribute.java b/plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SizeAttribute.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SizeAttribute.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/SizeAttribute.java
diff --git a/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/WindowPropertiesAttribute.java b/plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/WindowPropertiesAttribute.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/WindowPropertiesAttribute.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/WindowPropertiesAttribute.java
diff --git a/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/activator/Activator.java b/plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/activator/Activator.java
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/activator/Activator.java
rename to plugins/editor/org.eclipse.triquetrum.workflow.ui/src/main/java/org/eclipse/triquetrum/workflow/ui/activator/Activator.java
diff --git a/plugins/editor/pom.xml b/plugins/editor/pom.xml
new file mode 100644
index 00000000..e700bdee
--- /dev/null
+++ b/plugins/editor/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+	initial API and implementation and/or initial documentation -->
+
+<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">
+
+	<parent>
+		<groupId>org.eclipse.triquetrum</groupId>
+		<artifactId>org.eclipse.triquetrum.plugins</artifactId>
+		<version>0.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.triquetrum.plugins</groupId>
+	<artifactId>editor</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>org.eclipse.triquetrum.workflow.actor.ui</module>
+    <module>org.eclipse.triquetrum.workflow.editor</module>
+    <module>org.eclipse.triquetrum.workflow.editor.palette</module>
+    <module>org.eclipse.triquetrum.workflow.model</module>
+    <module>org.eclipse.triquetrum.workflow.model.edit</module>
+    <module>org.eclipse.triquetrum.workflow.model.editor</module>
+    <module>org.eclipse.triquetrum.workflow.model.viewmodel</module>
+    <module>org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui</module>
+    <module>org.eclipse.triquetrum.workflow.repository.ui</module>
+    <module>org.eclipse.triquetrum.workflow.ui</module>
+  </modules>
+	
+</project>
diff --git a/org.eclipse.triquetrum.workflow.model.editor/.gitignore b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/.gitignore
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/.gitignore
diff --git a/org.eclipse.triquetrum.python.actor.palette/.project b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/.project
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/.project
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/.project
diff --git a/org.eclipse.triquetrum.workflow.editor/.settings/org.eclipse.pde.core.prefs b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/.settings/org.eclipse.pde.core.prefs
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.triquetrum.python.actor.palette/META-INF/MANIFEST.MF b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/META-INF/MANIFEST.MF
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.model.edit/about.html b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.edit/about.html
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/about.html
diff --git a/org.eclipse.triquetrum.workflow.editor.palette/build.properties b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor.palette/build.properties
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/build.properties
diff --git a/org.eclipse.triquetrum.python.actor.palette/icons/python16.png b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/icons/python16.png
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/icons/python16.png
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/icons/python16.png
diff --git a/org.eclipse.triquetrum.python.actor.palette/plugin.xml b/plugins/extras/org.eclipse.triquetrum.python.actor.palette/plugin.xml
similarity index 100%
rename from org.eclipse.triquetrum.python.actor.palette/plugin.xml
rename to plugins/extras/org.eclipse.triquetrum.python.actor.palette/plugin.xml
diff --git a/org.eclipse.triquetrum.workflow.ui/.classpath b/plugins/extras/org.eclipse.triquetrum.python.actor/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/.classpath
rename to plugins/extras/org.eclipse.triquetrum.python.actor/.classpath
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/.gitignore b/plugins/extras/org.eclipse.triquetrum.python.actor/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/.gitignore
rename to plugins/extras/org.eclipse.triquetrum.python.actor/.gitignore
diff --git a/org.eclipse.triquetrum.python.actor/.project b/plugins/extras/org.eclipse.triquetrum.python.actor/.project
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/.project
rename to plugins/extras/org.eclipse.triquetrum.python.actor/.project
diff --git a/org.eclipse.triquetrum.python.actor/META-INF/MANIFEST.MF b/plugins/extras/org.eclipse.triquetrum.python.actor/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/META-INF/MANIFEST.MF
rename to plugins/extras/org.eclipse.triquetrum.python.actor/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/p2.inf b/plugins/extras/org.eclipse.triquetrum.python.actor/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/META-INF/p2.inf
rename to plugins/extras/org.eclipse.triquetrum.python.actor/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.model.editor/about.html b/plugins/extras/org.eclipse.triquetrum.python.actor/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.editor/about.html
rename to plugins/extras/org.eclipse.triquetrum.python.actor/about.html
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/build.properties b/plugins/extras/org.eclipse.triquetrum.python.actor/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/build.properties
rename to plugins/extras/org.eclipse.triquetrum.python.actor/build.properties
diff --git a/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/Activator.java b/plugins/extras/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/Activator.java
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/Activator.java
rename to plugins/extras/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/Activator.java
diff --git a/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/PythonActor.java b/plugins/extras/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/PythonActor.java
similarity index 100%
rename from org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/PythonActor.java
rename to plugins/extras/org.eclipse.triquetrum.python.actor/src/main/java/org/eclipse/triquetrum/python/actor/activator/PythonActor.java
diff --git a/org.eclipse.triquetrum.python.service/.classpath b/plugins/extras/org.eclipse.triquetrum.python.service/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.classpath
rename to plugins/extras/org.eclipse.triquetrum.python.service/.classpath
diff --git a/org.eclipse.triquetrum.python.service/.gitignore b/plugins/extras/org.eclipse.triquetrum.python.service/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.gitignore
rename to plugins/extras/org.eclipse.triquetrum.python.service/.gitignore
diff --git a/org.eclipse.triquetrum.python.service/.project b/plugins/extras/org.eclipse.triquetrum.python.service/.project
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.project
rename to plugins/extras/org.eclipse.triquetrum.python.service/.project
diff --git a/org.eclipse.triquetrum.python.service/.pydevproject b/plugins/extras/org.eclipse.triquetrum.python.service/.pydevproject
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.pydevproject
rename to plugins/extras/org.eclipse.triquetrum.python.service/.pydevproject
diff --git a/org.eclipse.triquetrum.python.service/.settings/org.eclipse.core.resources.prefs b/plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.settings/org.eclipse.core.resources.prefs
rename to plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.core.prefs b/plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.core.prefs
rename to plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.ui.prefs b/plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.triquetrum.python.service/.settings/org.eclipse.m2e.core.prefs b/plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.python.service/.settings/org.eclipse.m2e.core.prefs
rename to plugins/extras/org.eclipse.triquetrum.python.service/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.triquetrum.python.service/META-INF/MANIFEST.MF b/plugins/extras/org.eclipse.triquetrum.python.service/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.python.service/META-INF/MANIFEST.MF
rename to plugins/extras/org.eclipse.triquetrum.python.service/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.ui/META-INF/p2.inf b/plugins/extras/org.eclipse.triquetrum.python.service/META-INF/p2.inf
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/META-INF/p2.inf
rename to plugins/extras/org.eclipse.triquetrum.python.service/META-INF/p2.inf
diff --git a/org.eclipse.triquetrum.workflow.model.viewmodel/about.html b/plugins/extras/org.eclipse.triquetrum.python.service/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model.viewmodel/about.html
rename to plugins/extras/org.eclipse.triquetrum.python.service/about.html
diff --git a/org.eclipse.triquetrum.python.service/about.ini b/plugins/extras/org.eclipse.triquetrum.python.service/about.ini
similarity index 100%
rename from org.eclipse.triquetrum.python.service/about.ini
rename to plugins/extras/org.eclipse.triquetrum.python.service/about.ini
diff --git a/org.eclipse.triquetrum.workflow.editor/about.mappings b/plugins/extras/org.eclipse.triquetrum.python.service/about.mappings
similarity index 100%
rename from org.eclipse.triquetrum.workflow.editor/about.mappings
rename to plugins/extras/org.eclipse.triquetrum.python.service/about.mappings
diff --git a/org.eclipse.triquetrum.python.service/about.properties b/plugins/extras/org.eclipse.triquetrum.python.service/about.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.service/about.properties
rename to plugins/extras/org.eclipse.triquetrum.python.service/about.properties
diff --git a/org.eclipse.triquetrum.python.service/build.properties b/plugins/extras/org.eclipse.triquetrum.python.service/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.python.service/build.properties
rename to plugins/extras/org.eclipse.triquetrum.python.service/build.properties
diff --git a/org.eclipse.triquetrum.python.service/python32.png b/plugins/extras/org.eclipse.triquetrum.python.service/python32.png
similarity index 100%
rename from org.eclipse.triquetrum.python.service/python32.png
rename to plugins/extras/org.eclipse.triquetrum.python.service/python32.png
diff --git a/org.eclipse.triquetrum.python.service/scripts/python_service_runscript.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/python_service_runscript.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/python_service_runscript.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/python_service_runscript.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/__init__.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/__init__.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/__init__.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/__init__.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/flatten.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/flatten.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/flatten.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/flatten.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/__init__.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/__init__.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/__init__.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/__init__.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyflatten.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyflatten.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyflatten.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyflatten.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyrpc.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyrpc.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyrpc.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pyrpc.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pywrapper.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pywrapper.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pywrapper.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/python/pywrapper.py
diff --git a/org.eclipse.triquetrum.python.service/scripts/scisoftpy/rpc.py b/plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/rpc.py
similarity index 100%
rename from org.eclipse.triquetrum.python.service/scripts/scisoftpy/rpc.py
rename to plugins/extras/org.eclipse.triquetrum.python.service/scripts/scisoftpy/rpc.py
diff --git a/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/PythonService.java b/plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/PythonService.java
similarity index 100%
rename from org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/PythonService.java
rename to plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/PythonService.java
diff --git a/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/NetUtils.java b/plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/NetUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/NetUtils.java
rename to plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/NetUtils.java
diff --git a/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/PythonUtils.java b/plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/PythonUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/PythonUtils.java
rename to plugins/extras/org.eclipse.triquetrum.python.service/src/main/java/org/eclipse/triquetrum/python/service/util/PythonUtils.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.classpath b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.classpath
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.classpath
diff --git a/org.eclipse.triquetrum.workflow.model/.gitignore b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/.gitignore
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.gitignore
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.project b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.project
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.project
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.project
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.core.resources.prefs b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.core.resources.prefs
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.core.prefs b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.core.prefs
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.ui.prefs b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.m2e.core.prefs b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.m2e.core.prefs
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/.settings/org.eclipse.m2e.core.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/META-INF/MANIFEST.MF b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/META-INF/MANIFEST.MF
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.model/about.html b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.model/about.html
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/about.html
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/build.properties b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/build.properties
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/build.properties
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AbstractAnalysisRpcGenericDispatcher.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AbstractAnalysisRpcGenericDispatcher.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AbstractAnalysisRpcGenericDispatcher.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AbstractAnalysisRpcGenericDispatcher.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcClient.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcClient.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcClient.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcClient.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcException.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcException.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcException.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcException.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericInstanceDispatcher.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericInstanceDispatcher.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericInstanceDispatcher.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericInstanceDispatcher.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericStaticClassDispatcher.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericStaticClassDispatcher.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericStaticClassDispatcher.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcGenericStaticClassDispatcher.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteException.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteException.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteException.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteException.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcServer.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcServer.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcServer.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcServer.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/FlatteningService.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/FlatteningService.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/FlatteningService.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/FlatteningService.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/IAnalysisRpcHandler.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/IAnalysisRpcHandler.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/IAnalysisRpcHandler.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/IAnalysisRpcHandler.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattener.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattener.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattener.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattener.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattens.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattens.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattens.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IFlattens.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IRootFlattener.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IRootFlattener.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IRootFlattener.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/IRootFlattener.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/RootFlattener.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/RootFlattener.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/RootFlattener.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/RootFlattener.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/TypedNone.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/TypedNone.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/TypedNone.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/TypedNone.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ExceptionHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ExceptionHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ExceptionHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ExceptionHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/FlatteningHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/FlatteningHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/FlatteningHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/FlatteningHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ListHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ListHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ListHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ListHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapFlatteningHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapFlatteningHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapFlatteningHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapFlatteningHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/MapHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/NoneFlatteningHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/NoneFlatteningHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/NoneFlatteningHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/NoneFlatteningHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ObjectArrayHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ObjectArrayHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ObjectArrayHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/ObjectArrayHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PassThroughFlatteningHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PassThroughFlatteningHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PassThroughFlatteningHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PassThroughFlatteningHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveArrayHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveArrayHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveArrayHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveArrayHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveBoolArrayHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveBoolArrayHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveBoolArrayHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveBoolArrayHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveDoubleArrayHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveDoubleArrayHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveDoubleArrayHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveDoubleArrayHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveIntArrayHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveIntArrayHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveIntArrayHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/PrimitiveIntArrayHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SelfFlattensHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SelfFlattensHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SelfFlattensHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SelfFlattensHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SortOfEnumHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SortOfEnumHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SortOfEnumHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/SortOfEnumHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/StackTraceElementHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/StackTraceElementHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/StackTraceElementHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/StackTraceElementHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/UUIDHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/UUIDHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/UUIDHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/helpers/UUIDHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcDoubleParser.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcDoubleParser.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcDoubleParser.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcDoubleParser.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandler.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandler.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandler.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandler.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandlerImpl.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandlerImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandlerImpl.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcServerHandlerImpl.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcTypeFactoryImpl.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcTypeFactoryImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcTypeFactoryImpl.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcTypeFactoryImpl.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcWebServer.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcWebServer.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcWebServer.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/AnalysisRpcWebServer.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/HandlerRequestProcessorFactoryFactory.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/HandlerRequestProcessorFactoryFactory.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/HandlerRequestProcessorFactoryFactory.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/HandlerRequestProcessorFactoryFactory.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/TypeHelper.java b/plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/TypeHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/TypeHelper.java
rename to plugins/extras/org.eclipse.triquetrum.scisoft.analysis.rpc/src/main/java/org/eclipse/triquetrum/scisoft/analysis/rpc/internal/TypeHelper.java
diff --git a/plugins/extras/pom.xml b/plugins/extras/pom.xml
new file mode 100644
index 00000000..bdfa79eb
--- /dev/null
+++ b/plugins/extras/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+	initial API and implementation and/or initial documentation -->
+
+<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">
+
+	<parent>
+		<groupId>org.eclipse.triquetrum</groupId>
+		<artifactId>org.eclipse.triquetrum.plugins</artifactId>
+		<version>0.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.eclipse.triquetrum.plugins</groupId>
+	<artifactId>extras</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>org.eclipse.triquetrum.python.actor</module>
+    <module>org.eclipse.triquetrum.python.actor.palette</module>
+    <module>org.eclipse.triquetrum.python.service</module>
+    <module>org.eclipse.triquetrum.scisoft.analysis.rpc</module>
+  </modules>
+	
+</project>
diff --git a/org.eclipse.triquetrum.target.platform/pom.xml b/plugins/pom.xml
similarity index 76%
rename from org.eclipse.triquetrum.target.platform/pom.xml
rename to plugins/pom.xml
index cf6a1232..8c836a04 100644
--- a/org.eclipse.triquetrum.target.platform/pom.xml
+++ b/plugins/pom.xml
@@ -10,12 +10,19 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
 	<parent>
-		<groupId>triquetrum</groupId>
+		<groupId>org.eclipse.triquetrum</groupId>
 		<artifactId>org.eclipse.triquetrum.build</artifactId>
 		<version>0.2.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.eclipse.triquetrum.target.platform</artifactId>
-	<packaging>eclipse-target-definition</packaging>
+	<artifactId>org.eclipse.triquetrum.plugins</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>core</module>
+    <module>editor</module>
+    <module>extras</module>
+  </modules>
+	
 </project>
diff --git a/pom.xml b/pom.xml
index 51c19889..b1c3da7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   </properties>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>triquetrum</groupId>
+  <groupId>org.eclipse.triquetrum</groupId>
   <version>0.2.0-SNAPSHOT</version>
 
   <!-- Changed artifactId to org.eclipse.triquetrum.build -->
@@ -45,46 +45,16 @@
     </pluginRepository>
   </pluginRepositories>
   <modules>
-    <module>org.eclipse.triquetrum.target.platform</module>
-    <module>org.eclipse.triquetrum.common</module>
-    <module>org.eclipse.triquetrum.logging.dvp</module>
-    <module>org.eclipse.triquetrum.processing.actor</module>
-    <module>org.eclipse.triquetrum.processing.api</module>
-    <module>org.eclipse.triquetrum.processing.model.impl</module>
-    <module>org.eclipse.triquetrum.processing.service.impl</module>
-    <module>org.eclipse.triquetrum.validation.api</module>
-    <module>org.eclipse.triquetrum.workflow.actor.ui</module>
-    <module>org.eclipse.triquetrum.workflow.aoc.repository</module>
-    <module>org.eclipse.triquetrum.workflow.api</module>
-    <module>org.eclipse.triquetrum.workflow.editor</module>
-    <module>org.eclipse.triquetrum.workflow.editor.palette</module>
-    <module>org.eclipse.triquetrum.workflow.execution.impl</module>
-    <module>org.eclipse.triquetrum.workflow.repository.impl.filesystem</module>
-    <module>org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui</module>
-    <module>org.eclipse.triquetrum.workflow.repository.ui</module>
-    <module>org.eclipse.triquetrum.workflow.model</module>
-    <module>org.eclipse.triquetrum.workflow.model.edit</module>
-    <module>org.eclipse.triquetrum.workflow.model.editor</module>
-    <module>org.eclipse.triquetrum.workflow.model.viewmodel</module>
-    <module>org.eclipse.triquetrum.workflow.ui</module>
-    <module>org.eclipse.triquetrum.python.actor</module>
-    <module>org.eclipse.triquetrum.python.actor.palette</module>
-    <module>org.eclipse.triquetrum.python.service</module>
-    <module>org.eclipse.triquetrum.scisoft.analysis.rpc</module>
+    <module>releng/org.eclipse.triquetrum.target.platform</module>
+    <module>plugins</module>
     <!-- Don't include the javadoc module, see 
 	 https://bugs.eclipse.org/bugs/show_bug.cgi?id=492412 
     -->
     <!-- <module>javadoc</module> -->
-    <module>org.eclipse.triquetrum.thirdparty.feature</module>
-    <module>org.eclipse.triquetrum.ptolemy.feature</module>
-    <module>org.eclipse.triquetrum.core.feature</module>
-    <module>org.eclipse.triquetrum.workflow.core.feature</module>
-    <module>org.eclipse.triquetrum.python.feature</module>
-    <module>org.eclipse.triquetrum.workflow.rcp.feature</module>
-    <module>org.eclipse.triquetrum.rcp.feature</module>
+    <module>features</module>
     <module>examples</module>
-    <module>org.eclipse.triquetrum.repository</module>
-    <module>org.eclipse.triquetrum.update</module>
+    <module>releng/org.eclipse.triquetrum.repository</module>
+	<module>releng/org.eclipse.triquetrum.update</module>
   </modules>
 
   <build>
@@ -180,7 +150,7 @@
 	  </environments>
 	  <target>
 	    <artifact>
-	      <groupId>triquetrum</groupId>
+	      <groupId>org.eclipse.triquetrum</groupId>
 	      <artifactId>org.eclipse.triquetrum.target.platform</artifactId>
 	      <version>${project.version}</version>
 	    </artifact>
diff --git a/org.eclipse.triquetrum.workflow.rcp.feature/.gitignore b/releng/org.eclipse.triquetrum.repository/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.rcp.feature/.gitignore
rename to releng/org.eclipse.triquetrum.repository/.gitignore
diff --git a/org.eclipse.triquetrum.repository/.project b/releng/org.eclipse.triquetrum.repository/.project
similarity index 100%
rename from org.eclipse.triquetrum.repository/.project
rename to releng/org.eclipse.triquetrum.repository/.project
diff --git a/org.eclipse.triquetrum.repository/Triquetrum.product b/releng/org.eclipse.triquetrum.repository/Triquetrum.product
similarity index 97%
rename from org.eclipse.triquetrum.repository/Triquetrum.product
rename to releng/org.eclipse.triquetrum.repository/Triquetrum.product
index 96d63f41..e553ba8c 100644
--- a/org.eclipse.triquetrum.repository/Triquetrum.product
+++ b/releng/org.eclipse.triquetrum.repository/Triquetrum.product
@@ -40,7 +40,6 @@
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
    </vm>
 
-
    <plugins>
    </plugins>
 
@@ -143,8 +142,10 @@
       <plugin id="org.eclipse.triquetrum.python.actor" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.triquetrum.workflow.actor.plot" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.triquetrum.workflow.actor.ui" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.triquetrum.workflow.aoc.repository" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.triquetrum.workflow.editor" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.triquetrum.workflow.execution.impl" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.triquetrum.workflow.repository.impl.filesystem" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.triquetrum.workflow.ui" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
       <plugin id="org.ptolemy.commons" autoStart="true" startLevel="0" />
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/about.html b/releng/org.eclipse.triquetrum.repository/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem.ui/about.html
rename to releng/org.eclipse.triquetrum.repository/about.html
diff --git a/org.eclipse.triquetrum.repository/pom.xml b/releng/org.eclipse.triquetrum.repository/pom.xml
similarity index 98%
rename from org.eclipse.triquetrum.repository/pom.xml
rename to releng/org.eclipse.triquetrum.repository/pom.xml
index 3bf311c0..85fda936 100644
--- a/org.eclipse.triquetrum.repository/pom.xml
+++ b/releng/org.eclipse.triquetrum.repository/pom.xml
@@ -10,9 +10,10 @@ Contributors: Erwin De Ley - initial API and implementation and/or initial docum
 <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">
 
 <parent>
-  <groupId>triquetrum</groupId>
+  <groupId>org.eclipse.triquetrum</groupId>
   <artifactId>org.eclipse.triquetrum.build</artifactId>
   <version>0.2.0-SNAPSHOT</version>
+  <relativePath>../../pom.xml</relativePath>
 </parent>
 <modelVersion>4.0.0</modelVersion>
 
diff --git a/org.eclipse.triquetrum.repository/publish.xml b/releng/org.eclipse.triquetrum.repository/publish.xml
similarity index 100%
rename from org.eclipse.triquetrum.repository/publish.xml
rename to releng/org.eclipse.triquetrum.repository/publish.xml
diff --git a/org.eclipse.triquetrum.repository/site.xml b/releng/org.eclipse.triquetrum.repository/site.xml
similarity index 100%
rename from org.eclipse.triquetrum.repository/site.xml
rename to releng/org.eclipse.triquetrum.repository/site.xml
diff --git a/org.eclipse.triquetrum.target.platform/.project b/releng/org.eclipse.triquetrum.target.platform/.project
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/.project
rename to releng/org.eclipse.triquetrum.target.platform/.project
diff --git a/org.eclipse.triquetrum.target.platform/README.md b/releng/org.eclipse.triquetrum.target.platform/README.md
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/README.md
rename to releng/org.eclipse.triquetrum.target.platform/README.md
diff --git a/org.eclipse.triquetrum.workflow.repository.impl.filesystem/about.html b/releng/org.eclipse.triquetrum.target.platform/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.impl.filesystem/about.html
rename to releng/org.eclipse.triquetrum.target.platform/about.html
diff --git a/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.target b/releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.target
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.target
rename to releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.target
diff --git a/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.tpd b/releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.tpd
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.tpd
rename to releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.python.rpc.platform.tpd
diff --git a/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target b/releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target
rename to releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target
diff --git a/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd b/releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd
similarity index 100%
rename from org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd
rename to releng/org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd
diff --git a/releng/org.eclipse.triquetrum.target.platform/pom.xml b/releng/org.eclipse.triquetrum.target.platform/pom.xml
new file mode 100644
index 00000000..bacb13b5
--- /dev/null
+++ b/releng/org.eclipse.triquetrum.target.platform/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+  and the accompanying materials are made available under the terms of the
+  Eclipse Public License v1.0 which accompanies this distribution, and is available
+  at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+  initial API and implementation and/or initial documentation -->
+
+<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">
+
+  <parent>
+    <groupId>org.eclipse.triquetrum</groupId>
+    <artifactId>org.eclipse.triquetrum.build</artifactId>
+    <version>0.2.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>org.eclipse.triquetrum.target.platform</artifactId>
+  <packaging>eclipse-target-definition</packaging>
+</project>
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/.gitignore b/releng/org.eclipse.triquetrum.update/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/.gitignore
rename to releng/org.eclipse.triquetrum.update/.gitignore
diff --git a/org.eclipse.triquetrum.update/.project b/releng/org.eclipse.triquetrum.update/.project
similarity index 100%
rename from org.eclipse.triquetrum.update/.project
rename to releng/org.eclipse.triquetrum.update/.project
diff --git a/org.eclipse.triquetrum.update/category.xml b/releng/org.eclipse.triquetrum.update/category.xml
similarity index 100%
rename from org.eclipse.triquetrum.update/category.xml
rename to releng/org.eclipse.triquetrum.update/category.xml
diff --git a/org.eclipse.triquetrum.update/pom.xml b/releng/org.eclipse.triquetrum.update/pom.xml
similarity index 87%
rename from org.eclipse.triquetrum.update/pom.xml
rename to releng/org.eclipse.triquetrum.update/pom.xml
index f2ca14e1..8adc4d0b 100644
--- a/org.eclipse.triquetrum.update/pom.xml
+++ b/releng/org.eclipse.triquetrum.update/pom.xml
@@ -7,9 +7,10 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-      <groupId>triquetrum</groupId>
+      <groupId>org.eclipse.triquetrum</groupId>
       <artifactId>org.eclipse.triquetrum.build</artifactId>
       <version>0.2.0-SNAPSHOT</version>
+      <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>org.eclipse.triquetrum.update</artifactId>
     <version>0.2.0-SNAPSHOT</version>
diff --git a/org.eclipse.triquetrum.update/publish.xml b/releng/org.eclipse.triquetrum.update/publish.xml
similarity index 100%
rename from org.eclipse.triquetrum.update/publish.xml
rename to releng/org.eclipse.triquetrum.update/publish.xml
diff --git a/org.eclipse.triquetrum.workflow.repository.test/.classpath b/tests/org.eclipse.triquetrum.logging.dvp/.classpath
similarity index 85%
rename from org.eclipse.triquetrum.workflow.repository.test/.classpath
rename to tests/org.eclipse.triquetrum.logging.dvp/.classpath
index 64777f25..a49132d1 100644
--- a/org.eclipse.triquetrum.workflow.repository.test/.classpath
+++ b/tests/org.eclipse.triquetrum.logging.dvp/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.triquetrum.workflow.repository.test/.gitignore b/tests/org.eclipse.triquetrum.logging.dvp/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.test/.gitignore
rename to tests/org.eclipse.triquetrum.logging.dvp/.gitignore
diff --git a/org.eclipse.triquetrum.workflow.repository.test/.project b/tests/org.eclipse.triquetrum.logging.dvp/.project
similarity index 90%
rename from org.eclipse.triquetrum.workflow.repository.test/.project
rename to tests/org.eclipse.triquetrum.logging.dvp/.project
index a3b66ab0..a3da07cd 100644
--- a/org.eclipse.triquetrum.workflow.repository.test/.project
+++ b/tests/org.eclipse.triquetrum.logging.dvp/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.triquetrum.workflow.repository.test</name>
+	<name>org.eclipse.triquetrum.logging.dvp</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF b/tests/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..9a34401a
--- /dev/null
+++ b/tests/org.eclipse.triquetrum.logging.dvp/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Dvp logging config (Incubation)
+Bundle-SymbolicName: org.eclipse.triquetrum.logging.dvp
+Bundle-Version: 0.2.0.qualifier
+Fragment-Host: org.apache.log4j;bundle-version="1.2.15"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: Eclipse Triquetrum
diff --git a/org.eclipse.triquetrum.workflow.repository.test/about.html b/tests/org.eclipse.triquetrum.logging.dvp/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.test/about.html
rename to tests/org.eclipse.triquetrum.logging.dvp/about.html
diff --git a/org.eclipse.triquetrum.workflow.repository.test/build.properties b/tests/org.eclipse.triquetrum.logging.dvp/build.properties
similarity index 88%
rename from org.eclipse.triquetrum.workflow.repository.test/build.properties
rename to tests/org.eclipse.triquetrum.logging.dvp/build.properties
index 4e92f737..888856dc 100644
--- a/org.eclipse.triquetrum.workflow.repository.test/build.properties
+++ b/tests/org.eclipse.triquetrum.logging.dvp/build.properties
@@ -1,14 +1,14 @@
 ###############################################################################
-#  Copyright (c) 2016 iSencia Belgium NV.
+#  Copyright (c) 2015, 2016 iSencia Belgium NV.
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
 #  which accompanies this distribution, and is available at
 #  http://www.eclipse.org/legal/epl-v10.html
-#  
+#
 #  Contributors:
 #     Erwin De Ley - initial API and implementation and/or initial documentation
 ###############################################################################
-source.. = src/test/java/
+source.. = src/main/resources/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
diff --git a/tests/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties b/tests/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties
new file mode 100644
index 00000000..30533356
--- /dev/null
+++ b/tests/org.eclipse.triquetrum.logging.dvp/src/main/resources/log4j.properties
@@ -0,0 +1,19 @@
+###############################################################################
+#  Copyright (c) 2015 iSencia Belgium NV.
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  which accompanies this distribution, and is available at
+#  http://www.eclipse.org/legal/epl-v10.html
+#
+#  Contributors:
+#     Erwin De Ley - initial API and implementation and/or initial documentation
+###############################################################################
+log4j.rootLogger=INFO,CONSOLE
+
+#log4j.logger.org.eclipse.triquetrum.workflow.editor = ALL
+log4j.logger.org.eclipse.triquetrum.processing.service = ALL
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Follow=true
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d %p [%t] %x %c{2} (%M:%L) - %m%n
diff --git a/org.eclipse.triquetrum.processing.test/.classpath b/tests/org.eclipse.triquetrum.processing.test/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/.classpath
rename to tests/org.eclipse.triquetrum.processing.test/.classpath
diff --git a/org.eclipse.triquetrum.workflow.ui/.gitignore b/tests/org.eclipse.triquetrum.processing.test/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/.gitignore
rename to tests/org.eclipse.triquetrum.processing.test/.gitignore
diff --git a/org.eclipse.triquetrum.processing.test/.project b/tests/org.eclipse.triquetrum.processing.test/.project
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/.project
rename to tests/org.eclipse.triquetrum.processing.test/.project
diff --git a/org.eclipse.triquetrum.processing.test/META-INF/MANIFEST.MF b/tests/org.eclipse.triquetrum.processing.test/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/META-INF/MANIFEST.MF
rename to tests/org.eclipse.triquetrum.processing.test/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.repository.ui/about.html b/tests/org.eclipse.triquetrum.processing.test/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.repository.ui/about.html
rename to tests/org.eclipse.triquetrum.processing.test/about.html
diff --git a/org.eclipse.triquetrum.processing.test/build.properties b/tests/org.eclipse.triquetrum.processing.test/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/build.properties
rename to tests/org.eclipse.triquetrum.processing.test/build.properties
diff --git a/org.eclipse.triquetrum.processing.test/src/main/java/org/eclipse/triquetrum/processing/test/MockTaskProcessingService.java b/tests/org.eclipse.triquetrum.processing.test/src/main/java/org/eclipse/triquetrum/processing/test/MockTaskProcessingService.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/src/main/java/org/eclipse/triquetrum/processing/test/MockTaskProcessingService.java
rename to tests/org.eclipse.triquetrum.processing.test/src/main/java/org/eclipse/triquetrum/processing/test/MockTaskProcessingService.java
diff --git a/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/DataTypeTest.java b/tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/DataTypeTest.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/DataTypeTest.java
rename to tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/DataTypeTest.java
diff --git a/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskConstructiontest.java b/tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskConstructiontest.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskConstructiontest.java
rename to tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskConstructiontest.java
diff --git a/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskProcessingTest.java b/tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskProcessingTest.java
similarity index 100%
rename from org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskProcessingTest.java
rename to tests/org.eclipse.triquetrum.processing.test/src/test/java/org/eclipse/triquetrum/processing/test/TaskProcessingTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.classpath b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.classpath
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.classpath
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.classpath
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.gitignore b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.gitignore
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.gitignore
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.gitignore
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.project b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.project
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.project
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.project
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.pydevproject b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.pydevproject
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.pydevproject
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.pydevproject
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.core.prefs
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.ui.prefs
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.pde.core.prefs b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.pde.core.prefs
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/.settings/org.eclipse.pde.core.prefs
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/META-INF/MANIFEST.MF b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/META-INF/MANIFEST.MF
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/META-INF/MANIFEST.MF
diff --git a/org.eclipse.triquetrum.workflow.ui/about.html b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/about.html
similarity index 100%
rename from org.eclipse.triquetrum.workflow.ui/about.html
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/about.html
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/build.properties b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/build.properties
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/build.properties
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/build.properties
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackanalysisrpc.py b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackanalysisrpc.py
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackanalysisrpc.py
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackanalysisrpc.py
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackxmlrpc.py b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackxmlrpc.py
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackxmlrpc.py
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/loopbackxmlrpc.py
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/rpcremote.py b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/rpcremote.py
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/rpcremote.py
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/scripts/rpcremote.py
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcAdvancedTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcAdvancedTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcAdvancedTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcAdvancedTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicRemoteTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicRemoteTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicRemoteTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicRemoteTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcBasicTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcDefaultPortTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcDefaultPortTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcDefaultPortTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcDefaultPortTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcExceptionsTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcExceptionsTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcExceptionsTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcExceptionsTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteExceptionTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteExceptionTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteExceptionTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/AnalysisRpcRemoteExceptionTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleFlatteningTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleFlatteningTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleFlatteningTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleFlatteningTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleWithInterfaceFlatteningTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleWithInterfaceFlatteningTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleWithInterfaceFlatteningTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSimpleWithInterfaceFlatteningTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSpecializedMapFlatteningTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSpecializedMapFlatteningTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSpecializedMapFlatteningTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/AddHelperSpecializedMapFlatteningTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/BasicFlatteningTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/BasicFlatteningTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/BasicFlatteningTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/BasicFlatteningTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/ExplicitFlatteningTestAbstract.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/ExplicitFlatteningTestAbstract.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/ExplicitFlatteningTestAbstract.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/ExplicitFlatteningTestAbstract.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTestAbstract.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTestAbstract.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTestAbstract.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningTestAbstract.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonAndRunLocalLoopbackTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonAndRunLocalLoopbackTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonAndRunLocalLoopbackTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonAndRunLocalLoopbackTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTestAbstract.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTestAbstract.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTestAbstract.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaAnalysisRpcToPythonTestAbstract.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonAndRunPythonFlattenTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonAndRunPythonFlattenTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonAndRunPythonFlattenTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonAndRunPythonFlattenTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTestAbstract.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTestAbstract.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTestAbstract.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/flattening/FlatteningViaXmlRpcToPythonTestAbstract.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InstanceDispatcherTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InstanceDispatcherTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InstanceDispatcherTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InstanceDispatcherTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InterfaceAndImpl.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InterfaceAndImpl.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InterfaceAndImpl.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/InterfaceAndImpl.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/ManyArguments.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/ManyArguments.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/ManyArguments.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/ManyArguments.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NoArgument.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NoArgument.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NoArgument.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NoArgument.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NullPrimitive.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NullPrimitive.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NullPrimitive.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/NullPrimitive.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitiveArrays.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitiveArrays.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitiveArrays.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitiveArrays.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitives.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitives.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitives.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentBoxedPrimitives.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitiveArrays.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitiveArrays.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitiveArrays.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitiveArrays.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitives.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitives.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitives.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/SingleArgumentPrimitives.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/UsedForVarious.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/UsedForVarious.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/UsedForVarious.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/UsedForVarious.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/VoidReturn.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/VoidReturn.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/VoidReturn.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/instancedispatcher/VoidReturn.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/ManyArguments.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/ManyArguments.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/ManyArguments.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/ManyArguments.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NoArgument.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NoArgument.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NoArgument.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NoArgument.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NullPrimitive.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NullPrimitive.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NullPrimitive.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/NullPrimitive.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitiveArrays.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitiveArrays.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitiveArrays.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitiveArrays.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitives.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitives.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitives.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentBoxedPrimitives.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitiveArrays.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitiveArrays.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitiveArrays.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitiveArrays.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitives.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitives.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitives.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/SingleArgumentPrimitives.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/StaticClassDispatcherTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/StaticClassDispatcherTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/StaticClassDispatcherTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/StaticClassDispatcherTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/UsedForVarious.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/UsedForVarious.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/UsedForVarious.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/UsedForVarious.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/VoidReturn.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/VoidReturn.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/VoidReturn.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/staticdispatchertypes/VoidReturn.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/NetUtils.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/NetUtils.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/NetUtils.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/NetUtils.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelper.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelper.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelper.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelper.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelperTest.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelperTest.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelperTest.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/PythonHelperTest.java
diff --git a/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/StreamGobbler.java b/tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/StreamGobbler.java
similarity index 100%
rename from org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/StreamGobbler.java
rename to tests/org.eclipse.triquetrum.scisoft.analysis.rpc.test/src/org/eclipse/triquetrum/scisoft/analysis/rpc/test/StreamGobbler.java
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 00000000..05a8f197
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) 2016 iSencia Belgium NV. All rights reserved. This program
+	and the accompanying materials are made available under the terms of the
+	Eclipse Public License v1.0 which accompanies this distribution, and is available
+	at http://www.eclipse.org/legal/epl-v10.html Contributors: Erwin De Ley -
+	initial API and implementation and/or initial documentation -->
+
+<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">
+
+	<parent>
+		<groupId>org.eclipse.triquetrum</groupId>
+		<artifactId>org.eclipse.triquetrum.build</artifactId>
+		<version>0.2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>org.eclipse.triquetrum.tests</artifactId>
+	<packaging>pom</packaging>
+	
+  <modules>
+    <module>org.eclipse.triquetrum.processing.test</module>
+    <module>org.eclipse.triquetrum.scisoft.analysis.rpc.test</module>
+  </modules>
+	
+</project>