diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs
index 343b90ea..d79fd4f8 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Config/NmsNamespaceHandlerTests.cs
@@ -26,17 +26,15 @@ using NUnit.Framework;
 using Rhino.Mocks;
 using Spring.Context;
 using Spring.Context.Support;
-using Spring.Messaging.Nms.Core.Connections;
-using Spring.Messaging.Nms.Core.Connections;
-using Spring.Messaging.Nms.Core.Listener;
-using Spring.Messaging.Nms.Core.Listener;
+using Spring.Messaging.Nms.Core;
+using Spring.Messaging.Nms.Connections;
+using Spring.Messaging.Nms.Listener;
 using Spring.Objects;
 using Spring.Objects.Factory.Xml;
-using Spring.Testing.NUnit;
 
 #endregion
 
-namespace Spring.Messaging.Nms.Core.Config
+namespace Spring.Messaging.Nms.Config
 {
     /// <summary>
     /// This class contains tests for 
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
index abb4cbd2..56b87b1b 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/CachingConnectionFactoryTests.cs
@@ -26,7 +26,7 @@ using Rhino.Mocks;
 
 #endregion
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     /// <summary>
     /// This class contains tests for 
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
index 88cf6a3b..f44574c7 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/MessageTransactionManagerTests.cs
@@ -24,13 +24,14 @@ using System;
 using Apache.NMS;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Spring.Messaging.Nms.Core.Connections;
+using Spring.Messaging.Nms.Connections;
+using Spring.Messaging.Nms.Core;
 using Spring.Transaction;
 using Spring.Transaction.Support;
 
 #endregion
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     /// <summary>
     /// This class contains tests for 
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs
index 715ad353..7fb0e704 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/SingleConnectionFactoryTests.cs
@@ -24,11 +24,12 @@ using System;
 using Apache.NMS;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Spring.Messaging.Nms.Core.Connections;
+using Spring.Messaging.Nms.Connections;
+using Spring.Messaging.Nms.Core;
 
 #endregion
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     /// <summary>
     /// This class contains tests for the SingleConnectionFactory
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
index 61323e82..f58653d8 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnection.cs
@@ -1,7 +1,7 @@
 using System;
 using Apache.NMS;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     public class TestConnection : IConnection
     {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs
index a5f8ccd2..3227d3be 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestConnectionFactory.cs
@@ -2,7 +2,7 @@
 
 using Apache.NMS;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     public class TestConnectionFactory : IConnectionFactory
     {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs
index 7dc85962..55347ff9 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestExceptionListener.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using System;
+using Spring.Messaging.Nms.Core;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     public class TestExceptionListener : IExceptionListener
     {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs
index 54ba0f49..864f4f75 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageListener.cs
@@ -19,8 +19,9 @@
 #endregion
 
 using Apache.NMS;
+using Spring.Messaging.Nms.Core;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
     /// <summary>
     ///
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs
index 4def73ad..b1a5d755 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestMessageProducer.cs
@@ -21,7 +21,7 @@
 using System;
 using Apache.NMS;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
 
     public class TestMessageProducer : IMessageProducer
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs
index ae8fcce8..82c6c401 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Connections/TestSession.cs
@@ -20,11 +20,10 @@
 
 using System;
 using Apache.NMS;
-using Apache.NMS.ActiveMQ;
 using Apache.NMS.ActiveMQ.Commands;
 using Rhino.Mocks;
 
-namespace Spring.Messaging.Nms.Core.Connections
+namespace Spring.Messaging.Nms.Connections
 {
 
     public class TestSession : ISession
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs
index b6baaa60..00dc0496 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Core/MessageTemplateTests.cs
@@ -24,11 +24,8 @@ using System.Collections;
 using Apache.NMS;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Spring.Messaging.Nms.Core.Connections;
-using Spring.Messaging.Nms.Core.Connections;
-using Spring.Messaging.Nms.Core.Support.Destinations;
-using Spring.Messaging.Nms.Core.Support.Destinations;
-using Spring.Transaction;
+using Spring.Messaging.Nms.Connections;
+using Spring.Messaging.Nms.Support.Destinations;
 using Spring.Transaction.Support;
 
 #endregion
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs
index 789e3a73..dd258998 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/LoggingExceptionHandler.cs
@@ -2,7 +2,7 @@ using System;
 using Spring.Messaging.Nms.Core;
 using Common.Logging;
 
-namespace Spring.Messaging.Nms.Core.Integration
+namespace Spring.Messaging.Nms.Integration
 {
     /// <summary>
     /// 
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs
index 27567bca..f0b4cbc0 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs
@@ -4,7 +4,7 @@ using Spring.Messaging.Nms.Core;
 using Apache.NMS;
 using Common.Logging;
 
-namespace Spring.Messaging.Nms.Core.Integration
+namespace Spring.Messaging.Nms.Integration
 {
     public class SimpleMessageListener : IMessageListener
     {
diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs
index 83096cbc..4b92842a 100644
--- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs
+++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListenerContainerTests.cs
@@ -23,13 +23,13 @@
 using System;
 using System.Threading;
 using NUnit.Framework;
-using Spring.Messaging.Nms.Core.Listener;
-using Spring.Messaging.Nms.Core.Listener;
+using Spring.Messaging.Nms.Core;
+using Spring.Messaging.Nms.Listener;
 using Spring.Testing.NUnit;
 
 #endregion
 
-namespace Spring.Messaging.Nms.Core.Integration
+namespace Spring.Messaging.Nms.Integration
 {
     /// <summary>
     /// This class contains tests for