diff --git a/openwire-dotnet/OpenWire.build b/activemq-dotnet/nant.build
similarity index 100%
rename from openwire-dotnet/OpenWire.build
rename to activemq-dotnet/nant.build
diff --git a/openwire-dotnet/src/ActiveMQ/BrokerException.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/BrokerException.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/BrokerException.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/AbstractCommand.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/AbstractCommand.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQBytesMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQBytesMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQDestination.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQDestination.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMapMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMapMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQObjectMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQObjectMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQQueue.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQQueue.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQStreamMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQStreamMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQStreamMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempDestination.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempDestination.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempDestination.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempQueue.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempQueue.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTempTopic.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTempTopic.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTextMessage.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTextMessage.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ActiveMQTopic.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ActiveMQTopic.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BaseCommand.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/BaseCommand.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BaseCommand.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerError.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/BrokerError.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerError.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/BrokerId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/BrokerInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/BrokerInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/Command.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Command.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/Command.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Command.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ConnectionError.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionError.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ConnectionId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ConnectionInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConnectionInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ConsumerId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ConsumerInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ConsumerInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ControlCommand.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ControlCommand.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DataArrayResponse.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataArrayResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DataResponse.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataStructure.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DataStructure.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataStructure.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataStructureSupport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DataStructureSupport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DataStructureSupport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DestinationInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DestinationInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/DiscoveryEvent.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/DiscoveryEvent.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ExceptionResponse.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ExceptionResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/FlushCommand.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/FlushCommand.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/IntegerResponse.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/IntegerResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/JournalQueueAck.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalQueueAck.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/JournalTopicAck.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTopicAck.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/JournalTrace.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTrace.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/JournalTransaction.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/JournalTransaction.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/KeepAliveInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/KeepAliveInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/LocalTransactionId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/LocalTransactionId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MarshallAware.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/MarshallAware.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MarshallAware.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/Message.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/Message.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Message.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/MessageAck.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageAck.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/MessageDispatch.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatch.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/MessageDispatchNotification.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageDispatchNotification.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/MessageId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/MessageId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ProducerId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ProducerInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ProducerInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/RemoveInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/RemoveSubscriptionInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/Response.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/Response.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/Response.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/SessionId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/SessionInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SessionInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/ShutdownInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/ShutdownInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/SubscriptionInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/SubscriptionInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/TransactionId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/TransactionInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/TransactionInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/WireFormatInfo.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/WireFormatInfo.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Commands/XATransactionId.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Commands/XATransactionId.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Connection.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Connection.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Connection.cs
diff --git a/openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/ConnectionClosedException.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionClosedException.cs
diff --git a/openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/ConnectionFactory.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/ConnectionFactory.cs
diff --git a/openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/ConsumerClosedException.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/ConsumerClosedException.cs
diff --git a/openwire-dotnet/src/ActiveMQ/DestinationFilter.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/DestinationFilter.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/DestinationFilter.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/DestinationFilter.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Dispatcher.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Dispatcher.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Dispatcher.cs
diff --git a/openwire-dotnet/src/ActiveMQ/ISynchronization.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/ISynchronization.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/ISynchronization.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/ISynchronization.cs
diff --git a/openwire-dotnet/src/ActiveMQ/MessageConsumer.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/MessageConsumer.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/MessageConsumer.cs
diff --git a/openwire-dotnet/src/ActiveMQ/MessageProducer.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/MessageProducer.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/MessageProducer.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire.Client.build b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire.Client.build
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire.Client.build
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire.Client.build
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BaseDataStreamMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/BooleanStream.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/BooleanStream.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/EndianSupport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/EndianSupport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/EndianSupport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/MessagePropertyHelper.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/MessagePropertyHelper.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireBinaryReader.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireBinaryReader.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryReader.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireBinaryWriter.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/OpenWireFormat.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/OpenWireFormat.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/PrimitiveMap.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/PrimitiveMap.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQBytesMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQDestinationMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMapMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQObjectMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQQueueMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQStreamMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempDestinationMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempQueueMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTempTopicMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTextMessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ActiveMQTopicMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BaseCommandMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/BrokerInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionErrorMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConnectionInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ConsumerInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ControlCommandMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataArrayResponseMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataResponseMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DataStructureSupportMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DestinationInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/DiscoveryEventMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ExceptionResponseMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/FlushCommandMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/IntegerResponseMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalQueueAckMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTopicAckMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTraceMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/JournalTransactionMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/KeepAliveInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/LocalTransactionIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MarshallerFactory.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageAckMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageDispatchNotificationMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/MessageMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ProducerInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/RemoveSubscriptionInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ResponseMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SessionInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/ShutdownInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/SubscriptionInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/TransactionInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/WireFormatInfoMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/OpenWire/V1/XATransactionIdMarshaller.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Session.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Session.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Session.cs
diff --git a/openwire-dotnet/src/ActiveMQ/TransactionContext.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/TransactionContext.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/TransactionContext.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/TransactionContext.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/FutureResponse.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/FutureResponse.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/FutureResponse.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/ITransport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/ITransportFactory.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransportFactory.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/ITransportFactory.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ITransportFactory.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/LoggingTransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/LoggingTransport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/LoggingTransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/MutexTransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/MutexTransport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/MutexTransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ResponseCorrelator.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/ResponseCorrelator.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/ResponseCorrelator.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransport.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransport.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/Tcp/TcpTransportFactory.cs
diff --git a/openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs b/activemq-dotnet/src/main/csharp/ActiveMQ/Transport/TransportFilter.cs
similarity index 100%
rename from openwire-dotnet/src/ActiveMQ/Transport/TransportFilter.cs
rename to activemq-dotnet/src/main/csharp/ActiveMQ/Transport/TransportFilter.cs
diff --git a/openwire-dotnet/src/JMS/IBytesMessage.cs b/activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IBytesMessage.cs
rename to activemq-dotnet/src/main/csharp/JMS/IBytesMessage.cs
diff --git a/openwire-dotnet/src/JMS/IConnection.cs b/activemq-dotnet/src/main/csharp/JMS/IConnection.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IConnection.cs
rename to activemq-dotnet/src/main/csharp/JMS/IConnection.cs
diff --git a/openwire-dotnet/src/JMS/IConnectionFactory.cs b/activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IConnectionFactory.cs
rename to activemq-dotnet/src/main/csharp/JMS/IConnectionFactory.cs
diff --git a/openwire-dotnet/src/JMS/IDestination.cs b/activemq-dotnet/src/main/csharp/JMS/IDestination.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IDestination.cs
rename to activemq-dotnet/src/main/csharp/JMS/IDestination.cs
diff --git a/openwire-dotnet/src/JMS/IMapMessage.cs b/activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IMapMessage.cs
rename to activemq-dotnet/src/main/csharp/JMS/IMapMessage.cs
diff --git a/openwire-dotnet/src/JMS/IMessage.cs b/activemq-dotnet/src/main/csharp/JMS/IMessage.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IMessage.cs
rename to activemq-dotnet/src/main/csharp/JMS/IMessage.cs
diff --git a/openwire-dotnet/src/JMS/IMessageConsumer.cs b/activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IMessageConsumer.cs
rename to activemq-dotnet/src/main/csharp/JMS/IMessageConsumer.cs
diff --git a/openwire-dotnet/src/JMS/IMessageProducer.cs b/activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IMessageProducer.cs
rename to activemq-dotnet/src/main/csharp/JMS/IMessageProducer.cs
diff --git a/openwire-dotnet/src/JMS/IPrimitiveMap.cs b/activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IPrimitiveMap.cs
rename to activemq-dotnet/src/main/csharp/JMS/IPrimitiveMap.cs
diff --git a/openwire-dotnet/src/JMS/IQueue.cs b/activemq-dotnet/src/main/csharp/JMS/IQueue.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IQueue.cs
rename to activemq-dotnet/src/main/csharp/JMS/IQueue.cs
diff --git a/openwire-dotnet/src/JMS/ISession.cs b/activemq-dotnet/src/main/csharp/JMS/ISession.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/ISession.cs
rename to activemq-dotnet/src/main/csharp/JMS/ISession.cs
diff --git a/openwire-dotnet/src/JMS/IStartable.cs b/activemq-dotnet/src/main/csharp/JMS/IStartable.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IStartable.cs
rename to activemq-dotnet/src/main/csharp/JMS/IStartable.cs
diff --git a/openwire-dotnet/src/JMS/IStoppable.cs b/activemq-dotnet/src/main/csharp/JMS/IStoppable.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/IStoppable.cs
rename to activemq-dotnet/src/main/csharp/JMS/IStoppable.cs
diff --git a/openwire-dotnet/src/JMS/ITemporaryQueue.cs b/activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/ITemporaryQueue.cs
rename to activemq-dotnet/src/main/csharp/JMS/ITemporaryQueue.cs
diff --git a/openwire-dotnet/src/JMS/ITemporaryTopic.cs b/activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/ITemporaryTopic.cs
rename to activemq-dotnet/src/main/csharp/JMS/ITemporaryTopic.cs
diff --git a/openwire-dotnet/src/JMS/ITextMessage.cs b/activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/ITextMessage.cs
rename to activemq-dotnet/src/main/csharp/JMS/ITextMessage.cs
diff --git a/openwire-dotnet/src/JMS/ITopic.cs b/activemq-dotnet/src/main/csharp/JMS/ITopic.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/ITopic.cs
rename to activemq-dotnet/src/main/csharp/JMS/ITopic.cs
diff --git a/openwire-dotnet/src/JMS/JMSConnectionException.cs b/activemq-dotnet/src/main/csharp/JMS/JMSConnectionException.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/JMSConnectionException.cs
rename to activemq-dotnet/src/main/csharp/JMS/JMSConnectionException.cs
diff --git a/openwire-dotnet/src/JMS/JMSException.cs b/activemq-dotnet/src/main/csharp/JMS/JMSException.cs
similarity index 100%
rename from openwire-dotnet/src/JMS/JMSException.cs
rename to activemq-dotnet/src/main/csharp/JMS/JMSException.cs
diff --git a/openwire-dotnet/tests/ActiveMQ/Commands/CommandTest.cs b/activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs
similarity index 100%
rename from openwire-dotnet/tests/ActiveMQ/Commands/CommandTest.cs
rename to activemq-dotnet/src/test/csharp/ActiveMQ/Commands/CommandTest.cs
diff --git a/openwire-dotnet/tests/ActiveMQ/OpenWire.Client.build b/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire.Client.build
similarity index 100%
rename from openwire-dotnet/tests/ActiveMQ/OpenWire.Client.build
rename to activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire.Client.build
diff --git a/openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs b/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs
similarity index 100%
rename from openwire-dotnet/tests/ActiveMQ/OpenWire/BooleanStreamTest.cs
rename to activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/BooleanStreamTest.cs
diff --git a/openwire-dotnet/tests/ActiveMQ/OpenWire/EndianTest.cs b/activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/EndianTest.cs
similarity index 100%
rename from openwire-dotnet/tests/ActiveMQ/OpenWire/EndianTest.cs
rename to activemq-dotnet/src/test/csharp/ActiveMQ/OpenWire/EndianTest.cs
diff --git a/openwire-dotnet/tests/ActiveMQ/TestMain.cs b/activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
similarity index 100%
rename from openwire-dotnet/tests/ActiveMQ/TestMain.cs
rename to activemq-dotnet/src/test/csharp/ActiveMQ/TestMain.cs
diff --git a/openwire-dotnet/tests/JMS/AsyncConsumeTest.cs b/activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/AsyncConsumeTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/AsyncConsumeTest.cs
diff --git a/openwire-dotnet/tests/JMS/BadConsumeTest.cs b/activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/BadConsumeTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/BadConsumeTest.cs
diff --git a/openwire-dotnet/tests/JMS/BytesMessageTest.cs b/activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/BytesMessageTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/BytesMessageTest.cs
diff --git a/openwire-dotnet/tests/JMS/ConsumerTest.cs b/activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/ConsumerTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/ConsumerTest.cs
diff --git a/openwire-dotnet/tests/JMS/JMSPropertyTest.cs b/activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/JMSPropertyTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/JMSPropertyTest.cs
diff --git a/openwire-dotnet/tests/JMS/JMSTestSupport.cs b/activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/JMSTestSupport.cs
rename to activemq-dotnet/src/test/csharp/JMS/JMSTestSupport.cs
diff --git a/openwire-dotnet/tests/JMS/MapMessageTest.cs b/activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/MapMessageTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/MapMessageTest.cs
diff --git a/openwire-dotnet/tests/JMS/MessageTest.cs b/activemq-dotnet/src/test/csharp/JMS/MessageTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/MessageTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/MessageTest.cs
diff --git a/openwire-dotnet/tests/JMS/TextMessage.cs b/activemq-dotnet/src/test/csharp/JMS/TextMessage.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/TextMessage.cs
rename to activemq-dotnet/src/test/csharp/JMS/TextMessage.cs
diff --git a/openwire-dotnet/tests/JMS/TransactionTest.cs b/activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs
similarity index 100%
rename from openwire-dotnet/tests/JMS/TransactionTest.cs
rename to activemq-dotnet/src/test/csharp/JMS/TransactionTest.cs
diff --git a/pom.xml b/pom.xml
index 1e6315f11c..2ef8b2a16f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -469,12 +469,8 @@
-
+
-
-
junit
junit
@@ -495,8 +491,8 @@
cglib-full
test
-
+-->