diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/AbstractCommand.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/AbstractCommand.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/AbstractCommand.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/BaseDataStreamMarshaller.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/BaseDataStreamMarshaller.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/BooleanStream.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/BooleanStream.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/BrokerError.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/BrokerError.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/BrokerError.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/Command.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/Command.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/Command.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/DataStructure.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/DataStructure.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/DataStructure.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/DataStructureSupport.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/DataStructureSupport.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/DataStructureSupport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/Dispatcher.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/Dispatcher.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/Dispatcher.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/FutureResponse.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/FutureResponse.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/FutureResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/ISynchronization.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/ISynchronization.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/ISynchronization.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/ITransport.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/ITransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/ITransport.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/ITransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/MarshallAware.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/MarshallAware.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/MarshallAware.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/MessagePropertyHelper.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/MessagePropertyHelper.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/OpenWireFormat.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/OpenWireFormat.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/PrimitiveMap.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/PrimitiveMap.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/SocketTransport.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/SocketTransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/SocketTransport.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/SocketTransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/Core/TransactionContext.cs b/openwire-dotnet/src/ActiveMQ/OpenWire/TransactionContext.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/Core/TransactionContext.cs
rename to openwire-dotnet/src/ActiveMQ/OpenWire/TransactionContext.cs