[Java:] Renamed aeron-core -> aeron-client, aeron-util -> aeron-commo…

…n, and aeron-mediadriver -> aeron-driver.
Global19 · Jul 19, 2014 · 92fbb1c · 92fbb1c
1 parent 7c1525b
commit 92fbb1c
Show file tree

Hide file tree

Showing 191 changed files with 122 additions and 127 deletions.
diff --git a/README.md b/README.md
@@ -22,21 +22,21 @@ limitations under the License.
 Directory Structure
 -------------------
 
-API and protocol processing
+Client API and protocol processing
 
-    aeron-core
+    aeron-client
 
 Examples
 
     aeron-examples
 
 Media Driver
 
-    aeron-mediadriver
+    aeron-driver
 
-Utility Class/Methods
+Common Classes/Methods
 
-    aeron-util
+    aeron-common
 
 Benchmarks
 
@@ -73,8 +73,8 @@ Media Driver Packaging
 
 The Media Driver is packaged by the default build into an application that can be found here
 
-    aeron-mediadriver/build/distributions/aeron-mediadriver-${VERSION}.zip
+    aeron-driver/build/distributions/aeron-driver-${VERSION}.zip
 
 The Media Driver can also be run directly from Gradle
 
-    $ ./gradlew aeron-mediadriver:run
+    $ ./gradlew aeron-driver:run
diff --git a/aeron-core/.gitignore → aeron-client/.gitignore b/aeron-core/.gitignore → aeron-client/.gitignore
diff --git a/aeron-core/build.gradle → aeron-client/build.gradle b/aeron-core/build.gradle → aeron-client/build.gradle
diff --git a/...in/java/uk/co/real_logic/aeron/Aeron.java → ...in/java/uk/co/real_logic/aeron/Aeron.java b/...in/java/uk/co/real_logic/aeron/Aeron.java → ...in/java/uk/co/real_logic/aeron/Aeron.java
diff --git a/...logic/aeron/BufferExhaustedException.java → ...logic/aeron/BufferExhaustedException.java b/...logic/aeron/BufferExhaustedException.java → ...logic/aeron/BufferExhaustedException.java
diff --git a/...al_logic/aeron/ConnectedSubscription.java → ...al_logic/aeron/ConnectedSubscription.java b/...al_logic/aeron/ConnectedSubscription.java → ...al_logic/aeron/ConnectedSubscription.java
diff --git a/...a/uk/co/real_logic/aeron/DataHandler.java → ...a/uk/co/real_logic/aeron/DataHandler.java b/...a/uk/co/real_logic/aeron/DataHandler.java → ...a/uk/co/real_logic/aeron/DataHandler.java
diff --git a/...efaultPublicationFlowControlStrategy.java → ...efaultPublicationFlowControlStrategy.java b/...efaultPublicationFlowControlStrategy.java → ...efaultPublicationFlowControlStrategy.java
diff --git a/...o/real_logic/aeron/DummyErrorHandler.java → ...o/real_logic/aeron/DummyErrorHandler.java b/...o/real_logic/aeron/DummyErrorHandler.java → ...o/real_logic/aeron/DummyErrorHandler.java
diff --git a/.../uk/co/real_logic/aeron/ErrorHandler.java → .../uk/co/real_logic/aeron/ErrorHandler.java b/.../uk/co/real_logic/aeron/ErrorHandler.java → .../uk/co/real_logic/aeron/ErrorHandler.java
diff --git a/...al_logic/aeron/InactiveSourceHandler.java → ...al_logic/aeron/InactiveSourceHandler.java b/...al_logic/aeron/InactiveSourceHandler.java → ...al_logic/aeron/InactiveSourceHandler.java
diff --git a/...ic/aeron/MediaDriverTimeoutException.java → ...ic/aeron/MediaDriverTimeoutException.java b/...ic/aeron/MediaDriverTimeoutException.java → ...ic/aeron/MediaDriverTimeoutException.java
diff --git a/...co/real_logic/aeron/NewSourceHandler.java → ...co/real_logic/aeron/NewSourceHandler.java b/...co/real_logic/aeron/NewSourceHandler.java → ...co/real_logic/aeron/NewSourceHandler.java
diff --git a/...a/uk/co/real_logic/aeron/Publication.java → ...a/uk/co/real_logic/aeron/Publication.java b/...a/uk/co/real_logic/aeron/Publication.java → ...a/uk/co/real_logic/aeron/Publication.java
diff --git a/...aeron/PublicationFlowControlStrategy.java → ...aeron/PublicationFlowControlStrategy.java b/...aeron/PublicationFlowControlStrategy.java → ...aeron/PublicationFlowControlStrategy.java
diff --git a/...al_logic/aeron/RegistrationException.java → ...al_logic/aeron/RegistrationException.java b/...al_logic/aeron/RegistrationException.java → ...al_logic/aeron/RegistrationException.java
diff --git a/..._logic/aeron/SubscriberNotRegistered.java → ..._logic/aeron/SubscriberNotRegistered.java b/..._logic/aeron/SubscriberNotRegistered.java → ..._logic/aeron/SubscriberNotRegistered.java
diff --git a/.../uk/co/real_logic/aeron/Subscription.java → .../uk/co/real_logic/aeron/Subscription.java b/.../uk/co/real_logic/aeron/Subscription.java → .../uk/co/real_logic/aeron/Subscription.java
diff --git a/..._logic/aeron/conductor/BufferManager.java → ..._logic/aeron/conductor/BufferManager.java b/..._logic/aeron/conductor/BufferManager.java → ..._logic/aeron/conductor/BufferManager.java
diff --git a/...ogic/aeron/conductor/ClientConductor.java → ...ogic/aeron/conductor/ClientConductor.java b/...ogic/aeron/conductor/ClientConductor.java → ...ogic/aeron/conductor/ClientConductor.java
diff --git a/..._logic/aeron/conductor/ManagedBuffer.java → ..._logic/aeron/conductor/ManagedBuffer.java b/..._logic/aeron/conductor/ManagedBuffer.java → ..._logic/aeron/conductor/ManagedBuffer.java
diff --git a/.../aeron/conductor/MappedBufferManager.java → .../aeron/conductor/MappedBufferManager.java b/.../aeron/conductor/MappedBufferManager.java → .../aeron/conductor/MappedBufferManager.java
diff --git a/...nductor/MediaDriverBroadcastReceiver.java → ...nductor/MediaDriverBroadcastReceiver.java b/...nductor/MediaDriverBroadcastReceiver.java → ...nductor/MediaDriverBroadcastReceiver.java
diff --git a/.../aeron/conductor/MediaDriverListener.java → .../aeron/conductor/MediaDriverListener.java b/.../aeron/conductor/MediaDriverListener.java → .../aeron/conductor/MediaDriverListener.java
diff --git a/...gic/aeron/conductor/MediaDriverProxy.java → ...gic/aeron/conductor/MediaDriverProxy.java b/...gic/aeron/conductor/MediaDriverProxy.java → ...gic/aeron/conductor/MediaDriverProxy.java
diff --git a/...co/real_logic/aeron/conductor/Signal.java → ...co/real_logic/aeron/conductor/Signal.java b/...co/real_logic/aeron/conductor/Signal.java → ...co/real_logic/aeron/conductor/Signal.java
diff --git a/...ogic/aeron/conductor/SubscriptionMap.java → ...ogic/aeron/conductor/SubscriptionMap.java b/...ogic/aeron/conductor/SubscriptionMap.java → ...ogic/aeron/conductor/SubscriptionMap.java
diff --git a/.../uk/co/real_logic/aeron/package-info.java → .../uk/co/real_logic/aeron/package-info.java b/.../uk/co/real_logic/aeron/package-info.java → .../uk/co/real_logic/aeron/package-info.java
diff --git a/...ava/uk/co/real_logic/aeron/AeronTest.java → ...ava/uk/co/real_logic/aeron/AeronTest.java b/...ava/uk/co/real_logic/aeron/AeronTest.java → ...ava/uk/co/real_logic/aeron/AeronTest.java
diff --git a/...real_logic/aeron/ClientConductorTest.java → ...real_logic/aeron/ClientConductorTest.java b/...real_logic/aeron/ClientConductorTest.java → ...real_logic/aeron/ClientConductorTest.java
diff --git a/.../co/real_logic/aeron/MockBufferUsage.java → .../co/real_logic/aeron/MockBufferUsage.java b/.../co/real_logic/aeron/MockBufferUsage.java → .../co/real_logic/aeron/MockBufferUsage.java
diff --git a/.../co/real_logic/aeron/PublicationTest.java → .../co/real_logic/aeron/PublicationTest.java b/.../co/real_logic/aeron/PublicationTest.java → .../co/real_logic/aeron/PublicationTest.java
diff --git a/...on/conductor/MappedBufferManagerTest.java → ...on/conductor/MappedBufferManagerTest.java b/...on/conductor/MappedBufferManagerTest.java → ...on/conductor/MappedBufferManagerTest.java
diff --git a/...aeron/conductor/MediaDriverProxyTest.java → ...aeron/conductor/MediaDriverProxyTest.java b/...aeron/conductor/MediaDriverProxyTest.java → ...aeron/conductor/MediaDriverProxyTest.java
diff --git a/aeron-mediadriver/.gitignore → aeron-common/.gitignore b/aeron-mediadriver/.gitignore → aeron-common/.gitignore
diff --git a/aeron-util/build.gradle → aeron-common/build.gradle b/aeron-util/build.gradle → aeron-common/build.gradle
diff --git a/...va/uk/co/real_logic/aeron/util/Agent.java → ...va/uk/co/real_logic/aeron/util/Agent.java b/...va/uk/co/real_logic/aeron/util/Agent.java → ...va/uk/co/real_logic/aeron/util/Agent.java
diff --git a/...logic/aeron/util/BackoffIdleStrategy.java → ...logic/aeron/util/BackoffIdleStrategy.java b/...logic/aeron/util/BackoffIdleStrategy.java → ...logic/aeron/util/BackoffIdleStrategy.java
diff --git a/.../uk/co/real_logic/aeron/util/BitUtil.java → .../uk/co/real_logic/aeron/util/BitUtil.java b/.../uk/co/real_logic/aeron/util/BitUtil.java → .../uk/co/real_logic/aeron/util/BitUtil.java
diff --git a/...eal_logic/aeron/util/ChannelCounters.java → ...eal_logic/aeron/util/ChannelCounters.java b/...eal_logic/aeron/util/ChannelCounters.java → ...eal_logic/aeron/util/ChannelCounters.java
diff --git a/.../real_logic/aeron/util/CommonContext.java → .../real_logic/aeron/util/CommonContext.java b/.../real_logic/aeron/util/CommonContext.java → .../real_logic/aeron/util/CommonContext.java
diff --git a/...k/co/real_logic/aeron/util/ErrorCode.java → ...k/co/real_logic/aeron/util/ErrorCode.java b/...k/co/real_logic/aeron/util/ErrorCode.java → ...k/co/real_logic/aeron/util/ErrorCode.java
diff --git a/...ic/aeron/util/FeedbackDelayGenerator.java → ...ic/aeron/util/FeedbackDelayGenerator.java b/...ic/aeron/util/FeedbackDelayGenerator.java → ...ic/aeron/util/FeedbackDelayGenerator.java
diff --git a/...gic/aeron/util/FileMappingConvention.java → ...gic/aeron/util/FileMappingConvention.java b/...gic/aeron/util/FileMappingConvention.java → ...gic/aeron/util/FileMappingConvention.java
diff --git a/...k/co/real_logic/aeron/util/Flyweight.java → ...k/co/real_logic/aeron/util/Flyweight.java b/...k/co/real_logic/aeron/util/Flyweight.java → ...k/co/real_logic/aeron/util/Flyweight.java
diff --git a/...o/real_logic/aeron/util/IdleStrategy.java → ...o/real_logic/aeron/util/IdleStrategy.java b/...o/real_logic/aeron/util/IdleStrategy.java → ...o/real_logic/aeron/util/IdleStrategy.java
diff --git a/...a/uk/co/real_logic/aeron/util/IoUtil.java → ...a/uk/co/real_logic/aeron/util/IoUtil.java b/...a/uk/co/real_logic/aeron/util/IoUtil.java → ...a/uk/co/real_logic/aeron/util/IoUtil.java
diff --git a/.../util/OptimalMulticastDelayGenerator.java → .../util/OptimalMulticastDelayGenerator.java b/.../util/OptimalMulticastDelayGenerator.java → .../util/OptimalMulticastDelayGenerator.java
diff --git a/...o/real_logic/aeron/util/RateReporter.java → ...o/real_logic/aeron/util/RateReporter.java b/...o/real_logic/aeron/util/RateReporter.java → ...o/real_logic/aeron/util/RateReporter.java
diff --git a/...ogic/aeron/util/StaticDelayGenerator.java → ...ogic/aeron/util/StaticDelayGenerator.java b/...ogic/aeron/util/StaticDelayGenerator.java → ...ogic/aeron/util/StaticDelayGenerator.java
diff --git a/.../co/real_logic/aeron/util/TermHelper.java → .../co/real_logic/aeron/util/TermHelper.java b/.../co/real_logic/aeron/util/TermHelper.java → .../co/real_logic/aeron/util/TermHelper.java
diff --git a/.../co/real_logic/aeron/util/TimerWheel.java → .../co/real_logic/aeron/util/TimerWheel.java b/.../co/real_logic/aeron/util/TimerWheel.java → .../co/real_logic/aeron/util/TimerWheel.java
diff --git a/...o/real_logic/aeron/util/UnsafeAccess.java → ...o/real_logic/aeron/util/UnsafeAccess.java b/...o/real_logic/aeron/util/UnsafeAccess.java → ...o/real_logic/aeron/util/UnsafeAccess.java
diff --git a/...eron/util/collections/CollectionUtil.java → ...eron/util/collections/CollectionUtil.java b/...eron/util/collections/CollectionUtil.java → ...eron/util/collections/CollectionUtil.java
diff --git a/...aeron/util/collections/ConnectionMap.java → ...aeron/util/collections/ConnectionMap.java b/...aeron/util/collections/ConnectionMap.java → ...aeron/util/collections/ConnectionMap.java
diff --git a/...n/util/collections/Int2ObjectHashMap.java → ...n/util/collections/Int2ObjectHashMap.java b/...n/util/collections/Int2ObjectHashMap.java → ...n/util/collections/Int2ObjectHashMap.java
diff --git a/.../util/collections/Long2ObjectHashMap.java → .../util/collections/Long2ObjectHashMap.java b/.../util/collections/Long2ObjectHashMap.java → .../util/collections/Long2ObjectHashMap.java
diff --git a/...n/util/command/ControlProtocolEvents.java → ...n/util/command/ControlProtocolEvents.java b/...n/util/command/ControlProtocolEvents.java → ...n/util/command/ControlProtocolEvents.java
diff --git a/...l/command/CorrelatedMessageFlyweight.java → ...l/command/CorrelatedMessageFlyweight.java b/...l/command/CorrelatedMessageFlyweight.java → ...l/command/CorrelatedMessageFlyweight.java
diff --git a/...l/command/LogBuffersMessageFlyweight.java → ...l/command/LogBuffersMessageFlyweight.java b/...l/command/LogBuffersMessageFlyweight.java → ...l/command/LogBuffersMessageFlyweight.java
diff --git a/.../command/PublicationMessageFlyweight.java → .../command/PublicationMessageFlyweight.java b/.../command/PublicationMessageFlyweight.java → .../command/PublicationMessageFlyweight.java
diff --git a/...il/command/QualifiedMessageFlyweight.java → ...il/command/QualifiedMessageFlyweight.java b/...il/command/QualifiedMessageFlyweight.java → ...il/command/QualifiedMessageFlyweight.java
diff --git a/...command/SubscriptionMessageFlyweight.java → ...command/SubscriptionMessageFlyweight.java b/...command/SubscriptionMessageFlyweight.java → ...command/SubscriptionMessageFlyweight.java
diff --git a/...ogic/aeron/util/command/package-info.java → ...ogic/aeron/util/command/package-info.java b/...ogic/aeron/util/command/package-info.java → ...ogic/aeron/util/command/package-info.java
diff --git a/...ic/aeron/util/concurrent/AtomicArray.java → ...ic/aeron/util/concurrent/AtomicArray.java b/...ic/aeron/util/concurrent/AtomicArray.java → ...ic/aeron/util/concurrent/AtomicArray.java
diff --git a/...c/aeron/util/concurrent/AtomicBuffer.java → ...c/aeron/util/concurrent/AtomicBuffer.java b/...c/aeron/util/concurrent/AtomicBuffer.java → ...c/aeron/util/concurrent/AtomicBuffer.java
diff --git a/...aeron/util/concurrent/MessageHandler.java → ...aeron/util/concurrent/MessageHandler.java b/...aeron/util/concurrent/MessageHandler.java → ...aeron/util/concurrent/MessageHandler.java
diff --git a/...current/OneToOneConcurrentArrayQueue.java → ...current/OneToOneConcurrentArrayQueue.java b/...current/OneToOneConcurrentArrayQueue.java → ...current/OneToOneConcurrentArrayQueue.java
diff --git a/.../broadcast/BroadcastBufferDescriptor.java → .../broadcast/BroadcastBufferDescriptor.java b/.../broadcast/BroadcastBufferDescriptor.java → .../broadcast/BroadcastBufferDescriptor.java
diff --git a/...ncurrent/broadcast/BroadcastReceiver.java → ...ncurrent/broadcast/BroadcastReceiver.java b/...ncurrent/broadcast/BroadcastReceiver.java → ...ncurrent/broadcast/BroadcastReceiver.java
diff --git a/...rrent/broadcast/BroadcastTransmitter.java → ...rrent/broadcast/BroadcastTransmitter.java b/...rrent/broadcast/BroadcastTransmitter.java → ...rrent/broadcast/BroadcastTransmitter.java
diff --git a/...rent/broadcast/CopyBroadcastReceiver.java → ...rent/broadcast/CopyBroadcastReceiver.java b/...rent/broadcast/CopyBroadcastReceiver.java → ...rent/broadcast/CopyBroadcastReceiver.java
diff --git a/...oncurrent/broadcast/RecordDescriptor.java → ...oncurrent/broadcast/RecordDescriptor.java b/...oncurrent/broadcast/RecordDescriptor.java → ...oncurrent/broadcast/RecordDescriptor.java
diff --git a/...concurrent/logbuffer/FrameDescriptor.java → ...concurrent/logbuffer/FrameDescriptor.java b/...concurrent/logbuffer/FrameDescriptor.java → ...concurrent/logbuffer/FrameDescriptor.java
diff --git a/...util/concurrent/logbuffer/GapScanner.java → ...util/concurrent/logbuffer/GapScanner.java b/...util/concurrent/logbuffer/GapScanner.java → ...util/concurrent/logbuffer/GapScanner.java
diff --git a/...til/concurrent/logbuffer/LogAppender.java → ...til/concurrent/logbuffer/LogAppender.java b/...til/concurrent/logbuffer/LogAppender.java → ...til/concurrent/logbuffer/LogAppender.java
diff --git a/.../util/concurrent/logbuffer/LogBuffer.java → .../util/concurrent/logbuffer/LogBuffer.java b/.../util/concurrent/logbuffer/LogBuffer.java → .../util/concurrent/logbuffer/LogBuffer.java
diff --git a/...urrent/logbuffer/LogBufferDescriptor.java → ...urrent/logbuffer/LogBufferDescriptor.java b/...urrent/logbuffer/LogBufferDescriptor.java → ...urrent/logbuffer/LogBufferDescriptor.java
diff --git a/.../util/concurrent/logbuffer/LogReader.java → .../util/concurrent/logbuffer/LogReader.java b/.../util/concurrent/logbuffer/LogReader.java → .../util/concurrent/logbuffer/LogReader.java
diff --git a/...il/concurrent/logbuffer/LogRebuilder.java → ...il/concurrent/logbuffer/LogRebuilder.java b/...il/concurrent/logbuffer/LogRebuilder.java → ...il/concurrent/logbuffer/LogRebuilder.java
diff --git a/...util/concurrent/logbuffer/LogScanner.java → ...util/concurrent/logbuffer/LogScanner.java b/...util/concurrent/logbuffer/LogScanner.java → ...util/concurrent/logbuffer/LogScanner.java
diff --git a/...til/concurrent/logbuffer/StateViewer.java → ...til/concurrent/logbuffer/StateViewer.java b/...til/concurrent/logbuffer/StateViewer.java → ...til/concurrent/logbuffer/StateViewer.java
diff --git a/...rrent/ringbuffer/ManyToOneRingBuffer.java → ...rrent/ringbuffer/ManyToOneRingBuffer.java b/...rrent/ringbuffer/ManyToOneRingBuffer.java → ...rrent/ringbuffer/ManyToOneRingBuffer.java
diff --git a/...ncurrent/ringbuffer/RecordDescriptor.java → ...ncurrent/ringbuffer/RecordDescriptor.java b/...ncurrent/ringbuffer/RecordDescriptor.java → ...ncurrent/ringbuffer/RecordDescriptor.java
diff --git a/...til/concurrent/ringbuffer/RingBuffer.java → ...til/concurrent/ringbuffer/RingBuffer.java b/...til/concurrent/ringbuffer/RingBuffer.java → ...til/concurrent/ringbuffer/RingBuffer.java
diff --git a/...rent/ringbuffer/RingBufferDescriptor.java → ...rent/ringbuffer/RingBufferDescriptor.java b/...rent/ringbuffer/RingBufferDescriptor.java → ...rent/ringbuffer/RingBufferDescriptor.java
diff --git a/...eal_logic/aeron/util/event/EventCode.java → ...eal_logic/aeron/util/event/EventCode.java b/...eal_logic/aeron/util/event/EventCode.java → ...eal_logic/aeron/util/event/EventCode.java
diff --git a/...al_logic/aeron/util/event/EventCodec.java → ...al_logic/aeron/util/event/EventCodec.java b/...al_logic/aeron/util/event/EventCodec.java → ...al_logic/aeron/util/event/EventCodec.java
diff --git a/.../aeron/util/event/EventConfiguration.java → .../aeron/util/event/EventConfiguration.java b/.../aeron/util/event/EventConfiguration.java → .../aeron/util/event/EventConfiguration.java
diff --git a/...l_logic/aeron/util/event/EventLogger.java → ...l_logic/aeron/util/event/EventLogger.java b/...l_logic/aeron/util/event/EventLogger.java → ...l_logic/aeron/util/event/EventLogger.java
diff --git a/...l_logic/aeron/util/event/EventReader.java → ...l_logic/aeron/util/event/EventReader.java b/...l_logic/aeron/util/event/EventReader.java → ...l_logic/aeron/util/event/EventReader.java
diff --git a/...o/real_logic/aeron/util/package-info.java → ...o/real_logic/aeron/util/package-info.java b/...o/real_logic/aeron/util/package-info.java → ...o/real_logic/aeron/util/package-info.java
diff --git a/...on/util/protocol/DataHeaderFlyweight.java → ...on/util/protocol/DataHeaderFlyweight.java b/...on/util/protocol/DataHeaderFlyweight.java → ...on/util/protocol/DataHeaderFlyweight.java
diff --git a/...c/aeron/util/protocol/ErrorFlyweight.java → ...c/aeron/util/protocol/ErrorFlyweight.java b/...c/aeron/util/protocol/ErrorFlyweight.java → ...c/aeron/util/protocol/ErrorFlyweight.java
diff --git a/.../aeron/util/protocol/HeaderFlyweight.java → .../aeron/util/protocol/HeaderFlyweight.java b/.../aeron/util/protocol/HeaderFlyweight.java → .../aeron/util/protocol/HeaderFlyweight.java
diff --git a/...gic/aeron/util/protocol/NakFlyweight.java → ...gic/aeron/util/protocol/NakFlyweight.java b/...gic/aeron/util/protocol/NakFlyweight.java → ...gic/aeron/util/protocol/NakFlyweight.java
diff --git a/...util/protocol/StatusMessageFlyweight.java → ...util/protocol/StatusMessageFlyweight.java b/...util/protocol/StatusMessageFlyweight.java → ...util/protocol/StatusMessageFlyweight.java
diff --git a/...gic/aeron/util/protocol/package-info.java → ...gic/aeron/util/protocol/package-info.java b/...gic/aeron/util/protocol/package-info.java → ...gic/aeron/util/protocol/package-info.java
diff --git a/.../util/status/BufferPositionIndicator.java → .../util/status/BufferPositionIndicator.java b/.../util/status/BufferPositionIndicator.java → .../util/status/BufferPositionIndicator.java
diff --git a/...n/util/status/BufferPositionReporter.java → ...n/util/status/BufferPositionReporter.java b/...n/util/status/BufferPositionReporter.java → ...n/util/status/BufferPositionReporter.java
diff --git a/.../aeron/util/status/PositionIndicator.java → .../aeron/util/status/PositionIndicator.java b/.../aeron/util/status/PositionIndicator.java → .../aeron/util/status/PositionIndicator.java
diff --git a/...c/aeron/util/status/PositionReporter.java → ...c/aeron/util/status/PositionReporter.java b/...c/aeron/util/status/PositionReporter.java → ...c/aeron/util/status/PositionReporter.java
diff --git a/...eron/util/status/StatusBufferManager.java → ...eron/util/status/StatusBufferManager.java b/...eron/util/status/StatusBufferManager.java → ...eron/util/status/StatusBufferManager.java
diff --git a/...eal_logic/aeron/util/AtomicArrayTest.java → ...eal_logic/aeron/util/AtomicArrayTest.java b/...eal_logic/aeron/util/AtomicArrayTest.java → ...eal_logic/aeron/util/AtomicArrayTest.java
diff --git a/...co/real_logic/aeron/util/BitUtilTest.java → ...co/real_logic/aeron/util/BitUtilTest.java b/...co/real_logic/aeron/util/BitUtilTest.java → ...co/real_logic/aeron/util/BitUtilTest.java
diff --git a/.../real_logic/aeron/util/ErrorCodeTest.java → .../real_logic/aeron/util/ErrorCodeTest.java b/.../real_logic/aeron/util/ErrorCodeTest.java → .../real_logic/aeron/util/ErrorCodeTest.java
diff --git a/...aeron/util/FileMappingConventionTest.java → ...aeron/util/FileMappingConventionTest.java b/...aeron/util/FileMappingConventionTest.java → ...aeron/util/FileMappingConventionTest.java
diff --git a/.../real_logic/aeron/util/FlyweightTest.java → .../real_logic/aeron/util/FlyweightTest.java b/.../real_logic/aeron/util/FlyweightTest.java → .../real_logic/aeron/util/FlyweightTest.java
diff --git a/...l/OptimalMulticastDelayGeneratorTest.java → ...l/OptimalMulticastDelayGeneratorTest.java b/...l/OptimalMulticastDelayGeneratorTest.java → ...l/OptimalMulticastDelayGeneratorTest.java
diff --git a/...real_logic/aeron/util/TimerWheelTest.java → ...real_logic/aeron/util/TimerWheelTest.java b/...real_logic/aeron/util/TimerWheelTest.java → ...real_logic/aeron/util/TimerWheelTest.java
diff --git a/.../util/collections/CollectionUtilTest.java → .../util/collections/CollectionUtilTest.java b/.../util/collections/CollectionUtilTest.java → .../util/collections/CollectionUtilTest.java
diff --git a/...il/collections/Int2ObjectHashMapTest.java → ...il/collections/Int2ObjectHashMapTest.java b/...il/collections/Int2ObjectHashMapTest.java → ...il/collections/Int2ObjectHashMapTest.java
diff --git a/...l/collections/Long2ObjectHashMapTest.java → ...l/collections/Long2ObjectHashMapTest.java b/...l/collections/Long2ObjectHashMapTest.java → ...l/collections/Long2ObjectHashMapTest.java
diff --git a/...ron/util/concurrent/AtomicBufferTest.java → ...ron/util/concurrent/AtomicBufferTest.java b/...ron/util/concurrent/AtomicBufferTest.java → ...ron/util/concurrent/AtomicBufferTest.java
diff --git a/...rent/broadcast/BroadcastReceiverTest.java → ...rent/broadcast/BroadcastReceiverTest.java b/...rent/broadcast/BroadcastReceiverTest.java → ...rent/broadcast/BroadcastReceiverTest.java
diff --git a/...t/broadcast/BroadcastTransmitterTest.java → ...t/broadcast/BroadcastTransmitterTest.java b/...t/broadcast/BroadcastTransmitterTest.java → ...t/broadcast/BroadcastTransmitterTest.java
diff --git a/.../concurrent/logbuffer/GapScannerTest.java → .../concurrent/logbuffer/GapScannerTest.java b/.../concurrent/logbuffer/GapScannerTest.java → .../concurrent/logbuffer/GapScannerTest.java
diff --git a/...concurrent/logbuffer/LogAppenderTest.java → ...concurrent/logbuffer/LogAppenderTest.java b/...concurrent/logbuffer/LogAppenderTest.java → ...concurrent/logbuffer/LogAppenderTest.java
diff --git a/...l/concurrent/logbuffer/LogReaderTest.java → ...l/concurrent/logbuffer/LogReaderTest.java b/...l/concurrent/logbuffer/LogReaderTest.java → ...l/concurrent/logbuffer/LogReaderTest.java
diff --git a/...oncurrent/logbuffer/LogRebuilderTest.java → ...oncurrent/logbuffer/LogRebuilderTest.java b/...oncurrent/logbuffer/LogRebuilderTest.java → ...oncurrent/logbuffer/LogRebuilderTest.java
diff --git a/.../concurrent/logbuffer/LogScannerTest.java → .../concurrent/logbuffer/LogScannerTest.java b/.../concurrent/logbuffer/LogScannerTest.java → .../concurrent/logbuffer/LogScannerTest.java
diff --git a/...er/ManyToOneRingBufferConcurrentTest.java → ...er/ManyToOneRingBufferConcurrentTest.java b/...er/ManyToOneRingBufferConcurrentTest.java → ...er/ManyToOneRingBufferConcurrentTest.java
diff --git a/...t/ringbuffer/ManyToOneRingBufferTest.java → ...t/ringbuffer/ManyToOneRingBufferTest.java b/...t/ringbuffer/ManyToOneRingBufferTest.java → ...t/ringbuffer/ManyToOneRingBufferTest.java
diff --git a/...urrent/ringbuffer/RingBufferTestUtil.java → ...urrent/ringbuffer/RingBufferTestUtil.java b/...urrent/ringbuffer/RingBufferTestUtil.java → ...urrent/ringbuffer/RingBufferTestUtil.java
diff --git a/...ogic/aeron/util/event/EventCodecTest.java → ...ogic/aeron/util/event/EventCodecTest.java b/...ogic/aeron/util/event/EventCodecTest.java → ...ogic/aeron/util/event/EventCodecTest.java
diff --git a/...c/aeron/util/status/StatusBufferTest.java → ...c/aeron/util/status/StatusBufferTest.java b/...c/aeron/util/status/StatusBufferTest.java → ...c/aeron/util/status/StatusBufferTest.java
diff --git a/aeron-util/.gitignore → aeron-driver/.gitignore b/aeron-util/.gitignore → aeron-driver/.gitignore
diff --git a/aeron-mediadriver/build.gradle → aeron-driver/build.gradle b/aeron-mediadriver/build.gradle → aeron-driver/build.gradle
diff --git a/..._logic/aeron/mediadriver/ClientProxy.java → .../real_logic/aeron/driver/ClientProxy.java b/..._logic/aeron/mediadriver/ClientProxy.java → .../real_logic/aeron/driver/ClientProxy.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffers;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffers;
 import uk.co.real_logic.aeron.util.ErrorCode;
 import uk.co.real_logic.aeron.util.Flyweight;
 import uk.co.real_logic.aeron.util.command.CorrelatedMessageFlyweight;

