diff --git a/connect/camunda7-remote/message/pom.xml b/connect/camunda7-remote/message/pom.xml
index 42c5e80f2..ce3e5d740 100644
--- a/connect/camunda7-remote/message/pom.xml
+++ b/connect/camunda7-remote/message/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>message-api</artifactId>
+            <artifactId>connect-message-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/connect/camunda7-remote/process/pom.xml b/connect/camunda7-remote/process/pom.xml
index 2d62012c0..345b24103 100644
--- a/connect/camunda7-remote/process/pom.xml
+++ b/connect/camunda7-remote/process/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>process-api</artifactId>
+            <artifactId>connect-process-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/connect/camunda7-remote/worker/pom.xml b/connect/camunda7-remote/worker/pom.xml
index 6620a61b7..6f907b237 100644
--- a/connect/camunda7-remote/worker/pom.xml
+++ b/connect/camunda7-remote/worker/pom.xml
@@ -17,7 +17,7 @@
         <!-- Miranum -->
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>worker-api</artifactId>
+            <artifactId>connect-worker-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/connect/camunda8/message/pom.xml b/connect/camunda8/message/pom.xml
index 55d34993a..8a6b4f698 100644
--- a/connect/camunda8/message/pom.xml
+++ b/connect/camunda8/message/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>message-api</artifactId>
+            <artifactId>connect-message-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!--Camunda-->
diff --git a/connect/camunda8/process/pom.xml b/connect/camunda8/process/pom.xml
index 92117c599..753e4dc4f 100644
--- a/connect/camunda8/process/pom.xml
+++ b/connect/camunda8/process/pom.xml
@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>process-api</artifactId>
+            <artifactId>connect-process-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!--Camunda-->
diff --git a/connect/camunda8/worker/pom.xml b/connect/camunda8/worker/pom.xml
index bbf52e736..1839b608b 100644
--- a/connect/camunda8/worker/pom.xml
+++ b/connect/camunda8/worker/pom.xml
@@ -17,7 +17,7 @@
         <!-- Miranum -->
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>worker-api</artifactId>
+            <artifactId>connect-worker-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/connect/core/element-templates/element-template-api/pom.xml b/connect/core/element-template-api/pom.xml
similarity index 87%
rename from connect/core/element-templates/element-template-api/pom.xml
rename to connect/core/element-template-api/pom.xml
index ba9106f32..31d53716f 100644
--- a/connect/core/element-templates/element-template-api/pom.xml
+++ b/connect/core/element-template-api/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <artifactId>element-template-api</artifactId>
+    <artifactId>connect-element-template-api</artifactId>
     <name>element-template-api</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-element-templates</artifactId>
+        <artifactId>connect-core</artifactId>
         <version>${revision}</version>
     </parent>
 
@@ -26,4 +26,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java
similarity index 100%
rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java
rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/BPMNElementType.java
diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java
similarity index 100%
rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java
rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplate.java
diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java
similarity index 100%
rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java
rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/ElementTemplateProperty.java
diff --git a/connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java b/connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java
similarity index 100%
rename from connect/core/element-templates/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java
rename to connect/core/element-template-api/src/main/java/io/miranum/platform/connect/elementtemplate/api/PropertyType.java
diff --git a/connect/core/element-templates/pom.xml b/connect/core/element-templates/pom.xml
deleted file mode 100644
index 2ed4d10db..000000000
--- a/connect/core/element-templates/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <artifactId>connect-element-templates</artifactId>
-    <name>connect-element-templates</name>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-core</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <modules>
-        <module>element-template-api</module>
-    </modules>
-
-</project>
\ No newline at end of file
diff --git a/connect/core/message/message-api/pom.xml b/connect/core/message-api/pom.xml
similarity index 92%
rename from connect/core/message/message-api/pom.xml
rename to connect/core/message-api/pom.xml
index e80900541..360d6ba40 100644
--- a/connect/core/message/message-api/pom.xml
+++ b/connect/core/message-api/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <artifactId>message-api</artifactId>
+    <artifactId>connect-message-api</artifactId>
     <name>message-api</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-message</artifactId>
