diff --git a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerActionTypeDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
similarity index 63%
rename from fda-container-managing-service/api/src/main/java/api/dto/container/ContainerActionTypeDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
index 42c9909b145f572b64257dc0de1f667db4e883a8..8e65548f2eaea7e208a89cc573b2e701922bc42a 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerActionTypeDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerActionTypeDto.java
@@ -1,4 +1,4 @@
-package api.dto.container;
+package at.tuwien.api.dto.container;
 
 public enum ContainerActionTypeDto {
     START, STOP, REMOVE
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerChangeDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
similarity index 79%
rename from fda-container-managing-service/api/src/main/java/api/dto/container/ContainerChangeDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
index 6f0e1c5bb16c04f09b8b315dcce646d702665b25..c7dbf3680bea93380a080a8d673afef2df92ec54 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerChangeDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerChangeDto.java
@@ -1,4 +1,4 @@
-package api.dto.container;
+package at.tuwien.api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
similarity index 88%
rename from fda-container-managing-service/api/src/main/java/api/dto/container/ContainerDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
index f3ffbb51c2f27ffce76f5bfc3a52a0df68c317e8..6e23c906f485073458a00e6b9ec3dcdef4a96b80 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/container/ContainerDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/ContainerDto.java
@@ -1,4 +1,4 @@
-package api.dto.container;
+package at.tuwien.api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerBriefDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerBriefDto.java
similarity index 83%
rename from fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerBriefDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerBriefDto.java
index 012e8ced990609935144a1dee17bf6ac16c05ae6..ea5fa9d84679db807b44f63c6db3b2fc776bfc7a 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerBriefDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerBriefDto.java
@@ -1,4 +1,4 @@
-package api.dto.container;
+package at.tuwien.api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerDto.java
similarity index 88%
rename from fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerDto.java
index 344adccfc1bd8481f7a87e88b26bbe258b4c8a4b..50461db0da1d735dc90c310a78cc4ac166b7f498 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/container/DatabaseContainerDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/container/DatabaseContainerDto.java
@@ -1,4 +1,4 @@
-package api.dto.container;
+package at.tuwien.api.dto.container;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseConnectionDataDto.java
similarity index 90%
rename from fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseConnectionDataDto.java
index d78d7b99af8c158d258259c015bcbe27a42149c2..24cb2bf6af32dd6202d1dd7351446367a4682555 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseConnectionDataDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseConnectionDataDto.java
@@ -1,4 +1,4 @@
-package api.dto.database;
+package at.tuwien.api.dto.database;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseContainerDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseContainerDto.java
similarity index 83%
rename from fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseContainerDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseContainerDto.java
index d1ea568c45becca4d7d64dca70f4e1fe741f0011..c7377b747416ffdcb1b3bcd6b8784ab941196497 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseContainerDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseContainerDto.java
@@ -1,4 +1,4 @@
-package api.dto.database;
+package at.tuwien.api.dto.database;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseResponseDto.java b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseResponseDto.java
similarity index 82%
rename from fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseResponseDto.java
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseResponseDto.java
index 4aa91f5ecfde800188b971f596334fdb9b0c1105..48c2a1e6973b4eeb9b0cd872a1c8ec6b798f84a1 100644
--- a/fda-container-managing-service/api/src/main/java/api/dto/database/CreateDatabaseResponseDto.java
+++ b/fda-container-managing-service/api/src/main/java/at/tuwien/api/dto/database/CreateDatabaseResponseDto.java
@@ -1,4 +1,4 @@
-package api.dto.database;
+package at.tuwien.api.dto.database;
 
 import lombok.Builder;
 import lombok.Getter;
diff --git a/fda-container-managing-service/api/src/main/java/api/pom.xml b/fda-container-managing-service/api/src/main/java/at/tuwien/api/pom.xml
similarity index 100%
rename from fda-container-managing-service/api/src/main/java/api/pom.xml
rename to fda-container-managing-service/api/src/main/java/at/tuwien/api/pom.xml
diff --git a/fda-container-managing-service/pom.xml b/fda-container-managing-service/pom.xml
index cf8696a72c81d3938d43caedcad8bb0b04d60b0b..b35382b8532622a4c269a556b2feef7b130651df 100644
--- a/fda-container-managing-service/pom.xml
+++ b/fda-container-managing-service/pom.xml
@@ -2,27 +2,30 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <modules>
-        <module>rest-service</module>
-        <module>api</module>
-        <module>services</module>
-    </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.3.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
     </parent>
+
     <groupId>at.tuwien</groupId>
     <artifactId>fda-container-managing-service</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>fda-container-managing-service</name>
     <description>Demo project for Spring Boot</description>
 
+    <packaging>pom</packaging>
+    <modules>
+        <module>rest-service</module>
+        <module>api</module>
+        <module>services</module>
+    </modules>
+
     <properties>
         <java.version>11</java.version>
         <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+        <mapstruct.version>1.4.2.Final</mapstruct.version>
+        <mainClass>at.tuwien.FdaContainerManagingApplication</mainClass>
     </properties>
 
     <dependencies>
diff --git a/fda-container-managing-service/rest-service/pom.xml b/fda-container-managing-service/rest-service/pom.xml
index 7445a95ba0b695c636e719c4bb6be12334661631..00c4d0a2ded7733b1d51d67f9943764144bc4e03 100644
--- a/fda-container-managing-service/rest-service/pom.xml
+++ b/fda-container-managing-service/rest-service/pom.xml
@@ -17,4 +17,13 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>services</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
similarity index 52%
rename from fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java
rename to fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
index 77eed7e691efd242268fa2b6528b9b8cd923fb29..c9a29afc155a3e5309aaa6623655c8bd6e0e3715 100644
--- a/fda-container-managing-service/rest-service/src/main/java/FdaContainerManagingApplication.java
+++ b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/FdaContainerManagingApplication.java
@@ -1,10 +1,18 @@
+package at.tuwien;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
-@ComponentScan(basePackages = "entities")
+@EnableJpaAuditing
+@ComponentScan(basePackages = {"at.tuwien"})
+@EnableJpaRepositories(basePackages = {"at.tuwien.repositories"})
+@EntityScan(basePackages = {"at.tuwien.entities"})
 @EnableSwagger2
 public class FdaContainerManagingApplication {
 
diff --git a/fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
similarity index 92%
rename from fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java
rename to fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
index d39a7add5c72cd5dd02da9d71d96042e0404b70b..0af2a36d7c49ffb6225e51defa95fd4dfb8f3311 100644
--- a/fda-container-managing-service/rest-service/src/main/java/config/SwaggerConfig.java
+++ b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/config/SwaggerConfig.java
@@ -1,4 +1,4 @@
-package config;
+package at.tuwien.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -26,7 +26,7 @@ public class SwaggerConfig {
 
     private ApiInfo apiInfo() {
         return new ApiInfo("FDA-Container-Managing API",
-                "Docker service that can manage Docker services",
+                "Docker at.tuwien.service that can manage Docker services",
                 "1.0",
                 null,
                 new Contact("Martin Weise", "https://informatics.tuwien.ac.at/people/martin-weise", "martin.weise@tuwien.ac.at"),
diff --git a/fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseContainerController.java
similarity index 85%
rename from fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java
rename to fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseContainerController.java
index a4015dc1a511168bbfad87f8b649fe7b2a3b04d5..dde2c15dab1f3489591a62552763146179bd5c00 100644
--- a/fda-container-managing-service/rest-service/src/main/java/endpoints/DatabaseContainerController.java
+++ b/fda-container-managing-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseContainerController.java
@@ -1,14 +1,14 @@
-package endpoints;
+package at.tuwien.endpoints;
 
-import api.dto.container.ContainerActionTypeDto;
-import api.dto.container.DatabaseContainerBriefDto;
-import api.dto.container.DatabaseContainerDto;
-import api.dto.database.CreateDatabaseContainerDto;
-import api.dto.database.CreateDatabaseResponseDto;
+import at.tuwien.api.dto.container.ContainerActionTypeDto;
+import at.tuwien.api.dto.container.DatabaseContainerBriefDto;
+import at.tuwien.api.dto.container.DatabaseContainerDto;
+import at.tuwien.api.dto.database.CreateDatabaseContainerDto;
+import at.tuwien.api.dto.database.CreateDatabaseResponseDto;
+import at.tuwien.entities.DatabaseContainer;
+import at.tuwien.mapper.DatabaseContainerMapper;
+import at.tuwien.service.ContainerService;
 import io.swagger.annotations.ApiOperation;
-import services.entities.DatabaseContainer;
-import services.mapper.DatabaseContainerMapper;
-import services.service.ContainerService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml b/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
index 8e0e48bc580e75b97a6323bf2b1cc1aea0261a1f..3771aadd426de96fb58d1f0145ed866a8bd583a4 100644
--- a/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-managing-service/rest-service/src/main/resources/application-docker.yml
@@ -19,7 +19,7 @@ spring:
     loadbalancer.ribbon.enabled: false
 server.port: 9091
 logging:
-  pattern.console: %d %highlight(%-5level) %msg%n
+  pattern.console: "%d %highlight(%-5level) %msg%n"
   level:
     root: warn
     at.: info
diff --git a/fda-container-managing-service/rest-service/src/main/resources/application-dev.yml b/fda-container-managing-service/rest-service/src/main/resources/application.yml
similarity index 75%
rename from fda-container-managing-service/rest-service/src/main/resources/application-dev.yml
rename to fda-container-managing-service/rest-service/src/main/resources/application.yml
index 569c76fd01d10493b92bff2a7bbe8b84c93fb6ad..73dc92e4bc670ce514c3ea9e9ec7d91afdc1b7ef 100644
--- a/fda-container-managing-service/rest-service/src/main/resources/application-dev.yml
+++ b/fda-container-managing-service/rest-service/src/main/resources/application.yml
@@ -1,4 +1,5 @@
 spring:
+  main.banner-mode: off
   datasource:
     url: jdbc:postgresql://localhost:5432/fda
     driver-class-name: org.postgresql.Driver
@@ -8,12 +9,17 @@ spring:
     show-sql: true
     properties:
       hibernate:
-        ddl-auto: update
+        ddl-auto: create-drop
         dialect: org.hibernate.dialect.PostgreSQLDialect
     hibernate.ddl-auto: none
     hibernate.show-sql: true
   application:
     name: fda-container-managing
 server.port: 9091
+logging:
+  pattern.console: "%d %highlight(%-5level) %msg%n"
+  level:
+    root: warn
+    at.: debug
 eureka:
   client.serviceUrl.defaultZone: http://localhost:9090/eureka/
\ No newline at end of file
diff --git a/fda-container-managing-service/services/pom.xml b/fda-container-managing-service/services/pom.xml
index 1f85e383c462bcdeb38e87948891c4a6dc89819b..182770b4d1602dee17af1a07289a5aadf9e20e9a 100644
--- a/fda-container-managing-service/services/pom.xml
+++ b/fda-container-managing-service/services/pom.xml
@@ -3,14 +3,6 @@
          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>
-    <dependencies>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>api</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
     <parent>
         <groupId>at.tuwien</groupId>
         <artifactId>fda-container-managing-service</artifactId>
@@ -25,4 +17,13 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
 </project>
\ No newline at end of file
diff --git a/fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java b/fda-container-managing-service/services/src/main/java/at/tuwien/config/ContainerSpringConfig.java
similarity index 96%
rename from fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java
rename to fda-container-managing-service/services/src/main/java/at/tuwien/config/ContainerSpringConfig.java
index 1cf6d327be7ef368abda988fbac18c13d0bae522..c7377936adbf6483639933ed841fb3943288d945 100644
--- a/fda-container-managing-service/services/src/main/java/config/ContainerSpringConfig.java
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/config/ContainerSpringConfig.java
@@ -1,4 +1,4 @@
-package config;
+package at.tuwien.config;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8e209adc979d3baf7a81169f8d16c112bb2a1ff
--- /dev/null
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/Auditable.java
@@ -0,0 +1,40 @@
+package at.tuwien.entities;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.time.Instant;
+
+@Data
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@ToString(onlyExplicitlyIncluded = true)
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class Auditable {
+
+    @Id
+    @EqualsAndHashCode.Include
+    @ToString.Include
+    @GeneratedValue(generator = "sequence-per-entity")
+    @GenericGenerator(
+            name = "sequence-per-entity",
+            strategy = "enhanced-sequence",
+            parameters = @Parameter(name = "prefer_sequence_per_entity", value = "true")
+    )
+    private Long id;
+
+    @Column(nullable = false, updatable = false)
+    @CreatedDate
+    private Instant created;
+
+    @Column
+    @LastModifiedDate
+    private Instant lastModified;
+}
\ No newline at end of file
diff --git a/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java
new file mode 100644
index 0000000000000000000000000000000000000000..49355e55dc406d82b435ddd1546b7cdc806f3bb3
--- /dev/null
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/entities/DatabaseContainer.java
@@ -0,0 +1,33 @@
+package at.tuwien.entities;
+
+import lombok.*;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import java.time.Instant;
+
+
+@Entity
+@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
+@ToString(callSuper = true, onlyExplicitlyIncluded = true)
+public class DatabaseContainer extends Auditable{
+
+    @Column(nullable = false)
+    private String containerId;
+
+    @Column(nullable = false)
+    private Instant containerCreated;
+
+    @Column(nullable = false)
+    private String containerName;
+
+    @Column(nullable = false)
+    private String databaseName;
+
+    @Column
+    private String status;
+
+    @Column
+    private String ipAddress;
+
+}
diff --git a/fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java b/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java
similarity index 88%
rename from fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java
rename to fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java
index ed4e1427ef55cbd2d5abc48e69853e60ee7bf1e4..26a92c68b4743c3b53b07f9a58597d18a251f922 100644
--- a/fda-container-managing-service/services/src/main/java/mapper/DatabaseContainerMapper.java
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/mapper/DatabaseContainerMapper.java
@@ -1,10 +1,10 @@
-package mapper;
+package at.tuwien.mapper;
 
-import api.dto.container.DatabaseContainerBriefDto;
-import api.dto.container.DatabaseContainerDto;
+import at.tuwien.api.dto.container.DatabaseContainerBriefDto;
+import at.tuwien.api.dto.container.DatabaseContainerDto;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
-import entities.DatabaseContainer;
+import at.tuwien.entities.DatabaseContainer;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
diff --git a/fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java b/fda-container-managing-service/services/src/main/java/at/tuwien/repositories/MetadataRepository.java
similarity index 73%
rename from fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java
rename to fda-container-managing-service/services/src/main/java/at/tuwien/repositories/MetadataRepository.java
index 888e9bef681232278953a0483b0b6de3f48e07d7..5c7fc6ba05db3d9562f9e4a60750333006c53a94 100644
--- a/fda-container-managing-service/services/src/main/java/repositories/MetadataRepository.java
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/repositories/MetadataRepository.java
@@ -1,8 +1,8 @@
-package repositories;
+package at.tuwien.repositories;
 
+import at.tuwien.entities.DatabaseContainer;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import services.entities.DatabaseContainer;
 
 @Repository
 public interface MetadataRepository extends JpaRepository<DatabaseContainer, String> {
diff --git a/fda-container-managing-service/services/src/main/java/service/ContainerService.java b/fda-container-managing-service/services/src/main/java/at/tuwien/service/ContainerService.java
similarity index 93%
rename from fda-container-managing-service/services/src/main/java/service/ContainerService.java
rename to fda-container-managing-service/services/src/main/java/at/tuwien/service/ContainerService.java
index 1fb0087dda1ba3c3f16e71f52e6e36cbd080712f..63b3cf9a68fd0faacba20ce889e449d69e81304c 100644
--- a/fda-container-managing-service/services/src/main/java/service/ContainerService.java
+++ b/fda-container-managing-service/services/src/main/java/at/tuwien/service/ContainerService.java
@@ -1,14 +1,14 @@
-package service;
+package at.tuwien.service;
 
-import api.dto.database.CreateDatabaseContainerDto;
+import at.tuwien.api.dto.database.CreateDatabaseContainerDto;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.PortBinding;
 import com.github.dockerjava.api.model.RestartPolicy;
-import entities.DatabaseContainer;
-import mapper.DatabaseContainerMapper;
+import at.tuwien.entities.DatabaseContainer;
+import at.tuwien.mapper.DatabaseContainerMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.SocketUtils;
diff --git a/fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java b/fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java
deleted file mode 100644
index 6ff76e5aa988c04f937e1fdf1a03912816782ffb..0000000000000000000000000000000000000000
--- a/fda-container-managing-service/services/src/main/java/entities/DatabaseContainer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package entities;
-
-import lombok.Getter;
-import lombok.Setter;
-
-
-@Getter
-@Setter
-public class DatabaseContainer {
-
-    private String containerID;
-
-    private String created;
-
-    private String containerName;
-
-    private String dbName;
-
-    private String status;
-
-    private String ipAddress;
-
-}