diff --git a/hawkbit-runtime/.gitignore b/hawkbit-monolith/.gitignore
similarity index 100%
rename from hawkbit-runtime/.gitignore
rename to hawkbit-monolith/.gitignore
diff --git a/hawkbit-runtime/README.md b/hawkbit-monolith/README.md
similarity index 61%
rename from hawkbit-runtime/README.md
rename to hawkbit-monolith/README.md
index 35217b6aa..20a3fce5e 100644
--- a/hawkbit-runtime/README.md
+++ b/hawkbit-monolith/README.md
@@ -6,10 +6,6 @@ hawkBit Runtime
 | `.sandbox/`              | Content of the hawkBit sandbox installation running on [hawkbit.eclipseprojects.io](https://hawkbit.eclipseprojects.io/UI/). |
 | `docker/`                | Docker related files, such es Dockerfiles, compose and stack files to quickly start up an hawkBit.                           |
 | `docker/docker_build/`   | Docker images build related files, such es Dockerfiles and build shell scripts.                                              |
-| `hawkbit-update-server/` | Spring-Boot application of hawkBit. Monolith containing all services.                                                        |
-| `hawkbit-ddi-server/`    | Spring-Boot application of hawkBit DDI server.                                                                               |
-| `hawkbit-dmf-server/`    | Spring-Boot application of hawkBit DMF server.                                                                               |
-| `hawkbit-mgmt-server/`   | Spring-Boot application of hawkBit Management server. Provides REST Management API and rollouts / auto assigment processing  |
 
 Note: micro service setup requires all services using DB to use same shared DB. So, they don't work with default in
 memory H2 database. Docker compose with mysql shows an example setup.
diff --git a/hawkbit-starters/hawkbit-boot-starter/README.MD b/hawkbit-monolith/hawkbit-boot-starter/README.MD
similarity index 100%
rename from hawkbit-starters/hawkbit-boot-starter/README.MD
rename to hawkbit-monolith/hawkbit-boot-starter/README.MD
diff --git a/hawkbit-starters/hawkbit-boot-starter/pom.xml b/hawkbit-monolith/hawkbit-boot-starter/pom.xml
similarity index 96%
rename from hawkbit-starters/hawkbit-boot-starter/pom.xml
rename to hawkbit-monolith/hawkbit-boot-starter/pom.xml
index 4a62b5f58..69680bc6d 100644
--- a/hawkbit-starters/hawkbit-boot-starter/pom.xml
+++ b/hawkbit-monolith/hawkbit-boot-starter/pom.xml
@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-starters</artifactId>
+        <artifactId>hawkbit-monolith-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-boot-starter</artifactId>
     <name>hawkBit :: Spring Boot Starter</name>
     <description>Complete starter, including auto-configuration, logging and all hawkBit interfaces</description>
diff --git a/hawkbit-runtime/hawkbit-update-server/README.md b/hawkbit-monolith/hawkbit-update-server/README.md
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/README.md
rename to hawkbit-monolith/hawkbit-update-server/README.md
diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-monolith/hawkbit-update-server/pom.xml
similarity index 69%
rename from hawkbit-runtime/hawkbit-update-server/pom.xml
rename to hawkbit-monolith/hawkbit-update-server/pom.xml
index d9652add8..3abc6a1d4 100644
--- a/hawkbit-runtime/hawkbit-update-server/pom.xml
+++ b/hawkbit-monolith/hawkbit-update-server/pom.xml
@@ -14,9 +14,10 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-runtime-parent</artifactId>
+        <artifactId>hawkbit-monolith-parent</artifactId>
         <version>${revision}</version>
     </parent>
+
     <artifactId>hawkbit-update-server</artifactId>
     <name>hawkBit :: Runtime :: Update Server (Monolith)</name>
 
@@ -62,4 +63,31 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${baseDir}</outputDirectory>
+                            <mainClass>${spring.app.class}</mainClass>
+                            <layout>JAR</layout>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java b/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java
rename to hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
rename to hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application-db2.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mssql.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mysql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application-mysql.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application-postgresql.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application-postgresql.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/application.properties
diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/banner.txt b/hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/main/resources/banner.txt
rename to hawkbit-monolith/hawkbit-update-server/src/main/resources/banner.txt
diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java
rename to hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java
diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java
rename to hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java
diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
rename to hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java
diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java b/hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java
similarity index 100%
rename from hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java
rename to hawkbit-monolith/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/PreAuthorizeEnabledTest.java
diff --git a/hawkbit-starters/pom.xml b/hawkbit-monolith/pom.xml
similarity index 83%
rename from hawkbit-starters/pom.xml
rename to hawkbit-monolith/pom.xml
index 9d6fa1971..9ef7fe568 100644
--- a/hawkbit-starters/pom.xml
+++ b/hawkbit-monolith/pom.xml
@@ -12,15 +12,19 @@
 <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>
+
     <parent>
         <groupId>org.eclipse.hawkbit</groupId>
         <artifactId>hawkbit-parent</artifactId>
         <version>${revision}</version>
     </parent>
-    <artifactId>hawkbit-starters</artifactId>
-    <name>hawkBit :: Spring Boot Starters</name>
+
+    <artifactId>hawkbit-monolith-parent</artifactId>
+    <name>hawkBit :: Runtime :: Parent</name>
     <packaging>pom</packaging>
+
     <modules>
         <module>hawkbit-boot-starter</module>
+        <module>hawkbit-update-server</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml
deleted file mode 100644
index a8053004d..000000000
--- a/hawkbit-runtime/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-
-    Copyright (c) 2015 Bosch Software Innovations GmbH and others
-
-    This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License 2.0
-    which is available at https://www.eclipse.org/legal/epl-2.0/
-
-    SPDX-License-Identifier: EPL-2.0
-
--->
-<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>
-
-    <parent>
-        <groupId>org.eclipse.hawkbit</groupId>
-        <artifactId>hawkbit-parent</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>hawkbit-runtime-parent</artifactId>
-    <name>hawkBit :: Runtime :: Parent</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${baseDir}</outputDirectory>
-                            <mainClass>${spring.app.class}</mainClass>
-                            <layout>JAR</layout>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-
-    <modules>
-        <module>hawkbit-update-server</module>
-    </modules>
-</project>
diff --git a/hawkbit-starters/README.md b/hawkbit-starters/README.md
deleted file mode 100644
index a560b8e71..000000000
--- a/hawkbit-starters/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a set
-of [Spring Boot Starters](http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#using-boot-starter) that
-allows to quick start a spring boot based application with hawkBit's core functionality.
-
-The [all in one](hawkbit-boot-starter) starter contains the complete feature set in addition we provide four starters
-for the hawkBit interfaces. They can be combined in any order.
-
-Check out the hawkBit [update server](../hawkbit-runtime/hawkbit-update-server) as a reference.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 526374ff5..fdd04a071 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,10 +144,9 @@
         <module>hawkbit-mgmt</module>
         <module>hawkbit-ddi</module>
         <module>hawkbit-dmf</module>
-        <module>hawkbit-runtime</module>
-        <module>hawkbit-simple-ui</module>
+        <module>hawkbit-monolith</module>
 
-        <module>hawkbit-starters</module>
+        <module>hawkbit-simple-ui</module>
 
         <module>hawkbit-sdk</module>