+        <artifactId>connect-core</artifactId>
         <version>${revision}</version>
     </parent>
 
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/MessageAutoConfiguration.java
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/CorrelateMessageCommand.java
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/api/MessageApi.java
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/DeliverMessagePort.java
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageCorrelationException.java
diff --git a/connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java b/connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java
similarity index 100%
rename from connect/core/message/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java
rename to connect/core/message-api/src/main/java/io/miranum/platform/connect/message/impl/MessageService.java
diff --git a/connect/core/message/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from connect/core/message/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to connect/core/message-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/connect/core/message/pom.xml b/connect/core/message/pom.xml
deleted file mode 100644
index f71f10f94..000000000
--- a/connect/core/message/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <artifactId>connect-message</artifactId>
-    <name>connect-message</name>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-core</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <modules>
-        <module>message-api</module>
-    </modules>
-
-</project>
diff --git a/connect/core/pom.xml b/connect/core/pom.xml
index daf65a370..19e2690e3 100644
--- a/connect/core/pom.xml
+++ b/connect/core/pom.xml
@@ -13,13 +13,13 @@
     </parent>
 
     <modules>
-        <module>task</module>
-        <module>message</module>
-        <module>worker</module>
-        <module>process</module>
+        <module>task-api</module>
+        <module>message-api</module>
+        <module>worker-api</module>
+        <module>process-api</module>
         <module>json</module>
         <module>s3</module>
-        <module>element-templates</module>
+        <module>element-template-api</module>
         <module>shared</module>
     </modules>
 
diff --git a/connect/core/process/api/pom.xml b/connect/core/process-api/pom.xml
similarity index 92%
rename from connect/core/process/api/pom.xml
rename to connect/core/process-api/pom.xml
index 003ab1ed6..f4aa357f7 100644
--- a/connect/core/process/api/pom.xml
+++ b/connect/core/process-api/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <artifactId>process-api</artifactId>
+    <artifactId>connect-process-api</artifactId>
     <name>process-core</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-process</artifactId>
+        <artifactId>connect-core</artifactId>
         <version>${revision}</version>
     </parent>
 
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/ProcessAutoConfiguration.java
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessApi.java
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/ProcessStartingException.java
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/api/StartProcessCommand.java
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/ProcessApiImpl.java
diff --git a/connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java b/connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java
similarity index 100%
rename from connect/core/process/api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java
rename to connect/core/process-api/src/main/java/io/miranum/platform/connect/process/impl/StartProcessPort.java
diff --git a/connect/core/process/api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/process-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from connect/core/process/api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to connect/core/process-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/connect/core/process/api/src/test/java/io/miranum/platform/connect/.gitkeep b/connect/core/process-api/src/test/java/io/miranum/platform/connect/.gitkeep
similarity index 100%
rename from connect/core/process/api/src/test/java/io/miranum/platform/connect/.gitkeep
rename to connect/core/process-api/src/test/java/io/miranum/platform/connect/.gitkeep
diff --git a/connect/core/process/pom.xml b/connect/core/process/pom.xml
deleted file mode 100644
index b3614d1f2..000000000
--- a/connect/core/process/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <artifactId>connect-process</artifactId>
-    <name>connect-process</name>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-core</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <modules>
-        <module>api</module>
-    </modules>
-
-</project>
diff --git a/connect/core/task/task-api/pom.xml b/connect/core/task-api/pom.xml
similarity index 92%
rename from connect/core/task/task-api/pom.xml
rename to connect/core/task-api/pom.xml
index e92a4c946..1fa353c6c 100644
--- a/connect/core/task/task-api/pom.xml
+++ b/connect/core/task-api/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <artifactId>task-api</artifactId>
+    <artifactId>connect-task-api</artifactId>
     <name>task-api</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-task</artifactId>
+        <artifactId>connect-core</artifactId>
         <version>${revision}</version>
     </parent>
 
diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java
similarity index 100%
rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java
rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/TaskAutoConfiguration.java
diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java
similarity index 100%
rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java
rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/CompleteTaskCommand.java
diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java
similarity index 100%
rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java
rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/api/TaskApi.java
diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java
similarity index 100%
rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java
rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/CompleteTaskPort.java
diff --git a/connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java b/connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java
similarity index 100%
rename from connect/core/task/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java
rename to connect/core/task-api/src/main/java/io/miranum/platform/connect/task/impl/TaskApiImpl.java
diff --git a/connect/core/task/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from connect/core/task/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to connect/core/task-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/connect/core/task/task-api/src/test/java/io/miranum/platform/connect/.gitkeep b/connect/core/task-api/src/test/java/io/miranum/platform/connect/.gitkeep
similarity index 100%
rename from connect/core/task/task-api/src/test/java/io/miranum/platform/connect/.gitkeep
rename to connect/core/task-api/src/test/java/io/miranum/platform/connect/.gitkeep
diff --git a/connect/core/task/pom.xml b/connect/core/task/pom.xml
deleted file mode 100644
index 96905cc6d..000000000
--- a/connect/core/task/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <artifactId>connect-task</artifactId>
-    <name>connect-task</name>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-core</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <modules>
-        <module>task-api</module>
-    </modules>
-
-</project>
diff --git a/connect/core/worker/worker-api/pom.xml b/connect/core/worker-api/pom.xml
similarity index 94%
rename from connect/core/worker/worker-api/pom.xml
rename to connect/core/worker-api/pom.xml
index 4454e01b4..608d6b3a1 100644
--- a/connect/core/worker/worker-api/pom.xml
+++ b/connect/core/worker-api/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <artifactId>worker-api</artifactId>
+    <artifactId>connect-worker-api</artifactId>
     <name>worker-core</name>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-worker</artifactId>
+        <artifactId>connect-core</artifactId>
         <version>${revision}</version>
     </parent>
 
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/WorkerAutoConfiguration.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/BusinessException.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/TechnicalException.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/Worker.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerExecuteApi.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerInterceptor.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerRegistry.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/api/WorkerSubscription.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerAnnotationBeanPostProcessor.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImpl.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerExecutor.java
diff --git a/connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java b/connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java
similarity index 100%
rename from connect/core/worker/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java
rename to connect/core/worker-api/src/main/java/io/miranum/platform/connect/worker/impl/WorkerRegistryImpl.java
diff --git a/connect/core/worker/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/connect/core/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from connect/core/worker/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to connect/core/worker-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/connect/core/worker/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java b/connect/core/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java
similarity index 100%
rename from connect/core/worker/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java
rename to connect/core/worker-api/src/test/java/io/miranum/platform/connect/worker/impl/WorkerExecuteApiImplTest.java
diff --git a/connect/core/worker/pom.xml b/connect/core/worker/pom.xml
deleted file mode 100644
index cf85bfcf4..000000000
--- a/connect/core/worker/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <artifactId>connect-worker</artifactId>
-    <name>connect-worker</name>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>io.miranum.platform</groupId>
-        <artifactId>connect-core</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <modules>
-        <module>worker-api</module>
-    </modules>
-
-</project>
diff --git a/connect/templates/generator-maven-plugin-core/pom.xml b/connect/templates/generator-maven-plugin-core/pom.xml
index 120b36288..518ac2031 100644
--- a/connect/templates/generator-maven-plugin-core/pom.xml
+++ b/connect/templates/generator-maven-plugin-core/pom.xml
@@ -22,14 +22,14 @@
 
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>element-template-api</artifactId>
+            <artifactId>connect-element-template-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>worker-api</artifactId>
+            <artifactId>connect-worker-api</artifactId>
             <version>${revision}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/platform/engine/core/pom.xml b/platform/engine/core/pom.xml
index 0d520fb91..66d4d333b 100644
--- a/platform/engine/core/pom.xml
+++ b/platform/engine/core/pom.xml
@@ -68,12 +68,12 @@
         </dependency>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>message-api</artifactId>
+            <artifactId>connect-message-api</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>io.miranum.platform</groupId>
-            <artifactId>process-api</artifactId>
+            <artifactId>connect-process-api</artifactId>
             <version>${revision}</version>
         </dependency>