diff --git a/commons/pom.xml b/commons/pom.xml
deleted file mode 100644
index b737a489..00000000
--- a/commons/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.trilobita</groupId>
-        <artifactId>trilobita</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>commons</artifactId>
-    <name>Archetype - commons</name>
-    <url>http://maven.apache.org</url>
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.json/json -->
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20231013</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/commons/readme.md b/commons/readme.md
deleted file mode 100644
index be1ef24b..00000000
--- a/commons/readme.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Commons Module
-
-The `commons` module provides basic utilities and foundational components essential for the smooth functioning of the project. It encapsulates common functionalities that can be reused across different modules.
-
-## Table of Contents
-
-- Features
-- Usage
-- Dependencies
-- Contribution
-
-## Features
-
-1. **Common Classes**:
-   - `Computable`: An interface defining computable entities. (add, minus, multiply, divide)
-   - `Mail`: Represents a mail entity with related attributes and behaviors.
-   - `Message`: Represents a message entity.
-2. **Serialization and Deserialization**:
-   - `MailSerializer`: Provides functionalities to serialize mail objects during communication in `kafka.properties`.
-   - `MailDeserializer`: Offers functionalities to deserialize mail objects during communication in `kafka.properties`.
-3. **Custom Exception**:
-   - `TrilobitaException`: A custom exception class for handling project-specific exceptions.
-
-## Usage
-
-#### Mail
-
-```java
-// Example of using Mail class
-Mail newMail = new Mail(toVertexId, null, Mail.MailType.NORMAL);
-```
-
-#### MailSerializer
-
-```java
-// Serialization of Mail object in `kafka.properties`
-// Deserialization of Mail object in `kafka.properties`
-key.serializer=org.apache.kafka.common.serialization.StringSerializer
-value.serializer=com.trilobita.serializer.MailSerializer
-key.deserializer=org.apache.kafka.common.serialization.StringDeserializer
-value.deserializer=com.trilobita.deserializer.MailDeserializer
-```
-
-#### MailDeSerializer
-
-```java
-// Example of using TrilobitaException class
-public abstract void start() throws TrilobitaException, InterruptedException, ExecutionException;
-```
-
-## Dependencies
-
-- Ensure you have imported the `commons` module in your Maven dependencies if you wish to use it in other modules.
-
-```xml
-<dependency>
-    <groupId>com.trilobita</groupId>
-    <artifactId>commons</artifactId>
-    <version>1.0-SNAPSHOT</version>
-</dependency>
-```
-
-## Contribution
-
-If you'd like to contribute to the `commons` module, please follow the standard pull request process. Make sure to write unit tests for any new feature or fix and document your changes thoroughly.
-
diff --git a/commons/src/main/resources/logback.xml b/commons/src/main/resources/logback.xml
deleted file mode 100644
index 968276c7..00000000
--- a/commons/src/main/resources/logback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <logger name="org.apache" level="OFF"/>
-    <logger name="kafka" level="DEBUG"/>
-</configuration>
diff --git a/core/pom.xml b/core/pom.xml
index 15199b29..1f17185c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -10,10 +10,14 @@
     <name>Archetype - core</name>
     <dependencies>
         <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/core/src/main/java/com/trilobita/core/common/Util.java b/core/src/main/java/com/trilobita/core/Util.java
similarity index 94%
rename from core/src/main/java/com/trilobita/core/common/Util.java
rename to core/src/main/java/com/trilobita/core/Util.java
index d8206f21..07dbaac2 100644
--- a/core/src/main/java/com/trilobita/core/common/Util.java
+++ b/core/src/main/java/com/trilobita/core/Util.java
@@ -1,4 +1,4 @@
-package com.trilobita.core.common;
+package com.trilobita.core;
 
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/commons/src/main/java/com/trilobita/commons/Computable.java b/core/src/main/java/com/trilobita/core/common/Computable.java
similarity index 90%
rename from commons/src/main/java/com/trilobita/commons/Computable.java
rename to core/src/main/java/com/trilobita/core/common/Computable.java
index 1f54caba..cf3131d1 100644
--- a/commons/src/main/java/com/trilobita/commons/Computable.java
+++ b/core/src/main/java/com/trilobita/core/common/Computable.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import java.io.Serializable;
 
