refactor: rename engine modules

ptitjes · Aug 5, 2024 · 10e7fae · 10e7fae
1 parent b9ce7dc
commit 10e7fae
Show file tree

Hide file tree

Showing 118 changed files with 34 additions and 22 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,9 @@ subprojects {
 
 dependencies {
     kover(project(":kzmq-core"))
-    kover(project(":kzmq-cio"))
-    kover(project(":kzmq-libzmq"))
+    kover(project(":kzmq-engine-cio"))
+    kover(project(":kzmq-engine-jeromq"))
+    kover(project(":kzmq-engine-libzmq"))
+    kover(project(":kzmq-engine-zeromqjs"))
     kover(project(":kzmq-tests"))
 }
diff --git a/kzmq-benchmarks/build.gradle.kts b/kzmq-benchmarks/build.gradle.kts
@@ -24,8 +24,8 @@ kotlin {
 
         jvmMain {
             dependencies {
-                implementation(project(":kzmq-jeromq"))
-                implementation(project(":kzmq-cio"))
+                implementation(project(":kzmq-engine-jeromq"))
+                implementation(project(":kzmq-engine-cio"))
             }
         }
     }

diff --git a/kzmq-cio/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer b/kzmq-cio/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
diff --git a/kzmq-cio/build.gradle.kts → kzmq-engine-cio/build.gradle.kts b/kzmq-cio/build.gradle.kts → kzmq-engine-cio/build.gradle.kts
diff --git a/...o/src/commonMain/kotlin/org/zeromq/CIO.kt → ...o/src/commonMain/kotlin/org/zeromq/CIO.kt b/...o/src/commonMain/kotlin/org/zeromq/CIO.kt → ...o/src/commonMain/kotlin/org/zeromq/CIO.kt
diff --git a/...Main/kotlin/org/zeromq/CIODealerSocket.kt → ...Main/kotlin/org/zeromq/CIODealerSocket.kt b/...Main/kotlin/org/zeromq/CIODealerSocket.kt → ...Main/kotlin/org/zeromq/CIODealerSocket.kt
diff --git a/...commonMain/kotlin/org/zeromq/CIOEngine.kt → ...commonMain/kotlin/org/zeromq/CIOEngine.kt b/...commonMain/kotlin/org/zeromq/CIOEngine.kt → ...commonMain/kotlin/org/zeromq/CIOEngine.kt
diff --git a/...onMain/kotlin/org/zeromq/CIOPairSocket.kt → ...onMain/kotlin/org/zeromq/CIOPairSocket.kt b/...onMain/kotlin/org/zeromq/CIOPairSocket.kt → ...onMain/kotlin/org/zeromq/CIOPairSocket.kt
diff --git a/...n/kotlin/org/zeromq/CIOPublisherSocket.kt → ...n/kotlin/org/zeromq/CIOPublisherSocket.kt b/...n/kotlin/org/zeromq/CIOPublisherSocket.kt → ...n/kotlin/org/zeromq/CIOPublisherSocket.kt
diff --git a/...onMain/kotlin/org/zeromq/CIOPullSocket.kt → ...onMain/kotlin/org/zeromq/CIOPullSocket.kt b/...onMain/kotlin/org/zeromq/CIOPullSocket.kt → ...onMain/kotlin/org/zeromq/CIOPullSocket.kt
diff --git a/...onMain/kotlin/org/zeromq/CIOPushSocket.kt → ...onMain/kotlin/org/zeromq/CIOPushSocket.kt b/...onMain/kotlin/org/zeromq/CIOPushSocket.kt → ...onMain/kotlin/org/zeromq/CIOPushSocket.kt
diff --git a/...ain/kotlin/org/zeromq/CIOReceiveSocket.kt → ...ain/kotlin/org/zeromq/CIOReceiveSocket.kt b/...ain/kotlin/org/zeromq/CIOReceiveSocket.kt → ...ain/kotlin/org/zeromq/CIOReceiveSocket.kt
diff --git a/...nMain/kotlin/org/zeromq/CIOReplySocket.kt → ...nMain/kotlin/org/zeromq/CIOReplySocket.kt b/...nMain/kotlin/org/zeromq/CIOReplySocket.kt → ...nMain/kotlin/org/zeromq/CIOReplySocket.kt
diff --git a/...ain/kotlin/org/zeromq/CIORequestSocket.kt → ...ain/kotlin/org/zeromq/CIORequestSocket.kt b/...ain/kotlin/org/zeromq/CIORequestSocket.kt → ...ain/kotlin/org/zeromq/CIORequestSocket.kt
diff --git a/...Main/kotlin/org/zeromq/CIORouterSocket.kt → ...Main/kotlin/org/zeromq/CIORouterSocket.kt b/...Main/kotlin/org/zeromq/CIORouterSocket.kt → ...Main/kotlin/org/zeromq/CIORouterSocket.kt
diff --git a/...onMain/kotlin/org/zeromq/CIOSendSocket.kt → ...onMain/kotlin/org/zeromq/CIOSendSocket.kt b/...onMain/kotlin/org/zeromq/CIOSendSocket.kt → ...onMain/kotlin/org/zeromq/CIOSendSocket.kt
diff --git a/...commonMain/kotlin/org/zeromq/CIOSocket.kt → ...commonMain/kotlin/org/zeromq/CIOSocket.kt b/...commonMain/kotlin/org/zeromq/CIOSocket.kt → ...commonMain/kotlin/org/zeromq/CIOSocket.kt
diff --git a/.../kotlin/org/zeromq/CIOSubscriberSocket.kt → .../kotlin/org/zeromq/CIOSubscriberSocket.kt b/.../kotlin/org/zeromq/CIOSubscriberSocket.kt → .../kotlin/org/zeromq/CIOSubscriberSocket.kt
diff --git a/.../kotlin/org/zeromq/CIOXPublisherSocket.kt → .../kotlin/org/zeromq/CIOXPublisherSocket.kt b/.../kotlin/org/zeromq/CIOXPublisherSocket.kt → .../kotlin/org/zeromq/CIOXPublisherSocket.kt
diff --git a/...kotlin/org/zeromq/CIOXSubscriberSocket.kt → ...kotlin/org/zeromq/CIOXSubscriberSocket.kt b/...kotlin/org/zeromq/CIOXSubscriberSocket.kt → ...kotlin/org/zeromq/CIOXSubscriberSocket.kt
diff --git a/...ain/kotlin/org/zeromq/internal/Command.kt → ...ain/kotlin/org/zeromq/internal/Command.kt b/...ain/kotlin/org/zeromq/internal/Command.kt → ...ain/kotlin/org/zeromq/internal/Command.kt
diff --git a/...n/org/zeromq/internal/CommandOrMessage.kt → ...n/org/zeromq/internal/CommandOrMessage.kt b/...n/org/zeromq/internal/CommandOrMessage.kt → ...n/org/zeromq/internal/CommandOrMessage.kt
diff --git a/...n/org/zeromq/internal/InvalidReadFrame.kt → ...n/org/zeromq/internal/InvalidReadFrame.kt b/...n/org/zeromq/internal/InvalidReadFrame.kt → ...n/org/zeromq/internal/InvalidReadFrame.kt
diff --git a/.../kotlin/org/zeromq/internal/MessageOps.kt → .../kotlin/org/zeromq/internal/MessageOps.kt b/.../kotlin/org/zeromq/internal/MessageOps.kt → .../kotlin/org/zeromq/internal/MessageOps.kt
diff --git a/...zeromq/internal/NullMechanismHandshake.kt → ...zeromq/internal/NullMechanismHandshake.kt b/...zeromq/internal/NullMechanismHandshake.kt → ...zeromq/internal/NullMechanismHandshake.kt
diff --git a/...n/kotlin/org/zeromq/internal/PeerEvent.kt → ...n/kotlin/org/zeromq/internal/PeerEvent.kt b/...n/kotlin/org/zeromq/internal/PeerEvent.kt → ...n/kotlin/org/zeromq/internal/PeerEvent.kt
diff --git a/...kotlin/org/zeromq/internal/PeerMailbox.kt → ...kotlin/org/zeromq/internal/PeerMailbox.kt b/...kotlin/org/zeromq/internal/PeerMailbox.kt → ...kotlin/org/zeromq/internal/PeerMailbox.kt
diff --git a/...kotlin/org/zeromq/internal/PeerManager.kt → ...kotlin/org/zeromq/internal/PeerManager.kt b/...kotlin/org/zeromq/internal/PeerManager.kt → ...kotlin/org/zeromq/internal/PeerManager.kt
diff --git a/...tlin/org/zeromq/internal/ProtocolError.kt → ...tlin/org/zeromq/internal/ProtocolError.kt b/...tlin/org/zeromq/internal/ProtocolError.kt → ...tlin/org/zeromq/internal/ProtocolError.kt
diff --git a/...otlin/org/zeromq/internal/SecuritySpec.kt → ...otlin/org/zeromq/internal/SecuritySpec.kt b/...otlin/org/zeromq/internal/SecuritySpec.kt → ...otlin/org/zeromq/internal/SecuritySpec.kt
diff --git a/...tlin/org/zeromq/internal/SocketHandler.kt → ...tlin/org/zeromq/internal/SocketHandler.kt b/...tlin/org/zeromq/internal/SocketHandler.kt → ...tlin/org/zeromq/internal/SocketHandler.kt
diff --git a/.../kotlin/org/zeromq/internal/SocketInfo.kt → .../kotlin/org/zeromq/internal/SocketInfo.kt b/.../kotlin/org/zeromq/internal/SocketInfo.kt → .../kotlin/org/zeromq/internal/SocketInfo.kt
diff --git a/...tlin/org/zeromq/internal/SocketOptions.kt → ...tlin/org/zeromq/internal/SocketOptions.kt b/...tlin/org/zeromq/internal/SocketOptions.kt → ...tlin/org/zeromq/internal/SocketOptions.kt
diff --git a/...n/kotlin/org/zeromq/internal/Transport.kt → ...n/kotlin/org/zeromq/internal/Transport.kt b/...n/kotlin/org/zeromq/internal/Transport.kt → ...n/kotlin/org/zeromq/internal/Transport.kt
diff --git a/.../org/zeromq/internal/TransportRegistry.kt → .../org/zeromq/internal/TransportRegistry.kt b/.../org/zeromq/internal/TransportRegistry.kt → .../org/zeromq/internal/TransportRegistry.kt
diff --git a/.../zeromq/internal/inproc/InprocEndpoint.kt → .../zeromq/internal/inproc/InprocEndpoint.kt b/.../zeromq/internal/inproc/InprocEndpoint.kt → .../zeromq/internal/inproc/InprocEndpoint.kt
diff --git a/...mq/internal/inproc/InprocEndpointEvent.kt → ...mq/internal/inproc/InprocEndpointEvent.kt b/...mq/internal/inproc/InprocEndpointEvent.kt → ...mq/internal/inproc/InprocEndpointEvent.kt
diff --git a/.../internal/inproc/InprocEndpointHandler.kt → .../internal/inproc/InprocEndpointHandler.kt b/.../internal/inproc/InprocEndpointHandler.kt → .../internal/inproc/InprocEndpointHandler.kt
diff --git a/...zeromq/internal/inproc/InprocTransport.kt → ...zeromq/internal/inproc/InprocTransport.kt b/...zeromq/internal/inproc/InprocTransport.kt → ...zeromq/internal/inproc/InprocTransport.kt
diff --git a/...monMain/kotlin/org/zeromq/internal/log.kt → ...monMain/kotlin/org/zeromq/internal/log.kt b/...monMain/kotlin/org/zeromq/internal/log.kt → ...monMain/kotlin/org/zeromq/internal/log.kt
diff --git a/...in/org/zeromq/internal/tcp/TcpEndpoint.kt → ...in/org/zeromq/internal/tcp/TcpEndpoint.kt b/...in/org/zeromq/internal/tcp/TcpEndpoint.kt → ...in/org/zeromq/internal/tcp/TcpEndpoint.kt
diff --git a/...g/zeromq/internal/tcp/TcpSocketHandler.kt → ...g/zeromq/internal/tcp/TcpSocketHandler.kt b/...g/zeromq/internal/tcp/TcpSocketHandler.kt → ...g/zeromq/internal/tcp/TcpSocketHandler.kt
diff --git a/...n/org/zeromq/internal/tcp/TcpTransport.kt → ...n/org/zeromq/internal/tcp/TcpTransport.kt b/...n/org/zeromq/internal/tcp/TcpTransport.kt → ...n/org/zeromq/internal/tcp/TcpTransport.kt
diff --git a/...rg/zeromq/internal/utils/CircularQueue.kt → ...rg/zeromq/internal/utils/CircularQueue.kt b/...rg/zeromq/internal/utils/CircularQueue.kt → ...rg/zeromq/internal/utils/CircularQueue.kt
diff --git a/...otlin/org/zeromq/internal/utils/JobMap.kt → ...otlin/org/zeromq/internal/utils/JobMap.kt b/...otlin/org/zeromq/internal/utils/JobMap.kt → ...otlin/org/zeromq/internal/utils/JobMap.kt
diff --git a/...omq/internal/utils/MailboxDistribution.kt → ...omq/internal/utils/MailboxDistribution.kt b/...omq/internal/utils/MailboxDistribution.kt → ...omq/internal/utils/MailboxDistribution.kt
diff --git a/...omq/internal/utils/SubscriptionManager.kt → ...omq/internal/utils/SubscriptionManager.kt b/...omq/internal/utils/SubscriptionManager.kt → ...omq/internal/utils/SubscriptionManager.kt
diff --git a/...zeromq/internal/utils/SubscriptionTrie.kt → ...zeromq/internal/utils/SubscriptionTrie.kt b/...zeromq/internal/utils/SubscriptionTrie.kt → ...zeromq/internal/utils/SubscriptionTrie.kt
diff --git a/...rg/zeromq/internal/wire-format-reading.kt → ...rg/zeromq/internal/wire-format-reading.kt b/...rg/zeromq/internal/wire-format-reading.kt → ...rg/zeromq/internal/wire-format-reading.kt
diff --git a/...rg/zeromq/internal/wire-format-writing.kt → ...rg/zeromq/internal/wire-format-writing.kt b/...rg/zeromq/internal/wire-format-writing.kt → ...rg/zeromq/internal/wire-format-writing.kt
diff --git a/...kotlin/org/zeromq/internal/wire-format.kt → ...kotlin/org/zeromq/internal/wire-format.kt b/...kotlin/org/zeromq/internal/wire-format.kt → ...kotlin/org/zeromq/internal/wire-format.kt
diff --git a/...tlin/org/zeromq/PairSocketHandlerTests.kt → ...tlin/org/zeromq/PairSocketHandlerTests.kt b/...tlin/org/zeromq/PairSocketHandlerTests.kt → ...tlin/org/zeromq/PairSocketHandlerTests.kt
diff --git a/...tlin/org/zeromq/PullSocketHandlerTests.kt → ...tlin/org/zeromq/PullSocketHandlerTests.kt b/...tlin/org/zeromq/PullSocketHandlerTests.kt → ...tlin/org/zeromq/PullSocketHandlerTests.kt
diff --git a/...tlin/org/zeromq/PushSocketHandlerTests.kt → ...tlin/org/zeromq/PushSocketHandlerTests.kt b/...tlin/org/zeromq/PushSocketHandlerTests.kt → ...tlin/org/zeromq/PushSocketHandlerTests.kt
diff --git a/...lin/org/zeromq/ReplySocketHandlerTests.kt → ...lin/org/zeromq/ReplySocketHandlerTests.kt b/...lin/org/zeromq/ReplySocketHandlerTests.kt → ...lin/org/zeromq/ReplySocketHandlerTests.kt
diff --git a/...n/org/zeromq/RequestSocketHandlerTests.kt → ...n/org/zeromq/RequestSocketHandlerTests.kt b/...n/org/zeromq/RequestSocketHandlerTests.kt → ...n/org/zeromq/RequestSocketHandlerTests.kt
diff --git a/...romq/internal/utils/CircularQueueTests.kt → ...romq/internal/utils/CircularQueueTests.kt b/...romq/internal/utils/CircularQueueTests.kt → ...romq/internal/utils/CircularQueueTests.kt
diff --git a/...mq/internal/utils/SubscriptionTrieTest.kt → ...mq/internal/utils/SubscriptionTrieTest.kt b/...mq/internal/utils/SubscriptionTrieTest.kt → ...mq/internal/utils/SubscriptionTrieTest.kt
diff --git a/...nTest/kotlin/org/zeromq/utils/Matchers.kt → ...nTest/kotlin/org/zeromq/utils/Matchers.kt b/...nTest/kotlin/org/zeromq/utils/Matchers.kt → ...nTest/kotlin/org/zeromq/utils/Matchers.kt
diff --git a/...lin/org/zeromq/utils/SocketHandlerTest.kt → ...lin/org/zeromq/utils/SocketHandlerTest.kt b/...lin/org/zeromq/utils/SocketHandlerTest.kt → ...lin/org/zeromq/utils/SocketHandlerTest.kt
diff --git a/...o/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt → ...o/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt b/...o/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt → ...o/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt
diff --git a/kzmq-engine-cio/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer b/kzmq-engine-cio/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024 Didier Villevalois and Kzmq contributors.
+# Use of this source code is governed by the Apache 2.0 license.
+#
+
+org.zeromq.CIOEngineContainer
diff --git a/...nativeMain/kotlin/org/zeromq/CIONative.kt → ...nativeMain/kotlin/org/zeromq/CIONative.kt b/...nativeMain/kotlin/org/zeromq/CIONative.kt → ...nativeMain/kotlin/org/zeromq/CIONative.kt
diff --git a/kzmq-jeromq/build.gradle.kts → kzmq-engine-jeromq/build.gradle.kts b/kzmq-jeromq/build.gradle.kts → kzmq-engine-jeromq/build.gradle.kts
diff --git a/...q/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt → ...q/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt b/...q/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt → ...q/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt
diff --git a/...n/kotlin/org/zeromq/JeroMQDealerSocket.kt → ...n/kotlin/org/zeromq/JeroMQDealerSocket.kt b/...n/kotlin/org/zeromq/JeroMQDealerSocket.kt → ...n/kotlin/org/zeromq/JeroMQDealerSocket.kt
diff --git a/...jvmMain/kotlin/org/zeromq/JeroMQEngine.kt → ...jvmMain/kotlin/org/zeromq/JeroMQEngine.kt b/...jvmMain/kotlin/org/zeromq/JeroMQEngine.kt → ...jvmMain/kotlin/org/zeromq/JeroMQEngine.kt
diff --git a/...ain/kotlin/org/zeromq/JeroMQPairSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPairSocket.kt b/...ain/kotlin/org/zeromq/JeroMQPairSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPairSocket.kt
diff --git a/...otlin/org/zeromq/JeroMQPublisherSocket.kt → ...otlin/org/zeromq/JeroMQPublisherSocket.kt b/...otlin/org/zeromq/JeroMQPublisherSocket.kt → ...otlin/org/zeromq/JeroMQPublisherSocket.kt
diff --git a/...ain/kotlin/org/zeromq/JeroMQPullSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPullSocket.kt b/...ain/kotlin/org/zeromq/JeroMQPullSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPullSocket.kt
diff --git a/...ain/kotlin/org/zeromq/JeroMQPushSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPushSocket.kt b/...ain/kotlin/org/zeromq/JeroMQPushSocket.kt → ...ain/kotlin/org/zeromq/JeroMQPushSocket.kt
diff --git a/...in/kotlin/org/zeromq/JeroMQReplySocket.kt → ...in/kotlin/org/zeromq/JeroMQReplySocket.kt b/...in/kotlin/org/zeromq/JeroMQReplySocket.kt → ...in/kotlin/org/zeromq/JeroMQReplySocket.kt
diff --git a/.../kotlin/org/zeromq/JeroMQRequestSocket.kt → .../kotlin/org/zeromq/JeroMQRequestSocket.kt b/.../kotlin/org/zeromq/JeroMQRequestSocket.kt → .../kotlin/org/zeromq/JeroMQRequestSocket.kt
diff --git a/...n/kotlin/org/zeromq/JeroMQRouterSocket.kt → ...n/kotlin/org/zeromq/JeroMQRouterSocket.kt b/...n/kotlin/org/zeromq/JeroMQRouterSocket.kt → ...n/kotlin/org/zeromq/JeroMQRouterSocket.kt
diff --git a/...jvmMain/kotlin/org/zeromq/JeroMQSocket.kt → ...jvmMain/kotlin/org/zeromq/JeroMQSocket.kt b/...jvmMain/kotlin/org/zeromq/JeroMQSocket.kt → ...jvmMain/kotlin/org/zeromq/JeroMQSocket.kt
diff --git a/...tlin/org/zeromq/JeroMQSubscriberSocket.kt → ...tlin/org/zeromq/JeroMQSubscriberSocket.kt b/...tlin/org/zeromq/JeroMQSubscriberSocket.kt → ...tlin/org/zeromq/JeroMQSubscriberSocket.kt
diff --git a/...tlin/org/zeromq/JeroMQXPublisherSocket.kt → ...tlin/org/zeromq/JeroMQXPublisherSocket.kt b/...tlin/org/zeromq/JeroMQXPublisherSocket.kt → ...tlin/org/zeromq/JeroMQXPublisherSocket.kt
diff --git a/...lin/org/zeromq/JeroMQXSubscriberSocket.kt → ...lin/org/zeromq/JeroMQXSubscriberSocket.kt b/...lin/org/zeromq/JeroMQXSubscriberSocket.kt → ...lin/org/zeromq/JeroMQXSubscriberSocket.kt
diff --git a/...rc/jvmMain/kotlin/org/zeromq/delegates.kt → ...rc/jvmMain/kotlin/org/zeromq/delegates.kt b/...rc/jvmMain/kotlin/org/zeromq/delegates.kt → ...rc/jvmMain/kotlin/org/zeromq/delegates.kt
diff --git a/...mq/src/jvmMain/kotlin/org/zeromq/utils.kt → ...mq/src/jvmMain/kotlin/org/zeromq/utils.kt b/...mq/src/jvmMain/kotlin/org/zeromq/utils.kt → ...mq/src/jvmMain/kotlin/org/zeromq/utils.kt
diff --git a/kzmq-engine-jeromq/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer b/kzmq-engine-jeromq/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
@@ -0,0 +1,6 @@
+#
+# Copyright (c) 2024 Didier Villevalois and Kzmq contributors.
+# Use of this source code is governed by the Apache 2.0 license.
+#
+
+org.zeromq.JeroMQEngineContainer
diff --git a/...c/jvmTest/kotlin/org/zeromq/SimpleTest.kt → ...c/jvmTest/kotlin/org/zeromq/SimpleTest.kt b/...c/jvmTest/kotlin/org/zeromq/SimpleTest.kt → ...c/jvmTest/kotlin/org/zeromq/SimpleTest.kt
diff --git a/kzmq-libzmq/build.gradle.kts → kzmq-engine-libzmq/build.gradle.kts b/kzmq-libzmq/build.gradle.kts → kzmq-engine-libzmq/build.gradle.kts
diff --git a/...zmq/src/nativeInterop/cinterop/libzmq.def → ...zmq/src/nativeInterop/cinterop/libzmq.def b/...zmq/src/nativeInterop/cinterop/libzmq.def → ...zmq/src/nativeInterop/cinterop/libzmq.def
diff --git a/...rc/nativeMain/kotlin/org/zeromq/Libzmq.kt → ...rc/nativeMain/kotlin/org/zeromq/Libzmq.kt b/...rc/nativeMain/kotlin/org/zeromq/Libzmq.kt → ...rc/nativeMain/kotlin/org/zeromq/Libzmq.kt
diff --git a/...iveMain/kotlin/org/zeromq/LibzmqEngine.kt → ...iveMain/kotlin/org/zeromq/LibzmqEngine.kt b/...iveMain/kotlin/org/zeromq/LibzmqEngine.kt → ...iveMain/kotlin/org/zeromq/LibzmqEngine.kt
diff --git a/...otlin/org/zeromq/LibzmqPublisherSocket.kt → ...otlin/org/zeromq/LibzmqPublisherSocket.kt b/...otlin/org/zeromq/LibzmqPublisherSocket.kt → ...otlin/org/zeromq/LibzmqPublisherSocket.kt
diff --git a/...iveMain/kotlin/org/zeromq/LibzmqSocket.kt → ...iveMain/kotlin/org/zeromq/LibzmqSocket.kt b/...iveMain/kotlin/org/zeromq/LibzmqSocket.kt → ...iveMain/kotlin/org/zeromq/LibzmqSocket.kt
diff --git a/...tlin/org/zeromq/LibzmqSubscriberSocket.kt → ...tlin/org/zeromq/LibzmqSubscriberSocket.kt b/...tlin/org/zeromq/LibzmqSubscriberSocket.kt → ...tlin/org/zeromq/LibzmqSubscriberSocket.kt
diff --git a/...nativeMain/kotlin/org/zeromq/delegates.kt → ...nativeMain/kotlin/org/zeromq/delegates.kt b/...nativeMain/kotlin/org/zeromq/delegates.kt → ...nativeMain/kotlin/org/zeromq/delegates.kt
diff --git a/...src/nativeMain/kotlin/org/zeromq/utils.kt → ...src/nativeMain/kotlin/org/zeromq/utils.kt b/...src/nativeMain/kotlin/org/zeromq/utils.kt → ...src/nativeMain/kotlin/org/zeromq/utils.kt
diff --git a/...st/kotlin/org/zeromq/SimpleTestsNative.kt → ...st/kotlin/org/zeromq/SimpleTestsNative.kt b/...st/kotlin/org/zeromq/SimpleTestsNative.kt → ...st/kotlin/org/zeromq/SimpleTestsNative.kt
diff --git a/kzmq-zeromqjs/build.gradle.kts → kzmq-engine-zeromqjs/build.gradle.kts b/kzmq-zeromqjs/build.gradle.kts → kzmq-engine-zeromqjs/build.gradle.kts
diff --git a/...s/src/jsMain/kotlin/buffer.module_node.kt → ...s/src/jsMain/kotlin/buffer.module_node.kt b/...s/src/jsMain/kotlin/buffer.module_node.kt → ...s/src/jsMain/kotlin/buffer.module_node.kt
diff --git a/...kotlin/org/zeromq/ZeroMQJsDealerSocket.kt → ...kotlin/org/zeromq/ZeroMQJsDealerSocket.kt b/...kotlin/org/zeromq/ZeroMQJsDealerSocket.kt → ...kotlin/org/zeromq/ZeroMQJsDealerSocket.kt
diff --git a/...n/kotlin/org/zeromq/ZeroMQJsPairSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPairSocket.kt b/...n/kotlin/org/zeromq/ZeroMQJsPairSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPairSocket.kt
diff --git a/...lin/org/zeromq/ZeroMQJsPublisherSocket.kt → ...lin/org/zeromq/ZeroMQJsPublisherSocket.kt b/...lin/org/zeromq/ZeroMQJsPublisherSocket.kt → ...lin/org/zeromq/ZeroMQJsPublisherSocket.kt
diff --git a/...n/kotlin/org/zeromq/ZeroMQJsPullSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPullSocket.kt b/...n/kotlin/org/zeromq/ZeroMQJsPullSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPullSocket.kt
diff --git a/...n/kotlin/org/zeromq/ZeroMQJsPushSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPushSocket.kt b/...n/kotlin/org/zeromq/ZeroMQJsPushSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsPushSocket.kt
diff --git a/...otlin/org/zeromq/ZeroMQJsReceiveSocket.kt → ...otlin/org/zeromq/ZeroMQJsReceiveSocket.kt b/...otlin/org/zeromq/ZeroMQJsReceiveSocket.kt → ...otlin/org/zeromq/ZeroMQJsReceiveSocket.kt
diff --git a/.../kotlin/org/zeromq/ZeroMQJsReplySocket.kt → .../kotlin/org/zeromq/ZeroMQJsReplySocket.kt b/.../kotlin/org/zeromq/ZeroMQJsReplySocket.kt → .../kotlin/org/zeromq/ZeroMQJsReplySocket.kt
diff --git a/...otlin/org/zeromq/ZeroMQJsRequestSocket.kt → ...otlin/org/zeromq/ZeroMQJsRequestSocket.kt b/...otlin/org/zeromq/ZeroMQJsRequestSocket.kt → ...otlin/org/zeromq/ZeroMQJsRequestSocket.kt
diff --git a/...kotlin/org/zeromq/ZeroMQJsRouterSocket.kt → ...kotlin/org/zeromq/ZeroMQJsRouterSocket.kt b/...kotlin/org/zeromq/ZeroMQJsRouterSocket.kt → ...kotlin/org/zeromq/ZeroMQJsRouterSocket.kt
diff --git a/...n/kotlin/org/zeromq/ZeroMQJsSendSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsSendSocket.kt b/...n/kotlin/org/zeromq/ZeroMQJsSendSocket.kt → ...n/kotlin/org/zeromq/ZeroMQJsSendSocket.kt
diff --git a/...sMain/kotlin/org/zeromq/ZeroMQJsSocket.kt → ...sMain/kotlin/org/zeromq/ZeroMQJsSocket.kt b/...sMain/kotlin/org/zeromq/ZeroMQJsSocket.kt → ...sMain/kotlin/org/zeromq/ZeroMQJsSocket.kt
diff --git a/...in/org/zeromq/ZeroMQJsSubscriberSocket.kt → ...in/org/zeromq/ZeroMQJsSubscriberSocket.kt b/...in/org/zeromq/ZeroMQJsSubscriberSocket.kt → ...in/org/zeromq/ZeroMQJsSubscriberSocket.kt
diff --git a/...in/org/zeromq/ZeroMQJsXPublisherSocket.kt → ...in/org/zeromq/ZeroMQJsXPublisherSocket.kt b/...in/org/zeromq/ZeroMQJsXPublisherSocket.kt → ...in/org/zeromq/ZeroMQJsXPublisherSocket.kt
diff --git a/...n/org/zeromq/ZeroMQJsXSubscriberSocket.kt → ...n/org/zeromq/ZeroMQJsXSubscriberSocket.kt b/...n/org/zeromq/ZeroMQJsXSubscriberSocket.kt → ...n/org/zeromq/ZeroMQJsXSubscriberSocket.kt
diff --git a/.../src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt → .../src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt b/.../src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt → .../src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt
diff --git a/...sMain/kotlin/org/zeromq/ZeroMQjsEngine.kt → ...sMain/kotlin/org/zeromq/ZeroMQjsEngine.kt b/...sMain/kotlin/org/zeromq/ZeroMQjsEngine.kt → ...sMain/kotlin/org/zeromq/ZeroMQjsEngine.kt
diff --git a/.../internal/zeromqjs/index.module_zeromq.kt → .../internal/zeromqjs/index.module_zeromq.kt b/.../internal/zeromqjs/index.module_zeromq.kt → .../internal/zeromqjs/index.module_zeromq.kt
diff --git a/...internal/zeromqjs/native.module_zeromq.kt → ...internal/zeromqjs/native.module_zeromq.kt b/...internal/zeromqjs/native.module_zeromq.kt → ...internal/zeromqjs/native.module_zeromq.kt
diff --git a/...qjs/src/jsMain/kotlin/org/zeromq/utils.kt → ...qjs/src/jsMain/kotlin/org/zeromq/utils.kt b/...qjs/src/jsMain/kotlin/org/zeromq/utils.kt → ...qjs/src/jsMain/kotlin/org/zeromq/utils.kt
diff --git a/kzmq-jeromq/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer b/kzmq-jeromq/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
diff --git a/kzmq-tests/build.gradle.kts b/kzmq-tests/build.gradle.kts
@@ -47,22 +47,22 @@ kotlin {
 
         jvmTest {
             dependencies {
-                implementation(project(":kzmq-jeromq"))
-                implementation(project(":kzmq-cio"))
+                implementation(project(":kzmq-engine-jeromq"))
+                implementation(project(":kzmq-engine-cio"))
             }
         }
 
         jsTest {
             dependencies {
-                implementation(project(":kzmq-zeromqjs"))
+                implementation(project(":kzmq-engine-zeromqjs"))
             }
         }
 
         targets.withType<KotlinNativeTarget>().forEach { target ->
             getByName("${target.name}Test").apply {
                 dependencies {
-                    if (target.konanTarget.isSupportedByLibzmq) implementation(project(":kzmq-libzmq"))
-                    if (target.konanTarget.isSupportedByCIO) implementation(project(":kzmq-cio"))
+                    if (target.konanTarget.isSupportedByLibzmq) implementation(project(":kzmq-engine-libzmq"))
+                    if (target.konanTarget.isSupportedByCIO) implementation(project(":kzmq-engine-cio"))
                 }
             }
         }

diff --git a/kzmq-tools/build.gradle.kts b/kzmq-tools/build.gradle.kts
@@ -34,15 +34,15 @@ kotlin {
         commonMain {
             dependencies {
                 implementation(project(":kzmq-core"))
-                implementation(project(":kzmq-cio"))
+                implementation(project(":kzmq-engine-cio"))
                 implementation(libs.kotlinx.io.core)
                 implementation(libs.kotlinx.cli)
             }
         }
 
         jvmMain {
             dependencies {
-                implementation(project(":kzmq-jeromq"))
+                implementation(project(":kzmq-engine-jeromq"))
             }
         }
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,10 +23,10 @@ rootProject.name = "kzmq"
 
 include(":kzmq-core")
 include(":kzmq-test")
-include(":kzmq-zeromqjs")
-include(":kzmq-jeromq")
-include(":kzmq-libzmq")
-include(":kzmq-cio")
+include(":kzmq-engine-cio")
+include(":kzmq-engine-jeromq")
+include(":kzmq-engine-libzmq")
+include(":kzmq-engine-zeromqjs")
 include(":kzmq-benchmarks")
 include(":kzmq-tests")
 include(":kzmq-tools")