diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..37cf854
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target
+work
diff --git a/aggregator/pom.xml b/aggregator/pom.xml
deleted file mode 100644
index e630465..0000000
--- a/aggregator/pom.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ The MIT License
-  ~
-  ~ Copyright (c) 2013-2014, CloudBees, Inc.
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in
-  ~ all copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  ~ THE SOFTWARE.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>plugin</artifactId>
-        <version>2.5</version>
-        <relativePath/>
-    </parent>
-    <groupId>org.jenkins-ci.plugins.workflow</groupId>
-    <artifactId>workflow-aggregator</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>hpi</packaging>
-    <name>Pipeline</name>
-    <url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Plugin</url>
-    <description>A suite of plugins that lets you orchestrate automation, simple or complex. See http://jenkins-ci.org/solutions/pipeline/ for more details</description>
-    <licenses>
-        <license>
-            <name>MIT License</name>
-            <url>http://opensource.org/licenses/MIT</url>
-        </license>
-    </licenses>
-    <scm>
-        <connection>scm:git:git://github.com/jenkinsci/workflow-plugin.git</connection>
-        <developerConnection>scm:git:git@github.com:jenkinsci/workflow-plugin.git</developerConnection>
-        <url>https://github.com/jenkinsci/workflow-plugin</url>
-    </scm>
-    <repositories>
-        <repository>
-            <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/public/</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/public/</url>
-        </pluginRepository>
-    </pluginRepositories>
-    <properties>
-        <jenkins.version>1.642.3</jenkins.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-step-api</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-api</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-support</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-durable-task-step</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-scm-step</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-cps</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-cps-global-lib</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-job</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-basic-steps</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>workflow-multibranch</artifactId>
-            <version>1.15</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>pipeline-build-step</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>pipeline-input-step</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>pipeline-stage-step</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.jenkins-ci.tools</groupId>
-                <artifactId>maven-hpi-plugin</artifactId>
-                <configuration>
-                    <loggers>
-                        <org.jenkinsci.plugins.workflow>FINE</org.jenkinsci.plugins.workflow>
-                        <org.jenkinsci.plugins.durabletask>FINE</org.jenkinsci.plugins.durabletask>
-                    </loggers>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/aggregator/demo/.gitignore b/demo/.gitignore
similarity index 100%
rename from aggregator/demo/.gitignore
rename to demo/.gitignore
diff --git a/aggregator/demo/Dockerfile b/demo/Dockerfile
similarity index 100%
rename from aggregator/demo/Dockerfile
rename to demo/Dockerfile
diff --git a/aggregator/demo/Dockerfile-snapshot b/demo/Dockerfile-snapshot
similarity index 100%
rename from aggregator/demo/Dockerfile-snapshot
rename to demo/Dockerfile-snapshot
diff --git a/aggregator/demo/JENKINS_HOME/config.xml b/demo/JENKINS_HOME/config.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/config.xml
rename to demo/JENKINS_HOME/config.xml
diff --git a/aggregator/demo/JENKINS_HOME/hudson.tasks.Maven.xml b/demo/JENKINS_HOME/hudson.tasks.Maven.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/hudson.tasks.Maven.xml
rename to demo/JENKINS_HOME/hudson.tasks.Maven.xml
diff --git a/aggregator/demo/JENKINS_HOME/jenkins.model.JenkinsLocationConfiguration.xml b/demo/JENKINS_HOME/jenkins.model.JenkinsLocationConfiguration.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/jenkins.model.JenkinsLocationConfiguration.xml
rename to demo/JENKINS_HOME/jenkins.model.JenkinsLocationConfiguration.xml
diff --git a/aggregator/demo/JENKINS_HOME/jobs/cd/config.xml b/demo/JENKINS_HOME/jobs/cd/config.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/jobs/cd/config.xml
rename to demo/JENKINS_HOME/jobs/cd/config.xml
diff --git a/aggregator/demo/JENKINS_HOME/log/Workflow.xml b/demo/JENKINS_HOME/log/Workflow.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/log/Workflow.xml
rename to demo/JENKINS_HOME/log/Workflow.xml
diff --git a/aggregator/demo/JENKINS_HOME/org.jenkinsci.main.modules.sshd.SSHD.xml b/demo/JENKINS_HOME/org.jenkinsci.main.modules.sshd.SSHD.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/org.jenkinsci.main.modules.sshd.SSHD.xml
rename to demo/JENKINS_HOME/org.jenkinsci.main.modules.sshd.SSHD.xml
diff --git a/aggregator/demo/JENKINS_HOME/scriptApproval.xml b/demo/JENKINS_HOME/scriptApproval.xml
similarity index 100%
rename from aggregator/demo/JENKINS_HOME/scriptApproval.xml
rename to demo/JENKINS_HOME/scriptApproval.xml
diff --git a/aggregator/demo/Makefile b/demo/Makefile
similarity index 100%
rename from aggregator/demo/Makefile
rename to demo/Makefile
diff --git a/aggregator/demo/README.md b/demo/README.md
similarity index 100%
rename from aggregator/demo/README.md
rename to demo/README.md
diff --git a/aggregator/demo/jetty.sh b/demo/jetty.sh
similarity index 100%
rename from aggregator/demo/jetty.sh
rename to demo/jetty.sh
diff --git a/aggregator/demo/plugins.txt b/demo/plugins.txt
similarity index 100%
rename from aggregator/demo/plugins.txt
rename to demo/plugins.txt
diff --git a/aggregator/demo/repo/Jenkinsfile b/demo/repo/Jenkinsfile
similarity index 100%
rename from aggregator/demo/repo/Jenkinsfile
rename to demo/repo/Jenkinsfile
diff --git a/aggregator/demo/repo/pom.xml b/demo/repo/pom.xml
similarity index 100%
rename from aggregator/demo/repo/pom.xml
rename to demo/repo/pom.xml
diff --git a/aggregator/demo/repo/servers.groovy b/demo/repo/servers.groovy
similarity index 100%
rename from aggregator/demo/repo/servers.groovy
rename to demo/repo/servers.groovy
diff --git a/aggregator/demo/repo/sometests/README.md b/demo/repo/sometests/README.md
similarity index 100%
rename from aggregator/demo/repo/sometests/README.md
rename to demo/repo/sometests/README.md
diff --git a/aggregator/demo/repo/sometests/pom.xml b/demo/repo/sometests/pom.xml
similarity index 100%
rename from aggregator/demo/repo/sometests/pom.xml
rename to demo/repo/sometests/pom.xml
diff --git a/aggregator/demo/repo/sometests/src/test/java/org/jenkinsci/plugins/workflow/demo/AppTest.java b/demo/repo/sometests/src/test/java/org/jenkinsci/plugins/workflow/demo/AppTest.java
similarity index 100%
rename from aggregator/demo/repo/sometests/src/test/java/org/jenkinsci/plugins/workflow/demo/AppTest.java
rename to demo/repo/sometests/src/test/java/org/jenkinsci/plugins/workflow/demo/AppTest.java
diff --git a/aggregator/demo/repo/src/main/webapp/WEB-INF/web.xml b/demo/repo/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from aggregator/demo/repo/src/main/webapp/WEB-INF/web.xml
rename to demo/repo/src/main/webapp/WEB-INF/web.xml
diff --git a/aggregator/demo/repo/src/main/webapp/index.jsp b/demo/repo/src/main/webapp/index.jsp
similarity index 100%
rename from aggregator/demo/repo/src/main/webapp/index.jsp
rename to demo/repo/src/main/webapp/index.jsp
diff --git a/aggregator/demo/run.sh b/demo/run.sh
similarity index 100%
rename from aggregator/demo/run.sh
rename to demo/run.sh
diff --git a/aggregator/demo/snapshot-only-plugins.txt b/demo/snapshot-only-plugins.txt
similarity index 100%
rename from aggregator/demo/snapshot-only-plugins.txt
rename to demo/snapshot-only-plugins.txt
diff --git a/pom.xml b/pom.xml
index 9c6b0d1..01a1f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,33 +23,126 @@
   ~ THE SOFTWARE.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jenkins-ci.plugins</groupId>
