diff --git a/activemq-perftest/pom.xml b/activemq-perftest/pom.xml
index c8207bc745..a680b58b0c 100644
--- a/activemq-perftest/pom.xml
+++ b/activemq-perftest/pom.xml
@@ -14,26 +14,6 @@
     <name>ActiveMQ :: Performance Test</name>
     <description>Performance Testing Framework for ActiveMQ</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activemq-console</artifactId>
-            <version>4.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
diff --git a/activemq-perftest/src/main/resources/broker-conf/journaledJdbc.xml b/activemq-perftest/src/main/resources/broker-conf/journaledJdbc.xml
deleted file mode 100644
index 0aacd2798f..0000000000
--- a/activemq-perftest/src/main/resources/broker-conf/journaledJdbc.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
-  
-  <broker useJmx="false" brokerName="journaledJdbcBroker" start="false" persistent="true" useShutdownHook="false" deleteAllMessagesOnStartup="true">
-    <persistenceAdapter>
-       <journaledJDBC journalLogFiles="4" journalLogFileSize="32768" useJournal="true" useQuickJournal="false" dataSource="#derby-ds" dataDirectory="target/journaledJdbc-data"/>
-    </persistenceAdapter>
-  
-    <transportConnectors>
-       <transportConnector name="default" uri="tcp://localhost:61616"/>
-    </transportConnectors>
-  </broker>
-  <!--  This xbean configuration file supports all the standard spring xml configuration options -->
-  
-  <!-- Postgres DataSource Sample Setup -->
-  <!-- 
-  <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
-    <property name="serverName" value="localhost"/>
-    <property name="databaseName" value="activemq"/>
-    <property name="portNumber" value="0"/>
-    <property name="user" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="dataSourceName" value="postgres"/>
-    <property name="initialConnections" value="1"/>
-    <property name="maxConnections" value="10"/>
-  </bean>
-  -->
-  
-  <!-- MySql DataSource Sample Setup -->
-  <!-- 
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-    <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-    <property name="username" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->  
-   
-  <!-- Embedded Derby DataSource Sample Setup -->
-  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="derbydb"/>
-    <property name="createDatabase" value="create"/>
-  </bean>
-
-</beans>
-<!-- END SNIPPET: xbean -->
diff --git a/activemq-perftest/src/main/resources/config/activemq.xml b/activemq-perftest/src/main/resources/config/activemq.xml
deleted file mode 100644
index a635966307..0000000000
--- a/activemq-perftest/src/main/resources/config/activemq.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<!-- START SNIPPET: xbean -->
-<beans xmlns="http://activemq.org/config/1.0">
-  
-  <broker useJmx="true">
-  
-    <!--  Use the following to set the broker memory limit (in bytes)
-  	<memoryManager>  
-	  	<usageManager id="memory-manager" limit="1048576"/>
-  	</memoryManager>
-  	-->
-  	
-	<!-- Use the following to configure how ActiveMQ is exposed in JMX
-	<managementContext>
-	   <managementContext connectorPort="1099" jmxDomainName="org.apache.activemq"/>
-	</managementContext>
-	-->
-
-	<!-- In ActiveMQ 4, you can setup destination policies -->  
-    <destinationPolicy>
-      <policyMap><policyEntries>
-        
-          <policyEntry topic="FOO.>">
-            <dispatchPolicy>
-              <strictOrderDispatchPolicy />
-            </dispatchPolicy>
-            <subscriptionRecoveryPolicy>
-              <lastImageSubscriptionRecoveryPolicy />
-            </subscriptionRecoveryPolicy>
-          </policyEntry>
-
-      </policyEntries></policyMap>
-    </destinationPolicy>
-  
-  
-    <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="target/activemq-data"/>
-      <!-- To use a different datasource, use th following syntax : -->
-      <!-- 
-      <journaledJDBC journalLogFiles="5" dataDirectory="../activemq-data" dataSource="#postgres-ds"/>
-       -->
-    </persistenceAdapter>
-  
-    <transportConnectors>
-       <transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-       <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
-    </transportConnectors>
-    
-    <networkConnectors>
-      <!-- by default just auto discover the other brokers -->
-      <networkConnector name="default" uri="multicast://default"/>
-      <!--
-      <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
-      -->
-    </networkConnectors>
-    
-  </broker>
-  
-  <!--  This xbean configuration file supports all the standard spring xml configuration options -->
-  
-  <!-- Postgres DataSource Sample Setup -->
-  <!-- 
-  <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource">
-    <property name="serverName" value="localhost"/>
-    <property name="databaseName" value="activemq"/>
-    <property name="portNumber" value="0"/>
-    <property name="user" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="dataSourceName" value="postgres"/>
-    <property name="initialConnections" value="1"/>
-    <property name="maxConnections" value="10"/>
-  </bean>
-  -->
-  
-  <!-- MySql DataSource Sample Setup -->
-  <!-- 
-  <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-    <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/>
-    <property name="username" value="activemq"/>
-    <property name="password" value="activemq"/>
-    <property name="poolPreparedStatements" value="true"/>
-  </bean>
-  -->  
-   
-  <!-- Embedded Derby DataSource Sample Setup -->
-  <!-- 
-  <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-    <property name="databaseName" value="derbydb"/>
-    <property name="createDatabase" value="create"/>
-  </bean>
-  -->  
-
-</beans>
-<!-- END SNIPPET: xbean -->
diff --git a/tooling/maven-perf-plugin/pom.xml b/tooling/maven-perf-plugin/pom.xml
index 6c9090c2ea..4606a404e1 100644
--- a/tooling/maven-perf-plugin/pom.xml
+++ b/tooling/maven-perf-plugin/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>activemq-console</artifactId>
             <version>4.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activemq-perftest</artifactId>
-            <version>4.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
diff --git a/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java b/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
index 5e70c88954..4580bc43cc 100644
--- a/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
+++ b/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
@@ -30,8 +30,8 @@ import java.nio.channels.FileChannel;
 /**
  * Goal which starts activemq broker.
  *
- * @goal server
- * @phase process
+ * @goal broker
+ * @phase process-sources
  */
 public class ServerMojo
         extends AbstractMojo {
@@ -46,7 +46,7 @@ public class ServerMojo
     /**
      * Location of the predefined config files.
      *
-     * @parameter expression="${configDirectory}" default-value="${basedir}/src/main/resources/config"
+     * @parameter expression="${configDirectory}" default-value="${basedir}/src/main/resources/broker-conf"
      * @required
      */
     private String configDirectory;
diff --git a/activemq-perftest/src/main/java/org/apache/activemq/tool/ConsumerTool.java b/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ConsumerTool.java
similarity index 100%
rename from activemq-perftest/src/main/java/org/apache/activemq/tool/ConsumerTool.java
rename to tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ConsumerTool.java
diff --git a/activemq-perftest/src/main/java/org/apache/activemq/tool/ProducerTool.java b/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ProducerTool.java
similarity index 100%
rename from activemq-perftest/src/main/java/org/apache/activemq/tool/ProducerTool.java
rename to tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ProducerTool.java
diff --git a/activemq-perftest/src/main/java/org/apache/activemq/tool/ToolSupport.java b/tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ToolSupport.java
similarity index 100%
rename from activemq-perftest/src/main/java/org/apache/activemq/tool/ToolSupport.java
rename to tooling/maven-perf-plugin/src/main/java/org/apache/activemq/tool/ToolSupport.java