diff --git a/jmeter/src/java/org/activemq/sampler/Consumer.java b/jmeter/src/java/org/activemq/sampler/Consumer.java
index 1f767d0b40..a8f1dbb659 100755
--- a/jmeter/src/java/org/activemq/sampler/Consumer.java
+++ b/jmeter/src/java/org/activemq/sampler/Consumer.java
@@ -16,7 +16,7 @@
  */
 package org.activemq.sampler;
 
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 import org.activemq.util.connection.ServerConnectionFactory;
 import org.apache.jmeter.samplers.Entry;
 import org.apache.jmeter.samplers.SampleResult;
diff --git a/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java b/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
index 60f8f78d1d..312f63ae3b 100644
--- a/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
+++ b/jmeter/src/java/org/activemq/sampler/ConsumerSysTest.java
@@ -22,8 +22,8 @@ import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.samplers.Entry;
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
-import org.activemq.command.ActiveMQMessage;
+import org.apache.activemq.util.IdGenerator;
+import org.apache.activemq.command.ActiveMQMessage;
 
 import javax.jms.*;
 import java.util.*;
diff --git a/jmeter/src/java/org/activemq/sampler/Producer.java b/jmeter/src/java/org/activemq/sampler/Producer.java
index 28204997b2..b00971c3f1 100755
--- a/jmeter/src/java/org/activemq/sampler/Producer.java
+++ b/jmeter/src/java/org/activemq/sampler/Producer.java
@@ -24,7 +24,7 @@ import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 
 import javax.jms.Connection;
 import javax.jms.Session;
diff --git a/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java b/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
index acb42ba963..7b2de1bff6 100644
--- a/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
+++ b/jmeter/src/java/org/activemq/sampler/ProducerSysTest.java
@@ -25,7 +25,7 @@ import org.apache.log.Logger;
 import org.apache.jorphan.logging.LoggingManager;
 
 import org.activemq.util.connection.ServerConnectionFactory;
-import org.activemq.util.IdGenerator;
+import org.apache.activemq.util.IdGenerator;
 
 import javax.jms.*;
 import java.io.File;
diff --git a/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java b/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
index 53b13d6020..1d71fdfaa0 100755
--- a/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
+++ b/jmeter/src/java/org/activemq/util/connection/ServerConnectionFactory.java
@@ -16,34 +16,32 @@
  */
 package org.activemq.util.connection;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.ActiveMQConnection;
-import org.mr.api.jms.MantaTopicConnectionFactory;
-import org.mr.api.jms.MantaQueueConnectionFactory;
-
-import org.apache.jmeter.util.JMeterUtils;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Properties;
 
 import javax.jms.Connection;
-import javax.jms.Session;
-import javax.jms.JMSException;
-import javax.jms.Topic;
-import javax.jms.Queue;
 import javax.jms.ConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicSession;
-import javax.jms.QueueSession;
 import javax.jms.Destination;
-import javax.jms.TopicConnection;
+import javax.jms.JMSException;
+import javax.jms.Queue;
 import javax.jms.QueueConnection;
-
+import javax.jms.QueueConnectionFactory;
+import javax.jms.QueueSession;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+import javax.jms.TopicSession;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Properties;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.jmeter.util.JMeterUtils;
+import org.mr.api.jms.MantaQueueConnectionFactory;
+import org.mr.api.jms.MantaTopicConnectionFactory;
 
 /**
  * Provides static methods for creating Session and Destination objects.
@@ -202,10 +200,6 @@ public class ServerConnectionFactory {
             //Used to create a session from the default MQ server ActiveMQConnectionFactory.
             ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory(url);
             factory.setUseAsyncSend(true);
-
-            if (embeddedBroker) {
-                factory.setUseEmbeddedBroker(true);
-            }
             
             ActiveMQConnection c = (ActiveMQConnection) factory.createConnection();
 
diff --git a/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java b/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
index 9de9cc64f3..23f181ad40 100644
--- a/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
+++ b/jmeter/src/test/java/org/activemq/usecases/NoDestinationErrorTest.java
@@ -8,11 +8,11 @@ import java.net.URI;
 
 import junit.framework.TestCase;
 
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.ActiveMQConnection;
-import org.activemq.broker.BrokerService;
-import org.activemq.broker.BrokerFactory;
-import org.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
 
 /**
 * This Unit Test is created to test the memory leakage when a new producer is created and closed for each message that was sent.
diff --git a/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java b/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
index 571e181d35..9d2642231f 100644
--- a/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
+++ b/jmeter/src/test/java/org/activemq/usecases/SystemTestSupport.java
@@ -6,13 +6,13 @@ import javax.jms.*;
 import java.util.*;
 import java.net.URI;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.broker.BrokerService;
-import org.activemq.broker.BrokerFactory;
-import org.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
 
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;