+        <artifactId>plugin</artifactId>
+        <version>2.5</version>
+        <relativePath/>
+    </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
-    <artifactId>workflow-pom</artifactId>
+    <artifactId>workflow-aggregator</artifactId>
     <version>2.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Pipeline: Parent</name>
+    <packaging>hpi</packaging>
+    <name>Pipeline</name>
+    <url>https://wiki.jenkins-ci.org/display/JENKINS/Pipeline+Plugin</url>
+    <description>A suite of plugins that lets you orchestrate automation, simple or complex. See http://jenkins-ci.org/solutions/pipeline/ for more details</description>
     <licenses>
         <license>
             <name>MIT License</name>
             <url>http://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
-    <modules>
-        <module>step-api</module>
-        <module>api</module>
-        <module>support</module>
-        <module>basic-steps</module>
-        <module>durable-task-step</module>
-        <module>scm-step</module>
-        <module>build-step</module>
-        <module>input-step</module>
-        <module>stage-step</module>
-        <module>cps</module>
-        <module>job</module>
-        <module>multibranch</module>
-        <module>cps-global-lib</module>
-        <module>aggregator</module>
-    </modules>
+    <scm>
+        <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
+        <developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
+        <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
+    </scm>
+    <repositories>
+        <repository>
+            <id>repo.jenkins-ci.org</id>
+            <url>http://repo.jenkins-ci.org/public/</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>repo.jenkins-ci.org</id>
+            <url>http://repo.jenkins-ci.org/public/</url>
+        </pluginRepository>
+    </pluginRepositories>
+    <properties>
+        <jenkins.version>1.642.3</jenkins.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-step-api</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-api</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-support</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-durable-task-step</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-scm-step</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-cps</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-cps-global-lib</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-job</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-basic-steps</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>workflow-multibranch</artifactId>
+            <version>1.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>pipeline-build-step</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>pipeline-input-step</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>pipeline-stage-step</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jenkins-ci.tools</groupId>
+                <artifactId>maven-hpi-plugin</artifactId>
+                <configuration>
+                    <loggers>
+                        <org.jenkinsci.plugins.workflow>FINE</org.jenkinsci.plugins.workflow>
+                        <org.jenkinsci.plugins.durabletask>FINE</org.jenkinsci.plugins.durabletask>
+                    </loggers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/aggregator/src/main/resources/index.jelly b/src/main/resources/index.jelly
similarity index 100%
rename from aggregator/src/main/resources/index.jelly
rename to src/main/resources/index.jelly