diff --git a/...eron/mediadriver/ControlFrameHandler.java → ...gic/aeron/driver/ControlFrameHandler.java b/...eron/mediadriver/ControlFrameHandler.java → ...gic/aeron/driver/ControlFrameHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.collections.Long2ObjectHashMap;
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;

diff --git a/...mediadriver/ControlProtocolException.java → ...eron/driver/ControlProtocolException.java b/...mediadriver/ControlProtocolException.java → ...eron/driver/ControlProtocolException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.ErrorCode;
 

diff --git a/...c/aeron/mediadriver/DataFrameHandler.java → ..._logic/aeron/driver/DataFrameHandler.java b/...c/aeron/mediadriver/DataFrameHandler.java → ..._logic/aeron/driver/DataFrameHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.collections.Long2ObjectHashMap;
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;

diff --git a/...efaultMulticastSenderControlStrategy.java → ...efaultMulticastSenderControlStrategy.java b/...efaultMulticastSenderControlStrategy.java → ...efaultMulticastSenderControlStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import java.net.InetSocketAddress;
 

diff --git a/...iadriver/DriverConnectedSubscription.java → ...n/driver/DriverConnectedSubscription.java b/...iadriver/DriverConnectedSubscription.java → ...n/driver/DriverConnectedSubscription.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffers;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffers;
 import uk.co.real_logic.aeron.util.TermHelper;
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;
 import uk.co.real_logic.aeron.util.concurrent.logbuffer.LogBuffer;