diff --git a/commons/src/main/java/com/trilobita/commons/Mail.java b/core/src/main/java/com/trilobita/core/common/Mail.java
similarity index 97%
rename from commons/src/main/java/com/trilobita/commons/Mail.java
rename to core/src/main/java/com/trilobita/core/common/Mail.java
index 0a46248e..a5e60125 100644
--- a/commons/src/main/java/com/trilobita/commons/Mail.java
+++ b/core/src/main/java/com/trilobita/core/common/Mail.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/commons/src/main/java/com/trilobita/commons/Message.java b/core/src/main/java/com/trilobita/core/common/Message.java
similarity index 89%
rename from commons/src/main/java/com/trilobita/commons/Message.java
rename to core/src/main/java/com/trilobita/core/common/Message.java
index 66c9aa8c..13d8d37f 100644
--- a/commons/src/main/java/com/trilobita/commons/Message.java
+++ b/core/src/main/java/com/trilobita/core/common/Message.java
@@ -1,4 +1,4 @@
-package com.trilobita.commons;
+package com.trilobita.core.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/trilobita/core/common/Snapshot.java b/core/src/main/java/com/trilobita/core/common/Snapshot.java
index 6d926055..bb529d19 100644
--- a/core/src/main/java/com/trilobita/core/common/Snapshot.java
+++ b/core/src/main/java/com/trilobita/core/common/Snapshot.java
@@ -1,7 +1,6 @@
 package com.trilobita.core.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.trilobita.commons.Mail;
 import com.trilobita.core.graph.Graph;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
