diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 000000000..3008e6caf
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,22 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>taskana-common-parent</artifactId>
+  <packaging>pom</packaging>
+
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>This pom is parent to all taskana common modules and serves the common build.</description>
+
+  <parent>
+    <groupId>pro.taskana</groupId>
+    <artifactId>taskana-parent</artifactId>
+    <version>4.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <modules>
+    <module>taskana-common</module>
+    <module>taskana-common-data</module>
+    <module>taskana-common-test</module>
+  </modules>
+</project>
diff --git a/lib/taskana-data/pom.xml b/common/taskana-common-data/pom.xml
similarity index 92%
rename from lib/taskana-data/pom.xml
rename to common/taskana-common-data/pom.xml
index 6135f1685..46ac33bed 100644
--- a/lib/taskana-data/pom.xml
+++ b/common/taskana-common-data/pom.xml
@@ -1,14 +1,14 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>taskana-data</artifactId>
+	<artifactId>taskana-common-data</artifactId>
 
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>The helper module to import data for testing.</description>
 
 	<parent>
 		<groupId>pro.taskana</groupId>
-		<artifactId>taskana-lib-parent</artifactId>
+		<artifactId>taskana-common-parent</artifactId>
 		<version>4.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
similarity index 100%
rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
similarity index 100%
rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SampleDataProvider.java
diff --git a/lib/taskana-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java b/common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java
similarity index 100%
rename from lib/taskana-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java
rename to common/taskana-common-data/src/main/java/pro/taskana/sampledata/SqlReplacer.java
diff --git a/lib/taskana-data/src/main/resources/sql/clear/clear-db.sql b/common/taskana-common-data/src/main/resources/sql/clear/clear-db.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/clear/clear-db.sql
rename to common/taskana-common-data/src/main/resources/sql/clear/clear-db.sql
diff --git a/lib/taskana-data/src/main/resources/sql/clear/drop-tables.sql b/common/taskana-common-data/src/main/resources/sql/clear/drop-tables.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/clear/drop-tables.sql
rename to common/taskana-common-data/src/main/resources/sql/clear/drop-tables.sql
diff --git a/lib/taskana-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql b/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql
rename to common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/attachment.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/attachment.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/classification.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/classification.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/distribution-targets.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/distribution-targets.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/object-reference.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/object-reference.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/task-comment.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/task-comment.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/task-history-event.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/task-history-event.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/task.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/task.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/task.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/task.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql
diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/sample-data/workbasket.sql
rename to common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/attachment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/attachment.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/attachment.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/classification-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/classification-history-event.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/classification-history-event.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/classification.sql b/common/taskana-common-data/src/main/resources/sql/test-data/classification.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/classification.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/classification.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/distribution-targets.sql b/common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/distribution-targets.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/distribution-targets.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/object-reference.sql b/common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/object-reference.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/object-reference.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task-comment.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/task-comment.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/task-comment.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/task-history-event.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/task-history-event.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/task.sql b/common/taskana-common-data/src/main/resources/sql/test-data/task.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/task.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/task.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket-history-event.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket-history-event.sql
diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
similarity index 100%
rename from lib/taskana-data/src/main/resources/sql/test-data/workbasket.sql
rename to common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
diff --git a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java b/common/taskana-common-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java
similarity index 100%
rename from lib/taskana-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java
rename to common/taskana-common-data/src/test/java/pro/taskana/sampledata/SampleDataProviderTest.java
diff --git a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java b/common/taskana-common-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
similarity index 100%
rename from lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
rename to common/taskana-common-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
diff --git a/common/taskana-common-test/pom.xml b/common/taskana-common-test/pom.xml
new file mode 100644
index 000000000..d6d61bd3e
--- /dev/null
+++ b/common/taskana-common-test/pom.xml
@@ -0,0 +1,19 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>taskana-common-test</artifactId>
+
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>The helper module for test utils</description>
+
+  <parent>
+    <artifactId>taskana-common-parent</artifactId>
+    <groupId>pro.taskana</groupId>
+    <version>4.1.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+
+</project>
\ No newline at end of file
diff --git a/common/taskana-common/pom.xml b/common/taskana-common/pom.xml
new file mode 100644
index 000000000..fe33ad3b3
--- /dev/null
+++ b/common/taskana-common/pom.xml
@@ -0,0 +1,18 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>taskana-common</artifactId>
+
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>The global helper module</description>
+
+  <parent>
+    <artifactId>taskana-common-parent</artifactId>
+    <groupId>pro.taskana</groupId>
+    <version>4.1.1-SNAPSHOT</version>
+  </parent>
+
+
+</project>
\ No newline at end of file
diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
index a055e249b..41207ab55 100644
--- a/history/taskana-simplehistory-provider/pom.xml
+++ b/history/taskana-simplehistory-provider/pom.xml
@@ -34,7 +34,7 @@
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>pro.taskana</groupId>
-			<artifactId>taskana-data</artifactId>
+			<artifactId>taskana-common-data</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/lib/pom.xml b/lib/pom.xml
index 866d6ae3f..a56f0bbc6 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -15,7 +15,6 @@
 	</parent>
 
 	<modules>
-		<module>taskana-data</module>
 		<module>taskana-core</module>
 		<module>taskana-cdi</module>
 		<module>taskana-spring</module>
diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
index 0d122f754..7a56222c3 100644
--- a/lib/taskana-cdi/pom.xml
+++ b/lib/taskana-cdi/pom.xml
@@ -43,12 +43,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml
index 41be0f0b1..8dad579a3 100644
--- a/lib/taskana-spring-example/pom.xml
+++ b/lib/taskana-spring-example/pom.xml
@@ -35,12 +35,7 @@
 		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml
index 6ac2654e4..6591558e1 100644
--- a/lib/taskana-spring/pom.xml
+++ b/lib/taskana-spring/pom.xml
@@ -57,12 +57,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 3daf52109..1262e3e05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
     <url>http://taskana.pro</url>
 
     <modules>
+        <module>common</module>
         <module>lib</module>
         <module>rest</module>
         <!-- History is an optional module. -->
diff --git a/rest/taskana-rest-spring-example-common/pom.xml b/rest/taskana-rest-spring-example-common/pom.xml
index 56222fd82..5af0cc420 100644
--- a/rest/taskana-rest-spring-example-common/pom.xml
+++ b/rest/taskana-rest-spring-example-common/pom.xml
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>pro.taskana</groupId>
-            <artifactId>taskana-data</artifactId>
+            <artifactId>taskana-common-data</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml
index a20576484..263b0b759 100644
--- a/rest/taskana-rest-spring/pom.xml
+++ b/rest/taskana-rest-spring/pom.xml
@@ -87,7 +87,7 @@
         </dependency>
         <dependency>
             <groupId>pro.taskana</groupId>
-            <artifactId>taskana-data</artifactId>
+            <artifactId>taskana-common-data</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>