diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5b75b81..aa86c52 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -21,17 +21,17 @@
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/build-logic" />
             <option value="$PROJECT_DIR$/kzmq-benchmarks" />
-            <option value="$PROJECT_DIR$/kzmq-cio" />
             <option value="$PROJECT_DIR$/kzmq-core" />
-            <option value="$PROJECT_DIR$/kzmq-jeromq" />
-            <option value="$PROJECT_DIR$/kzmq-libzmq" />
+            <option value="$PROJECT_DIR$/kzmq-engine-cio" />
+            <option value="$PROJECT_DIR$/kzmq-engine-jeromq" />
+            <option value="$PROJECT_DIR$/kzmq-engine-libzmq" />
+            <option value="$PROJECT_DIR$/kzmq-engine-zeromqjs" />
             <option value="$PROJECT_DIR$/kzmq-test" />
             <option value="$PROJECT_DIR$/kzmq-tests" />
             <option value="$PROJECT_DIR$/kzmq-tools" />
-            <option value="$PROJECT_DIR$/kzmq-zeromqjs" />
           </set>
         </option>
       </GradleProjectSettings>
     </option>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index d4c9bfc..62b8278 100644
--- 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
index e02a371..5a259ce 100644
--- 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
deleted file mode 100644
index e73d1c3..0000000
--- a/kzmq-cio/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
+++ /dev/null
@@ -1 +0,0 @@
-org.zeromq.CIOEngineContainer
diff --git a/kzmq-cio/build.gradle.kts b/kzmq-engine-cio/build.gradle.kts
similarity index 100%
rename from kzmq-cio/build.gradle.kts
rename to kzmq-engine-cio/build.gradle.kts
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIO.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIO.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIO.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIO.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIODealerSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIODealerSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIODealerSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIODealerSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOEngine.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOEngine.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOEngine.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOEngine.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPairSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPairSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPairSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPairSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPublisherSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPublisherSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPublisherSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPublisherSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPullSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPullSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPullSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPullSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPushSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPushSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOPushSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOPushSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOReceiveSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOReceiveSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOReceiveSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOReceiveSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOReplySocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOReplySocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOReplySocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOReplySocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIORequestSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIORequestSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIORequestSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIORequestSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIORouterSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIORouterSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIORouterSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIORouterSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSendSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSendSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSendSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSendSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSubscriberSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSubscriberSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOSubscriberSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOSubscriberSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOXPublisherSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOXPublisherSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOXPublisherSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOXPublisherSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOXSubscriberSocket.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOXSubscriberSocket.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/CIOXSubscriberSocket.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/CIOXSubscriberSocket.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/Command.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/Command.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/Command.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/Command.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/CommandOrMessage.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/CommandOrMessage.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/CommandOrMessage.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/CommandOrMessage.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/InvalidReadFrame.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/InvalidReadFrame.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/InvalidReadFrame.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/InvalidReadFrame.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/MessageOps.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/MessageOps.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/MessageOps.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/MessageOps.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/NullMechanismHandshake.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/NullMechanismHandshake.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/NullMechanismHandshake.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/NullMechanismHandshake.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerEvent.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerEvent.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerEvent.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerEvent.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerMailbox.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerMailbox.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerMailbox.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerMailbox.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerManager.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerManager.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/PeerManager.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/PeerManager.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/ProtocolError.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/ProtocolError.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/ProtocolError.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/ProtocolError.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SecuritySpec.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SecuritySpec.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SecuritySpec.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SecuritySpec.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketHandler.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketHandler.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketHandler.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketHandler.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketInfo.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketInfo.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketInfo.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketInfo.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketOptions.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketOptions.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/SocketOptions.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/SocketOptions.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/Transport.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/Transport.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/Transport.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/Transport.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/TransportRegistry.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/TransportRegistry.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/TransportRegistry.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/TransportRegistry.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpoint.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpoint.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpoint.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpoint.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointEvent.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointEvent.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointEvent.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointEvent.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointHandler.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointHandler.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointHandler.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocEndpointHandler.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocTransport.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocTransport.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocTransport.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/inproc/InprocTransport.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/log.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/log.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/log.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/log.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpEndpoint.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpEndpoint.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpEndpoint.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpEndpoint.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpSocketHandler.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpSocketHandler.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpSocketHandler.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpSocketHandler.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpTransport.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpTransport.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpTransport.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/tcp/TcpTransport.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/CircularQueue.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/CircularQueue.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/CircularQueue.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/CircularQueue.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/JobMap.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/JobMap.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/JobMap.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/JobMap.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/MailboxDistribution.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/MailboxDistribution.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/MailboxDistribution.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/MailboxDistribution.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionManager.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionManager.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionManager.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionManager.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionTrie.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionTrie.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionTrie.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/utils/SubscriptionTrie.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-reading.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-reading.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-reading.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-reading.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-writing.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-writing.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-writing.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format-writing.kt
diff --git a/kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format.kt b/kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format.kt
similarity index 100%
rename from kzmq-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format.kt
rename to kzmq-engine-cio/src/commonMain/kotlin/org/zeromq/internal/wire-format.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/PairSocketHandlerTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PairSocketHandlerTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/PairSocketHandlerTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PairSocketHandlerTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/PullSocketHandlerTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PullSocketHandlerTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/PullSocketHandlerTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PullSocketHandlerTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/PushSocketHandlerTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PushSocketHandlerTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/PushSocketHandlerTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/PushSocketHandlerTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/ReplySocketHandlerTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/ReplySocketHandlerTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/ReplySocketHandlerTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/ReplySocketHandlerTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/RequestSocketHandlerTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/RequestSocketHandlerTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/RequestSocketHandlerTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/RequestSocketHandlerTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/internal/utils/CircularQueueTests.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/internal/utils/CircularQueueTests.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/internal/utils/CircularQueueTests.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/internal/utils/CircularQueueTests.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/internal/utils/SubscriptionTrieTest.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/internal/utils/SubscriptionTrieTest.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/internal/utils/SubscriptionTrieTest.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/internal/utils/SubscriptionTrieTest.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/utils/Matchers.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/utils/Matchers.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/utils/Matchers.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/utils/Matchers.kt
diff --git a/kzmq-cio/src/commonTest/kotlin/org/zeromq/utils/SocketHandlerTest.kt b/kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/utils/SocketHandlerTest.kt
similarity index 100%
rename from kzmq-cio/src/commonTest/kotlin/org/zeromq/utils/SocketHandlerTest.kt
rename to kzmq-engine-cio/src/commonTest/kotlin/org/zeromq/utils/SocketHandlerTest.kt
diff --git a/kzmq-cio/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt b/kzmq-engine-cio/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt
similarity index 100%
rename from kzmq-cio/src/jvmMain/kotlin/org/zeromq/CIOJvm.kt
rename to kzmq-engine-cio/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
new file mode 100644
index 0000000..758c8f8
--- /dev/null
+++ 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/kzmq-cio/src/nativeMain/kotlin/org/zeromq/CIONative.kt b/kzmq-engine-cio/src/nativeMain/kotlin/org/zeromq/CIONative.kt
similarity index 100%
rename from kzmq-cio/src/nativeMain/kotlin/org/zeromq/CIONative.kt
rename to kzmq-engine-cio/src/nativeMain/kotlin/org/zeromq/CIONative.kt
diff --git a/kzmq-jeromq/build.gradle.kts b/kzmq-engine-jeromq/build.gradle.kts
similarity index 100%
rename from kzmq-jeromq/build.gradle.kts
rename to kzmq-engine-jeromq/build.gradle.kts
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQ.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQDealerSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQDealerSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQDealerSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQDealerSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQEngine.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQEngine.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQEngine.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQEngine.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPairSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPairSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPairSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPairSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPublisherSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPublisherSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPublisherSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPublisherSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPullSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPullSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPullSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPullSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPushSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPushSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPushSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQPushSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQReplySocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQReplySocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQReplySocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQReplySocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRequestSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRequestSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRequestSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRequestSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRouterSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRouterSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRouterSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQRouterSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSubscriberSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSubscriberSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSubscriberSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQSubscriberSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXPublisherSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXPublisherSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXPublisherSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXPublisherSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXSubscriberSocket.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXSubscriberSocket.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXSubscriberSocket.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/JeroMQXSubscriberSocket.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/delegates.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/delegates.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/delegates.kt
rename to kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/delegates.kt
diff --git a/kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/utils.kt b/kzmq-engine-jeromq/src/jvmMain/kotlin/org/zeromq/utils.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmMain/kotlin/org/zeromq/utils.kt
rename to kzmq-engine-jeromq/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
new file mode 100644
index 0000000..2f042ff
--- /dev/null
+++ 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/kzmq-jeromq/src/jvmTest/kotlin/org/zeromq/SimpleTest.kt b/kzmq-engine-jeromq/src/jvmTest/kotlin/org/zeromq/SimpleTest.kt
similarity index 100%
rename from kzmq-jeromq/src/jvmTest/kotlin/org/zeromq/SimpleTest.kt
rename to kzmq-engine-jeromq/src/jvmTest/kotlin/org/zeromq/SimpleTest.kt
diff --git a/kzmq-libzmq/build.gradle.kts b/kzmq-engine-libzmq/build.gradle.kts
similarity index 100%
rename from kzmq-libzmq/build.gradle.kts
rename to kzmq-engine-libzmq/build.gradle.kts
diff --git a/kzmq-libzmq/src/nativeInterop/cinterop/libzmq.def b/kzmq-engine-libzmq/src/nativeInterop/cinterop/libzmq.def
similarity index 100%
rename from kzmq-libzmq/src/nativeInterop/cinterop/libzmq.def
rename to kzmq-engine-libzmq/src/nativeInterop/cinterop/libzmq.def
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/Libzmq.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/Libzmq.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/Libzmq.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/Libzmq.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqEngine.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqEngine.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqEngine.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqEngine.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqPublisherSocket.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqPublisherSocket.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqPublisherSocket.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqPublisherSocket.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSocket.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSocket.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSocket.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSocket.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSubscriberSocket.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSubscriberSocket.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSubscriberSocket.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/LibzmqSubscriberSocket.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/delegates.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/delegates.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/delegates.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/delegates.kt
diff --git a/kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/utils.kt b/kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/utils.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeMain/kotlin/org/zeromq/utils.kt
rename to kzmq-engine-libzmq/src/nativeMain/kotlin/org/zeromq/utils.kt
diff --git a/kzmq-libzmq/src/nativeTest/kotlin/org/zeromq/SimpleTestsNative.kt b/kzmq-engine-libzmq/src/nativeTest/kotlin/org/zeromq/SimpleTestsNative.kt
similarity index 100%
rename from kzmq-libzmq/src/nativeTest/kotlin/org/zeromq/SimpleTestsNative.kt
rename to kzmq-engine-libzmq/src/nativeTest/kotlin/org/zeromq/SimpleTestsNative.kt
diff --git a/kzmq-zeromqjs/build.gradle.kts b/kzmq-engine-zeromqjs/build.gradle.kts
similarity index 100%
rename from kzmq-zeromqjs/build.gradle.kts
rename to kzmq-engine-zeromqjs/build.gradle.kts
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/buffer.module_node.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/buffer.module_node.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/buffer.module_node.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/buffer.module_node.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsDealerSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsDealerSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsDealerSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsDealerSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPairSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPairSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPairSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPairSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPublisherSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPublisherSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPublisherSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPublisherSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPullSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPullSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPullSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPullSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPushSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPushSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPushSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsPushSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReceiveSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReceiveSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReceiveSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReceiveSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReplySocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReplySocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReplySocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsReplySocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRequestSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRequestSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRequestSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRequestSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRouterSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRouterSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRouterSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsRouterSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSendSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSendSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSendSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSendSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSubscriberSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSubscriberSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSubscriberSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsSubscriberSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXPublisherSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXPublisherSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXPublisherSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXPublisherSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXSubscriberSocket.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXSubscriberSocket.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXSubscriberSocket.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQJsXSubscriberSocket.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjs.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjsEngine.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjsEngine.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjsEngine.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/ZeroMQjsEngine.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/index.module_zeromq.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/index.module_zeromq.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/index.module_zeromq.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/index.module_zeromq.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/native.module_zeromq.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/native.module_zeromq.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/native.module_zeromq.kt
rename to kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/internal/zeromqjs/native.module_zeromq.kt
diff --git a/kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/utils.kt b/kzmq-engine-zeromqjs/src/jsMain/kotlin/org/zeromq/utils.kt
similarity index 100%
rename from kzmq-zeromqjs/src/jsMain/kotlin/org/zeromq/utils.kt
rename to kzmq-engine-zeromqjs/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
deleted file mode 100644
index 8ce49ef..0000000
--- a/kzmq-jeromq/src/jvmMain/resources/META-INF/services/org.zeromq.EngineContainer
+++ /dev/null
@@ -1 +0,0 @@
-org.zeromq.JeroMQEngineContainer
diff --git a/kzmq-tests/build.gradle.kts b/kzmq-tests/build.gradle.kts
index f620c6d..7da5b17 100644
--- 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
index d799df2..f9e0bcd 100644
--- a/kzmq-tools/build.gradle.kts
+++ b/kzmq-tools/build.gradle.kts
@@ -34,7 +34,7 @@ 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)
             }
@@ -42,7 +42,7 @@ kotlin {
 
         jvmMain {
             dependencies {
-                implementation(project(":kzmq-jeromq"))
+                implementation(project(":kzmq-engine-jeromq"))
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 37baebd..36681a4 100644
--- 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")