diff --git a/commons/src/main/java/com/trilobita/deserializer/MailDeserializer.java b/core/src/main/java/com/trilobita/core/deserializer/MailDeserializer.java
similarity index 89%
rename from commons/src/main/java/com/trilobita/deserializer/MailDeserializer.java
rename to core/src/main/java/com/trilobita/core/deserializer/MailDeserializer.java
index f0206089..8463ee1a 100644
--- a/commons/src/main/java/com/trilobita/deserializer/MailDeserializer.java
+++ b/core/src/main/java/com/trilobita/core/deserializer/MailDeserializer.java
@@ -1,7 +1,6 @@
-package com.trilobita.deserializer;
+package com.trilobita.core.deserializer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.kafka.common.header.Headers;
diff --git a/commons/src/main/java/com/trilobita/exception/TrilobitaException.java b/core/src/main/java/com/trilobita/core/exception/TrilobitaException.java
similarity index 86%
rename from commons/src/main/java/com/trilobita/exception/TrilobitaException.java
rename to core/src/main/java/com/trilobita/core/exception/TrilobitaException.java
index 4384222b..23335d06 100644
--- a/commons/src/main/java/com/trilobita/exception/TrilobitaException.java
+++ b/core/src/main/java/com/trilobita/core/exception/TrilobitaException.java
@@ -1,4 +1,4 @@
-package com.trilobita.exception;
+package com.trilobita.core.exception;
 
 public class TrilobitaException extends Exception {
     public TrilobitaException(String message) {
diff --git a/core/src/main/java/com/trilobita/core/graph/Graph.java b/core/src/main/java/com/trilobita/core/graph/Graph.java
index 7ca5d86c..5ac6cd0c 100644
--- a/core/src/main/java/com/trilobita/core/graph/Graph.java
+++ b/core/src/main/java/com/trilobita/core/graph/Graph.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.graph;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/trilobita/core/graph/VertexGroup.java b/core/src/main/java/com/trilobita/core/graph/VertexGroup.java
index 297be9e9..879eeed6 100644
--- a/core/src/main/java/com/trilobita/core/graph/VertexGroup.java
+++ b/core/src/main/java/com/trilobita/core/graph/VertexGroup.java
@@ -1,7 +1,7 @@
 package com.trilobita.core.graph;
 
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.Data;
 
diff --git a/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java b/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java
index ced83dd9..d5bc14fb 100644
--- a/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java
+++ b/core/src/main/java/com/trilobita/core/graph/vertex/Edge.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.graph.vertex;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java b/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java
index 4ad2be45..ae4baec5 100644
--- a/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java
+++ b/core/src/main/java/com/trilobita/core/graph/vertex/Vertex.java
@@ -1,6 +1,7 @@
 package com.trilobita.core.graph.vertex;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java b/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java
index 9f9ff381..51f5cbe9 100644
--- a/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java
+++ b/core/src/main/java/com/trilobita/core/messaging/MessageAdmin.java
@@ -1,6 +1,6 @@
 package com.trilobita.core.messaging;
 
-import com.trilobita.core.common.Util;
+import com.trilobita.core.Util;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.admin.*;
 import org.apache.kafka.common.KafkaFuture;
diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java b/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java
index 9a018e09..cf42a8e2 100644
--- a/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java
+++ b/core/src/main/java/com/trilobita/core/messaging/MessageConsumer.java
@@ -1,7 +1,7 @@
 package com.trilobita.core.messaging;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.*;
 
diff --git a/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java b/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java
index 97159904..ff9a8349 100644
--- a/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java
+++ b/core/src/main/java/com/trilobita/core/messaging/MessageProducer.java
@@ -1,8 +1,8 @@
 package com.trilobita.core.messaging;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.common.Snapshot;
 
 import lombok.extern.slf4j.Slf4j;
diff --git a/commons/src/main/java/com/trilobita/serializer/MailSerializer.java b/core/src/main/java/com/trilobita/core/serializer/MailSerializer.java
similarity index 91%
rename from commons/src/main/java/com/trilobita/serializer/MailSerializer.java
rename to core/src/main/java/com/trilobita/core/serializer/MailSerializer.java
index c623445e..b3305268 100644
--- a/commons/src/main/java/com/trilobita/serializer/MailSerializer.java
+++ b/core/src/main/java/com/trilobita/core/serializer/MailSerializer.java
@@ -1,6 +1,6 @@
-package com.trilobita.serializer;
+package com.trilobita.core.serializer;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.SerializationUtils;
 import org.apache.kafka.common.header.Headers;
@@ -33,4 +33,4 @@ public byte[] serialize(String topic, Headers headers, Mail data) {
 //        return Serializer.super.serialize(topic, headers, data);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/main/resources/kafka.properties b/core/src/main/resources/kafka.properties
index fb4e5ba7..58f03880 100644
--- a/core/src/main/resources/kafka.properties
+++ b/core/src/main/resources/kafka.properties
@@ -9,6 +9,6 @@ client.dns.lookup=use_all_dns_ips
 # Best practice for Kafka producer to prevent data loss
 acks=all
 key.serializer=org.apache.kafka.common.serialization.StringSerializer
-value.serializer=com.trilobita.serializer.MailSerializer
+value.serializer=com.trilobita.core.serializer.MailSerializer
 key.deserializer=org.apache.kafka.common.serialization.StringDeserializer
-value.deserializer=com.trilobita.deserializer.MailDeserializer
+value.deserializer=com.trilobita.core.deserializer.MailDeserializer
diff --git a/docs/developer/StructureDiagram.drawio b/docs/developer/StructureDiagram.drawio
index b053cdbb..d82e4289 100644
--- a/docs/developer/StructureDiagram.drawio
+++ b/docs/developer/StructureDiagram.drawio
@@ -251,7 +251,7 @@
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-73" value="+ sendCompleteSignal(): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
           <mxGeometry y="86" width="300" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lBvt6h_ialfLkE9HlVQZ-20" value="+ distributeMail(com.trilobita.commons.Message): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
+        <mxCell id="lBvt6h_ialfLkE9HlVQZ-20" value="+ distributeMail(com.trilobita.core.common.Message): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="fkjLrEyQXUZWaJiIOoPh-28" vertex="1">
           <mxGeometry y="112" width="300" height="26" as="geometry" />
         </mxCell>
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-1" value="VertexGroup" style="swimlane;fontStyle=1;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
@@ -326,7 +326,7 @@
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-46" value="+ to: Integer (vertexId)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
           <mxGeometry y="52" width="240" height="26" as="geometry" />
         </mxCell>
-        <mxCell id="lBvt6h_ialfLkE9HlVQZ-47" value="+ content: com.trilobita.commons.Message" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
+        <mxCell id="lBvt6h_ialfLkE9HlVQZ-47" value="+ content: com.trilobita.core.common.Message" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;fontSize=11;fontFamily=Helvetica;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
           <mxGeometry y="78" width="240" height="26" as="geometry" />
         </mxCell>
         <mxCell id="lBvt6h_ialfLkE9HlVQZ-42" value="" style="line;strokeWidth=1;fillColor=none;align=left;verticalAlign=middle;spacingTop=-1;spacingLeft=3;spacingRight=3;rotatable=0;labelPosition=right;points=[];portConstraint=eastwest;strokeColor=inherit;fontFamily=Helvetica;fontSize=11;fontColor=default;" parent="lBvt6h_ialfLkE9HlVQZ-40" vertex="1">
diff --git a/engine/pom.xml b/engine/pom.xml
index bf4121b2..4a865b7f 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -9,11 +9,6 @@
     <artifactId>engine</artifactId>
     <name>Archetype - engine</name>
     <dependencies>
-        <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.trilobita</groupId>
             <artifactId>core</artifactId>
diff --git a/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java b/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java
index b5e7898c..dd4746c5 100644
--- a/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java
+++ b/engine/src/main/java/com/trilobita/engine/server/AbstractServer.java
@@ -1,10 +1,10 @@
 package com.trilobita.engine.server;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.engine.server.masterserver.partition.strategy.PartitionStrategy;
-import com.trilobita.exception.TrilobitaException;
+import com.trilobita.core.exception.TrilobitaException;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
diff --git a/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java b/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java
index b06f64c5..701fc1b4 100644
--- a/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java
+++ b/engine/src/main/java/com/trilobita/engine/server/masterserver/MasterServer.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.Graph;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.core.messaging.MessageProducer;
diff --git a/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java b/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java
index b0929e6f..ee6fb0d3 100644
--- a/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java
+++ b/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/ExecutionManager.java
@@ -1,7 +1,7 @@
 package com.trilobita.engine.server.masterserver.execution;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.core.messaging.MessageProducer;
diff --git a/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java b/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java
index 1e40b779..cc9d9fd3 100644
--- a/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java
+++ b/engine/src/main/java/com/trilobita/engine/server/masterserver/execution/synchronize/Synchronizer.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver.execution.synchronize;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.common.Snapshot;
 import com.trilobita.core.graph.Graph;
 import com.trilobita.core.messaging.MessageConsumer;
diff --git a/engine/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java b/engine/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java
index c84d4301..0a59d42f 100644
--- a/engine/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java
+++ b/engine/src/main/java/com/trilobita/engine/server/masterserver/heartbeat/HeartbeatManager.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.masterserver.heartbeat;
 
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.engine.server.masterserver.MasterServer;
 import com.trilobita.engine.server.masterserver.heartbeat.checker.HeartbeatChecker;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java
index dcde150a..07a0c1da 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Aggregator.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.util.functionable;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.engine.server.AbstractServer;
 
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java
index 802206b6..24d462e0 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Combiner.java
@@ -7,8 +7,8 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import lombok.extern.slf4j.Slf4j;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.engine.server.AbstractServer;
 
 /*
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java
index 161640de..ffdbe1b7 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/Functionable.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.core.messaging.MessageProducer;
 import com.trilobita.core.messaging.MessageConsumer.MessageHandler;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java
index 5310b6dc..2e4c8b43 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/FunctionalMail.java
@@ -1,8 +1,8 @@
 package com.trilobita.engine.server.util.functionable;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 
 public class FunctionalMail extends Mail {
     public FunctionalMail(String instanceName, Computable<?> value) {
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java
index 34a7fce6..698a0222 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/MasterFunctionableRunner.java
@@ -7,10 +7,10 @@
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
-import com.trilobita.commons.Mail.MailType;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
+import com.trilobita.core.common.Mail.MailType;
 import com.trilobita.core.messaging.MessageProducer;
 import com.trilobita.engine.server.util.functionable.Functionable;
 
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/WorkerFunctionableRunner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/WorkerFunctionableRunner.java
index adf52a2c..a2d3b202 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/WorkerFunctionableRunner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/functionableRunner/WorkerFunctionableRunner.java
@@ -3,9 +3,9 @@
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Mail.MailType;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Mail.MailType;
 import com.trilobita.core.messaging.MessageConsumer;
 import com.trilobita.core.messaging.MessageConsumer.MessageHandler;
 import com.trilobita.engine.server.AbstractServer;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/DifferenceAggregator.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/DifferenceAggregator.java
index b12d9499..e3b5aaf3 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/DifferenceAggregator.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/DifferenceAggregator.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.engine.server.util.functionable.Aggregator;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/EdgeSumAggregator.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/EdgeSumAggregator.java
index 3c039563..201a6794 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/EdgeSumAggregator.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/EdgeSumAggregator.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.engine.server.util.functionable.Aggregator;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/MinValueAggregator.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/MinValueAggregator.java
index 38625ca3..bbf456ac 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/MinValueAggregator.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/aggregator/MinValueAggregator.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.engine.server.util.functionable.Aggregator;
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MaxCombiner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MaxCombiner.java
index 5e4376ff..7655544c 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MaxCombiner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MaxCombiner.java
@@ -2,7 +2,9 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Message;
 import com.trilobita.engine.server.util.functionable.Combiner;
 
 /*
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MinCombiner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MinCombiner.java
index 3417c2b2..482222e6 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MinCombiner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/MinCombiner.java
@@ -2,7 +2,9 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Message;
 import com.trilobita.engine.server.util.functionable.Combiner;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/SumCombiner.java b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/SumCombiner.java
index 209e9a74..793faf5a 100644
--- a/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/SumCombiner.java
+++ b/engine/src/main/java/com/trilobita/engine/server/util/functionable/instance/combiner/SumCombiner.java
@@ -2,7 +2,9 @@
 
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Message;
 import com.trilobita.engine.server.util.functionable.Combiner;
 
 /*
diff --git a/engine/src/main/java/com/trilobita/engine/server/workerserver/WorkerServer.java b/engine/src/main/java/com/trilobita/engine/server/workerserver/WorkerServer.java
index cd4cf61c..2668a5bb 100644
--- a/engine/src/main/java/com/trilobita/engine/server/workerserver/WorkerServer.java
+++ b/engine/src/main/java/com/trilobita/engine/server/workerserver/WorkerServer.java
@@ -1,6 +1,7 @@
 package com.trilobita.engine.server.workerserver;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.graph.VertexGroup;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.core.messaging.MessageConsumer;
diff --git a/engine/src/main/java/com/trilobita/engine/server/workerserver/execution/ExecutionManager.java b/engine/src/main/java/com/trilobita/engine/server/workerserver/execution/ExecutionManager.java
index a39d2df2..b7cfdd44 100644
--- a/engine/src/main/java/com/trilobita/engine/server/workerserver/execution/ExecutionManager.java
+++ b/engine/src/main/java/com/trilobita/engine/server/workerserver/execution/ExecutionManager.java
@@ -1,6 +1,6 @@
 package com.trilobita.engine.server.workerserver.execution;
 
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
 import com.trilobita.core.graph.vertex.Vertex;
 import com.trilobita.core.messaging.MessageProducer;
 import com.trilobita.engine.monitor.metrics.Metrics;
diff --git a/examples/pom.xml b/examples/pom.xml
index ddfeca12..43d715d7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -11,11 +11,6 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
-        <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.trilobita</groupId>
             <artifactId>core</artifactId>
diff --git a/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankValue.java b/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankValue.java
index ff82b050..48fd71e9 100644
--- a/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankValue.java
+++ b/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankValue.java
@@ -1,6 +1,6 @@
 package com.trilobita.examples.pagerank.vertex;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import lombok.Data;
 
 @Data
diff --git a/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankVertex.java b/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankVertex.java
index 58e972a3..0d18d981 100644
--- a/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankVertex.java
+++ b/examples/src/main/java/com/trilobita/examples/pagerank/vertex/PageRankVertex.java
@@ -1,7 +1,9 @@
 package com.trilobita.examples.pagerank.vertex;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.trilobita.commons.*;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.graph.vertex.Edge;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.EqualsAndHashCode;
diff --git a/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathValue.java b/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathValue.java
index 911dac55..304c81e9 100644
--- a/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathValue.java
+++ b/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathValue.java
@@ -1,6 +1,6 @@
 package com.trilobita.examples.shortestpath.vertex;
 
-import com.trilobita.commons.Computable;
+import com.trilobita.core.common.Computable;
 import lombok.Data;
 
 @Data
diff --git a/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathVertex.java b/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathVertex.java
index 1849a564..91b6b96f 100644
--- a/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathVertex.java
+++ b/examples/src/main/java/com/trilobita/examples/shortestpath/vertex/ShortestPathVertex.java
@@ -1,9 +1,9 @@
 package com.trilobita.examples.shortestpath.vertex;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.trilobita.commons.Computable;
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Computable;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.graph.vertex.Edge;
 import com.trilobita.core.graph.vertex.Vertex;
 import lombok.EqualsAndHashCode;
diff --git a/pom.xml b/pom.xml
index 62280b26..8c97659a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,6 @@
   <name>trilobita</name>
   <url>http://maven.apache.org</url>
   <modules>
-    <module>commons</module>
     <module>examples</module>
     <module>runtime</module>
     <module>engine</module>
@@ -68,5 +67,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0331327d..c43f4ad8 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -10,11 +10,6 @@
     <name>Archetype - runtime</name>
     <url>http://maven.apache.org</url>
     <dependencies>
-        <dependency>
-            <groupId>com.trilobita</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.trilobita</groupId>
             <artifactId>core</artifactId>
diff --git a/runtime/src/main/java/com/trilobita/runtime/environment/TrilobitaCluster.java b/runtime/src/main/java/com/trilobita/runtime/environment/TrilobitaCluster.java
index 86019599..c9fccfac 100644
--- a/runtime/src/main/java/com/trilobita/runtime/environment/TrilobitaCluster.java
+++ b/runtime/src/main/java/com/trilobita/runtime/environment/TrilobitaCluster.java
@@ -1,7 +1,7 @@
 package com.trilobita.runtime.environment;
 
-import com.trilobita.commons.Mail;
-import com.trilobita.commons.Message;
+import com.trilobita.core.common.Mail;
+import com.trilobita.core.common.Message;
 import com.trilobita.core.graph.Graph;
 import com.trilobita.core.messaging.MessageAdmin;
 import com.trilobita.core.messaging.MessageConsumer;