diff --git a/.../aeron/mediadriver/DriverPublication.java → ...logic/aeron/driver/DriverPublication.java b/.../aeron/mediadriver/DriverPublication.java → ...logic/aeron/driver/DriverPublication.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffers;
-import uk.co.real_logic.aeron.mediadriver.buffer.RawLog;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffers;
+import uk.co.real_logic.aeron.driver.buffer.RawLog;
 import uk.co.real_logic.aeron.util.TermHelper;
 import uk.co.real_logic.aeron.util.TimerWheel;
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;

diff --git a/...aeron/mediadriver/DriverSubscription.java → ...ogic/aeron/driver/DriverSubscription.java b/...aeron/mediadriver/DriverSubscription.java → ...ogic/aeron/driver/DriverSubscription.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.collections.Long2ObjectHashMap;
 

diff --git a/...logic/aeron/mediadriver/FrameHandler.java → ...real_logic/aeron/driver/FrameHandler.java b/...logic/aeron/mediadriver/FrameHandler.java → ...real_logic/aeron/driver/FrameHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;
 import uk.co.real_logic.aeron.util.protocol.DataHeaderFlyweight;

diff --git a/...iadriver/InvalidDestinationException.java → ...n/driver/InvalidDestinationException.java b/...iadriver/InvalidDestinationException.java → ...n/driver/InvalidDestinationException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 public class InvalidDestinationException extends IllegalArgumentException
 {

diff --git a/..._logic/aeron/mediadriver/LossHandler.java → .../real_logic/aeron/driver/LossHandler.java b/..._logic/aeron/mediadriver/LossHandler.java → .../real_logic/aeron/driver/LossHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.FeedbackDelayGenerator;
 import uk.co.real_logic.aeron.util.TimerWheel;

diff --git a/...gic/aeron/mediadriver/MediaConductor.java → ...al_logic/aeron/driver/MediaConductor.java b/...gic/aeron/mediadriver/MediaConductor.java → ...al_logic/aeron/driver/MediaConductor.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffersFactory;
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffers;
-import uk.co.real_logic.aeron.mediadriver.cmd.CreateConnectedSubscriptionCmd;
-import uk.co.real_logic.aeron.mediadriver.cmd.NewConnectedSubscriptionCmd;
-import uk.co.real_logic.aeron.mediadriver.cmd.SubscriptionRemovedCmd;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffersFactory;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffers;
+import uk.co.real_logic.aeron.driver.cmd.CreateConnectedSubscriptionCmd;
+import uk.co.real_logic.aeron.driver.cmd.NewConnectedSubscriptionCmd;
+import uk.co.real_logic.aeron.driver.cmd.SubscriptionRemovedCmd;
 import uk.co.real_logic.aeron.util.*;
 import uk.co.real_logic.aeron.util.collections.Long2ObjectHashMap;
 import uk.co.real_logic.aeron.util.command.PublicationMessageFlyweight;
@@ -38,7 +38,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
-import static uk.co.real_logic.aeron.mediadriver.MediaDriver.*;
+import static uk.co.real_logic.aeron.driver.MediaDriver.*;
 import static uk.co.real_logic.aeron.util.ErrorCode.*;
 import static uk.co.real_logic.aeron.util.command.ControlProtocolEvents.*;
 

diff --git a/...eron/mediadriver/MediaConductorProxy.java → ...gic/aeron/driver/MediaConductorProxy.java b/...eron/mediadriver/MediaConductorProxy.java → ...gic/aeron/driver/MediaConductorProxy.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.cmd.CreateConnectedSubscriptionCmd;
-import uk.co.real_logic.aeron.mediadriver.cmd.SubscriptionRemovedCmd;
+import uk.co.real_logic.aeron.driver.cmd.CreateConnectedSubscriptionCmd;
+import uk.co.real_logic.aeron.driver.cmd.SubscriptionRemovedCmd;
 
 import java.util.Queue;
 

diff --git a/..._logic/aeron/mediadriver/MediaDriver.java → .../real_logic/aeron/driver/MediaDriver.java b/..._logic/aeron/mediadriver/MediaDriver.java → .../real_logic/aeron/driver/MediaDriver.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.buffer.TermBuffersFactory;
+import uk.co.real_logic.aeron.driver.buffer.TermBuffersFactory;
 import uk.co.real_logic.aeron.util.*;
 import uk.co.real_logic.aeron.util.concurrent.AtomicArray;
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;
@@ -44,8 +44,8 @@
  * <p>
  * Usage:
  * <code>
- * $ java -jar aeron-mediadriver.jar
- * $ java -Doption=value -jar aeron-mediadriver.jar
+ * $ java -jar aeron-driver.jar
+ * $ java -Doption=value -jar aeron-driver.jar
  * </code>
  * Properties
  * <ul>

diff --git a/...c/aeron/mediadriver/NakMessageSender.java → ..._logic/aeron/driver/NakMessageSender.java b/...c/aeron/mediadriver/NakMessageSender.java → ..._logic/aeron/driver/NakMessageSender.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 /**
  * Handler for sending a NAK

diff --git a/..._logic/aeron/mediadriver/NioSelector.java → .../real_logic/aeron/driver/NioSelector.java b/..._logic/aeron/mediadriver/NioSelector.java → .../real_logic/aeron/driver/NioSelector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.event.EventLogger;
 

diff --git a/..._logic/aeron/mediadriver/ReadHandler.java → .../real_logic/aeron/driver/ReadHandler.java b/..._logic/aeron/mediadriver/ReadHandler.java → .../real_logic/aeron/driver/ReadHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 /**
  * Interface for a handler of {@link java.nio.channels.SelectionKey#OP_READ} events

diff --git a/...eal_logic/aeron/mediadriver/Receiver.java → .../co/real_logic/aeron/driver/Receiver.java b/...eal_logic/aeron/mediadriver/Receiver.java → .../co/real_logic/aeron/driver/Receiver.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.cmd.*;
+import uk.co.real_logic.aeron.driver.cmd.*;
 import uk.co.real_logic.aeron.util.*;
 import uk.co.real_logic.aeron.util.concurrent.OneToOneConcurrentArrayQueue;
 import uk.co.real_logic.aeron.util.event.EventCode;
@@ -90,9 +90,9 @@ public void close()
     }
 
     /**
-     * Return the {@link uk.co.real_logic.aeron.mediadriver.NioSelector} in use by the thread
+     * Return the {@link uk.co.real_logic.aeron.driver.NioSelector} in use by the thread
      *
-     * @return the {@link uk.co.real_logic.aeron.mediadriver.NioSelector} in use by the thread
+     * @return the {@link uk.co.real_logic.aeron.driver.NioSelector} in use by the thread
      */
     public NioSelector nioSelector()
     {

diff --git a/...ogic/aeron/mediadriver/ReceiverProxy.java → ...eal_logic/aeron/driver/ReceiverProxy.java b/...ogic/aeron/mediadriver/ReceiverProxy.java → ...eal_logic/aeron/driver/ReceiverProxy.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
-import uk.co.real_logic.aeron.mediadriver.cmd.*;
+import uk.co.real_logic.aeron.driver.cmd.*;
 
 import java.util.Queue;
 

diff --git a/.../aeron/mediadriver/RetransmitHandler.java → ...logic/aeron/driver/RetransmitHandler.java b/.../aeron/mediadriver/RetransmitHandler.java → ...logic/aeron/driver/RetransmitHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.FeedbackDelayGenerator;
 import uk.co.real_logic.aeron.util.TimerWheel;

diff --git a/.../real_logic/aeron/mediadriver/Sender.java → ...uk/co/real_logic/aeron/driver/Sender.java b/.../real_logic/aeron/mediadriver/Sender.java → ...uk/co/real_logic/aeron/driver/Sender.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.Agent;
 import uk.co.real_logic.aeron.util.concurrent.AtomicArray;

diff --git a/...on/mediadriver/SenderControlStrategy.java → ...c/aeron/driver/SenderControlStrategy.java b/...on/mediadriver/SenderControlStrategy.java → ...c/aeron/driver/SenderControlStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import java.net.InetSocketAddress;
 

diff --git a/...n/mediadriver/SenderFlowControlState.java → .../aeron/driver/SenderFlowControlState.java b/...n/mediadriver/SenderFlowControlState.java → .../aeron/driver/SenderFlowControlState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

diff --git a/...eron/mediadriver/StatusMessageSender.java → ...gic/aeron/driver/StatusMessageSender.java b/...eron/mediadriver/StatusMessageSender.java → ...gic/aeron/driver/StatusMessageSender.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 /**
  * Handler for sending Status Messages (SMs)

diff --git a/...gic/aeron/mediadriver/UdpDestination.java → ...al_logic/aeron/driver/UdpDestination.java b/...gic/aeron/mediadriver/UdpDestination.java → ...al_logic/aeron/driver/UdpDestination.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.BitUtil;
 import uk.co.real_logic.aeron.util.event.EventCode;

diff --git a/...logic/aeron/mediadriver/UdpTransport.java → ...real_logic/aeron/driver/UdpTransport.java b/...logic/aeron/mediadriver/UdpTransport.java → ...real_logic/aeron/driver/UdpTransport.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;
 import uk.co.real_logic.aeron.util.concurrent.logbuffer.FrameDescriptor;

diff --git a/...adriver/UnicastSenderControlStrategy.java → .../driver/UnicastSenderControlStrategy.java b/...adriver/UnicastSenderControlStrategy.java → .../driver/UnicastSenderControlStrategy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 import java.net.InetSocketAddress;
 

diff --git a/...adriver/UnknownSubscriptionException.java → .../driver/UnknownSubscriptionException.java b/...adriver/UnknownSubscriptionException.java → .../driver/UnknownSubscriptionException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver;
+package uk.co.real_logic.aeron.driver;
 
 public class UnknownSubscriptionException extends IllegalArgumentException
 {

diff --git a/...eron/mediadriver/buffer/MappedRawLog.java → ...gic/aeron/driver/buffer/MappedRawLog.java b/...eron/mediadriver/buffer/MappedRawLog.java → ...gic/aeron/driver/buffer/MappedRawLog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver.buffer;
+package uk.co.real_logic.aeron.driver.buffer;
 
 import uk.co.real_logic.aeron.util.IoUtil;
 import uk.co.real_logic.aeron.util.command.LogBuffersMessageFlyweight;

diff --git a/...mediadriver/buffer/MappedTermBuffers.java → ...eron/driver/buffer/MappedTermBuffers.java b/...mediadriver/buffer/MappedTermBuffers.java → ...eron/driver/buffer/MappedTermBuffers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver.buffer;
+package uk.co.real_logic.aeron.driver.buffer;
 
 import uk.co.real_logic.aeron.util.IoUtil;
 import uk.co.real_logic.aeron.util.command.LogBuffersMessageFlyweight;

diff --git a/...ogic/aeron/mediadriver/buffer/RawLog.java → ...eal_logic/aeron/driver/buffer/RawLog.java b/...ogic/aeron/mediadriver/buffer/RawLog.java → ...eal_logic/aeron/driver/buffer/RawLog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver.buffer;
+package uk.co.real_logic.aeron.driver.buffer;
 
 import uk.co.real_logic.aeron.util.concurrent.AtomicBuffer;
 

diff --git a/...aeron/mediadriver/buffer/TermBuffers.java → ...ogic/aeron/driver/buffer/TermBuffers.java b/...aeron/mediadriver/buffer/TermBuffers.java → ...ogic/aeron/driver/buffer/TermBuffers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.mediadriver.buffer;
+package uk.co.real_logic.aeron.driver.buffer;
 
 import uk.co.real_logic.aeron.util.command.LogBuffersMessageFlyweight;