diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbd9c628449b04cecfc777667899955b296fe652..33de3b30f1ecc6f150c9d0dac80afdc9b4d697ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,19 +149,20 @@ build-metadata-service:
only:
- merge_requests
- master
+ needs:
+ - build-java-lib
+ dependencies:
+ - build-java-lib
script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install $MAVEN_OPTS -DskipTests"
+ - "mvn -f ./dbrepo-metadata-service/pom.xml clean package $MAVEN_OPTS -DskipTests"
# Compiled classes are needed for SonarQube in later stages
artifacts:
when: always
paths:
- - ./dbrepo-metadata-service/test/target/classes
- - ./dbrepo-metadata-service/services/target/classes
+ - ./dbrepo-metadata-service/oai/target/classes
- ./dbrepo-metadata-service/repositories/target/classes
- ./dbrepo-metadata-service/rest-service/target/classes
- - ./dbrepo-metadata-service/api/target/classes
- - ./dbrepo-metadata-service/oai/target/classes
- - ./dbrepo-metadata-service/entities/target/classes
+ - ./dbrepo-metadata-service/services/target/classes
expire_in: 1 days
build-analyse-service:
@@ -176,7 +177,7 @@ build-analyse-service:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
-build-lib:
+build-python-lib:
image: docker.io/python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
stage: build
only:
@@ -188,6 +189,19 @@ build-lib:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
+build-java-lib:
+ image: maven:3-openjdk-${JAVA_VERSION}
+ stage: build
+ only:
+ - merge_requests
+ - master
+ script:
+ - "mvn -f ./lib/java/dbrepo-core/pom.xml clean install $MAVEN_OPTS -DskipTests"
+ artifacts:
+ when: always
+ paths:
+ - ./lib/java/dbrepo-core/target/classes
+
build-data-service:
image: maven:3-openjdk-${JAVA_VERSION}
stage: build
@@ -195,11 +209,9 @@ build-data-service:
- merge_requests
- master
needs:
- - build-metadata-service
+ - build-java-lib
dependencies:
- - build-metadata-service
- before_script:
- - "mvn -f ./dbrepo-metadata-service/pom.xml clean install $MAVEN_OPTS -DskipTests"
+ - build-java-lib
script:
- "mvn -f ./dbrepo-data-service/pom.xml clean package $MAVEN_OPTS -DskipTests"
# Compiled classes are needed for SonarQube in later stages
@@ -277,9 +289,9 @@ test-metadata-service:
- merge_requests
- master
needs:
- - build-metadata-service
+ - build-java-lib
dependencies:
- - build-metadata-service
+ - build-java-lib
script:
- "mvn -f ./dbrepo-metadata-service/pom.xml clean test verify $MAVEN_OPTS"
- "cat ./dbrepo-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
@@ -489,7 +501,7 @@ test-search-service-init:
junit: ./dbrepo-search-service/coverage.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/'
-test-lib:
+test-python-lib:
image: docker.io/python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
stage: test
only:
@@ -498,9 +510,9 @@ test-lib:
variables:
PIPENV_PIPFILE: "./lib/python/Pipfile"
needs:
- - build-lib
+ - build-python-lib
dependencies:
- - build-lib
+ - build-python-lib
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
@@ -560,7 +572,7 @@ release-images:
- test-analyse-service
- test-auth-service-init
- test-data-service
- - test-lib
+ - test-python-lib
- test-metadata-service
- test-search-service
- test-search-service-init
@@ -705,10 +717,10 @@ scan-sonarqube:
- master
needs:
- build-data-service
- - build-metadata-service
+ - build-java-lib
dependencies:
- build-data-service
- - build-metadata-service
+ - build-java-lib
script:
- 'sonar-scanner -Dsonar.token="${CI_SONAR_TOKEN}"'
allow_failure: true
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 11ca4d80b9067ac58b97396ea530332f91ae5422..b85b7837b1d3e0fe96d6b96ed682fe86875df9a7 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -94,39 +94,13 @@
<dependencies>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bootstrap</artifactId>
- <version>${spring-cloud.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <artifactId>spring-boot-starter-test</artifactId>
</dependency>
<!-- Spark -->
<dependency>
@@ -166,12 +140,6 @@
<artifactId>hadoop-aws</artifactId>
<version>${hadoop.version}</version>
</dependency>
- <!-- Open API -->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
- <version>${springdoc-openapi.version}</version>
- </dependency>
<!-- Data Source -->
<dependency>
<groupId>com.h2database</groupId>
@@ -203,12 +171,6 @@
<version>${micrometer.version}</version>
<scope>test</scope>
</dependency>
- <!-- IDE -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>compile</scope>
- </dependency>
<!-- Mapping -->
<dependency>
<groupId>org.mapstruct</groupId>
@@ -221,11 +183,6 @@
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson-datatype.version}</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -252,29 +209,12 @@
<artifactId>keycloak-admin-client</artifactId>
<version>${keycloak.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate6</artifactId>
- <version>${jackson-datatype.version}</version>
- </dependency>
<!-- Authentication -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
- <!-- DTOs -->
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!-- Exceptions -->
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-repositories</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- AMPQ -->
<dependency>
<groupId>org.springframework.amqp</groupId>
@@ -293,19 +233,8 @@
</dependency>
<!-- Testing -->
<dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -378,7 +307,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<!-- Note config is repeated in scalatest config -->
<configuration>
- <argLine>@{argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=${CodeCacheSize}
+ <argLine>@{argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g
+ -XX:ReservedCodeCacheSize=${CodeCacheSize}
${extraJavaTestArgs}
</argLine>
</configuration>
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index ba1a0e76da6d1dda766d64c33b68ab452d509618..79e64919825b2f876e0c3bf92dc6016a52787c15 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -1,10 +1,10 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.CreateAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.AccessService;
import at.tuwien.service.CacheService;
import io.swagger.v3.oas.annotations.Operation;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index 751f1ca34416ad03ce53dff1f2846932458ec784..c8bf60199d26577ca31d684345fd87dec17da362 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -1,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.AccessService;
import at.tuwien.service.CacheService;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/RestEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/RestEndpoint.java
index 45cea4371c74f61d3cca69d70b08e8341c5e78d3..e67e3acb4350b690458756141d202b95f97f4b0d 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/RestEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/RestEndpoint.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.api.user.UserDetailsDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDetailsDto;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
import org.springframework.security.core.Authentication;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
index fb076ce3a237646d19258b6fff1ee2562fb264dd..71323288684022104f2abcff51034d61c41499d7 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.ExportResourceDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.query.QueryPersistDto;
-import at.tuwien.api.database.query.SubsetDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryPersistDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.CacheService;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index b958198b649c162c77a4313704fc8f22f0f31dd3..cc290c44077897c66d5e9c0c5fdc2409c22eb464 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.ExportResourceDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.internal.TableCreateDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.*;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/UploadEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/UploadEndpoint.java
index 9d338e42bfce56b8274d460b121b27709705b54c..810145343ca36e4143cb4a2e3cec674f611e7ced 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/UploadEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/UploadEndpoint.java
@@ -1,9 +1,9 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.file.UploadResponseDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.file.UploadResponseDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.StorageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index 94ae9b01241b4acf87fb035f62ce29f87c2b32ac..d7bb2ce11660ebc7cc489ce01c44a2be7a042697 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -1,13 +1,13 @@
package at.tuwien.endpoints;
-import at.tuwien.ExportResourceDto;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.*;
import at.tuwien.validation.EndpointValidator;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index ee92062ad892ef724704ce10bce85a2476a9f871..ada082153e2cc3219bdc1783bb1824317ada3c88 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -1,7 +1,7 @@
package at.tuwien.handlers;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import io.swagger.v3.oas.annotations.Hidden;
import lombok.extern.log4j.Log4j2;
import org.springframework.http.HttpHeaders;
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index 655741cc23d89ed41dc9b30f67c38b16b38d69a7..6f5124850a796d715cdacd2776880dcbf73a6008 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -1,13 +1,13 @@
package at.tuwien.validation;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.FilterDto;
-import at.tuwien.api.database.query.FilterTypeDto;
-import at.tuwien.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.FilterDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.FilterTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
import at.tuwien.endpoints.RestEndpoint;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.CacheService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
index e03ea299a229c41ee6a5a5c342ea7af69ebc4bd4..97fb83f40435480c5102aa05b7f0c8daa6d758c1 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
@@ -1,8 +1,8 @@
package at.tuwien.config;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
import lombok.extern.log4j.Log4j2;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
index 7aa18e3b9e5e7aebf6e46ccf7fc0ca1cb0978b2a..b331dcea39648297ffca5b8db42c8c8ebc7b82c9 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
@@ -1,7 +1,7 @@
package at.tuwien.config;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.test.BaseTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.BaseTest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.testcontainers.containers.MariaDBContainer;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index d41e0609bae2f356a68dd5baddee150d73356a68..26671988b0f73b77494e7b85b46e9266e858cb70 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -1,13 +1,13 @@
package at.tuwien.endpoint;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import at.tuwien.endpoints.AccessEndpoint;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.AccessService;
import at.tuwien.service.CacheService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
index e2a6c550d04a62dcc08fb2603c50c7c05af750c9..35e46938e793a6f6ff130f61bdd1c3ec76e5e79c 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/DatabaseEndpointUnitTest.java
@@ -1,15 +1,15 @@
package at.tuwien.endpoint;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import at.tuwien.endpoints.DatabaseEndpoint;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.AccessService;
import at.tuwien.service.ContainerService;
import at.tuwien.service.CacheService;
import at.tuwien.service.DatabaseService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
index 92bead36748a83f0781917cd2129edb36f787097..90396d44e0ccf2bbce13822fec801f26264b0000 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
@@ -1,17 +1,17 @@
package at.tuwien.endpoint;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.query.QueryPersistDto;
-import at.tuwien.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryPersistDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.endpoints.SubsetEndpoint;
-import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.CacheService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.StorageService;
import at.tuwien.service.SubsetService;
-import at.tuwien.test.AbstractUnitTest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.log4j.Log4j2;
import org.apache.spark.sql.Dataset;
@@ -36,7 +36,7 @@ import java.util.List;
import java.util.UUID;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@Log4j2
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
index 591dba2e637ba92bfacba333c75c289142f68535..1bde5acb6818e3b6f2b70675551fe457be59c6ef 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
@@ -1,18 +1,18 @@
package at.tuwien.endpoint;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.internal.TableCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto;
import at.tuwien.endpoints.TableEndpoint;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.CacheService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.SubsetService;
import at.tuwien.service.TableService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.log4j.Log4j2;
import org.apache.spark.sql.Dataset;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
index 5ce2990700a30a18f454d65ccb904fe9f2cd8347..0abcea2588f1050393c19afe3d4b1f2ef5a96415 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/ViewEndpointUnitTest.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoint;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
import at.tuwien.endpoints.ViewEndpoint;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.CacheService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.SubsetService;
import at.tuwien.service.ViewService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.log4j.Log4j2;
import org.apache.spark.sql.Dataset;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
index b87793a8bcd00c499b74de68748c001750430584..7cf7103ce6a5b282c24273d1820caea16a689951 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/InterceptorUnitTest.java
@@ -1,12 +1,11 @@
package at.tuwien.gateway;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
index 1ea87d2fc15cf72497784e85cfccaf14f796ad17..54d7a5b557408a2a20d76d4e6d16703792fd2627 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
@@ -1,14 +1,14 @@
package at.tuwien.gateway;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
index 7dcb0343ac1c10f7e07af87405108cac8d6a6750..4f867e8d4bed9dfb99e7ae2d61f491afd4b67ab8 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
@@ -1,8 +1,8 @@
package at.tuwien.handlers;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -21,8 +21,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-import static at.tuwien.test.utils.EndpointUtils.getErrorCodes;
-import static at.tuwien.test.utils.EndpointUtils.getExceptions;
+import static at.ac.tuwien.ifs.dbrepo.test.utils.EndpointUtils.getErrorCodes;
+import static at.ac.tuwien.ifs.dbrepo.test.utils.EndpointUtils.getExceptions;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
index bf63189bf22e08a6c6c46df6623ef1a782345b98..280d2a6d6f497842557d6774580fb55161568f29 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java
@@ -2,12 +2,12 @@ package at.tuwien.listener;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.DatabaseNotFoundException;
-import at.tuwien.exception.MetadataServiceException;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.MetadataServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.RemoteUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import at.tuwien.service.CacheService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
index 686a134dc56f5c118a5e25b2cb0150eb05ac47fd..6beffa4759fe27453fd0a0c1329fdaf59e169be5 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java
@@ -2,12 +2,12 @@ package at.tuwien.listener;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.DatabaseNotFoundException;
-import at.tuwien.exception.MetadataServiceException;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.MetadataServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.RemoteUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import at.tuwien.service.CacheService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mapper/MariaDbMapperUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mapper/MariaDbMapperUnitTest.java
index 86303e4ec3e429676e8e795a8ab978b820dc89e1..37dc14f3ec07ee0a640abfec6d3a395fc908be95 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mapper/MariaDbMapperUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mapper/MariaDbMapperUnitTest.java
@@ -1,6 +1,6 @@
package at.tuwien.mapper;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
index a7a83a6184cab52aa4739df2005680a60eb7f81b..2781f51c829e52a2c3f7635cd9bdbf71f3d2d077 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
@@ -1,6 +1,6 @@
package at.tuwien.mvc;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
index b5ed475ea83a42db6f458d95254a081c5de5ae95..1d77947dcc3d831ff029c92fcc49e34f4aa4fe86 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
@@ -1,8 +1,8 @@
package at.tuwien.mvc;
-import at.tuwien.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
import at.tuwien.endpoints.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index de1c875e0aef96a54f283e31a8ef90d9e8468de0..f47d205cd7f4a34d799eced79e3b079a15f290e7 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -1,16 +1,16 @@
package at.tuwien.mvc;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.query.QueryPersistDto;
-import at.tuwien.api.database.table.TupleDeleteDto;
-import at.tuwien.api.database.table.TupleDto;
-import at.tuwien.api.database.table.TupleUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryPersistDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleDeleteDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleUpdateDto;
import at.tuwien.config.MetricsConfig;
import at.tuwien.endpoints.SubsetEndpoint;
import at.tuwien.endpoints.TableEndpoint;
import at.tuwien.endpoints.ViewEndpoint;
import at.tuwien.listener.DefaultListener;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import io.micrometer.observation.tck.TestObservationRegistry;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/SubsetEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/SubsetEndpointMvcTest.java
index f3f0cb9799660a3a9f2db1bb949cd2983c66d79f..158bed7ef021ffb2ef625e25ca354b440ff4baf2 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/SubsetEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/SubsetEndpointMvcTest.java
@@ -2,7 +2,7 @@ package at.tuwien.mvc;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.SubsetService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
index abcfd4a175b2cd62cc8fef73c4f9627bc2077d62..e1f0354d1bb63f7f6298dd3172fbc4e4a2518468 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.DatabaseMalformedException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
index ef4f8713c87058268bdf86c653248c425113a7b8..eddeef45e06ffcb47e0025fafff9d55ef5e196d4 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.DatabaseMalformedException;
-import at.tuwien.exception.QueryStoreCreateException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryStoreCreateException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/CredentialServiceUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/CredentialServiceUnitTest.java
index 95121ad704006cd814cf4962597e6382bc72b284..b1bdc7f6bc49197593441a572c841c820e3efcc0 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/CredentialServiceUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/CredentialServiceUnitTest.java
@@ -1,15 +1,15 @@
package at.tuwien.service;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.impl.CacheServiceImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index 40fdb982ab062bb502597e899ac04caec496b564..8726fa86a374fca669e9591a3d9f0a4223ba4384 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -1,25 +1,25 @@
package at.tuwien.service;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.*;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
-import at.tuwien.api.database.table.constraints.foreign.ReferenceTypeDto;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
-import at.tuwien.api.database.table.internal.TableCreateDto;
-import at.tuwien.api.identifier.IdentifierDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.ConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.CreateForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ReferenceTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
@@ -616,7 +616,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
@Test
public void createTable_malformed_fails() {
- final at.tuwien.api.database.table.internal.TableCreateDto request = TableCreateDto.builder()
+ final at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto request = TableCreateDto.builder()
.name("missing_foreign_key")
.columns(List.of())
.constraints(CreateTableConstraintsDto.builder()
@@ -637,7 +637,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
@Test
public void createTable_compositePrimaryKey_fails() throws TableNotFoundException, TableMalformedException, SQLException,
TableExistsException {
- final at.tuwien.api.database.table.internal.TableCreateDto request = TableCreateDto.builder()
+ final at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto request = TableCreateDto.builder()
.name("composite_primary_key")
.columns(List.of(CreateTableColumnDto.builder()
.name("name")
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index 6996ecb9f49821b329471c6dd91dca0b4fcc74d5..be89571cedcea7ae3c025ac6bc1d4c1cf5a29b8b 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -2,13 +2,13 @@ package at.tuwien.service;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.DatabaseNotFoundException;
-import at.tuwien.exception.MetadataServiceException;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.MetadataServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.RemoteUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.impl.QueueServiceRabbitMqImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
index 4344c9abb3342ca145723b6ebe8c000c147d8393..f3cfb9c8b970df2b3faf8f407d08e6080a23d7be 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
import at.tuwien.config.S3Config;
-import at.tuwien.exception.MalformedException;
-import at.tuwien.exception.StorageNotFoundException;
-import at.tuwien.exception.StorageUnavailableException;
-import at.tuwien.exception.TableMalformedException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.MalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableMalformedException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.FileUtils;
import org.apache.spark.sql.Dataset;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
index d05979af36b59882a76078bb424aa3e43230933f..222dec4e84fa827efbdc5241cbe8aae689337400 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.api.database.query.*;
-import at.tuwien.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.*;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index 03c0e95959f153806f95b281f8c79f1ac2d746eb..6172f89569a8298a1324081362b856b89c6234e8 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.ColumnStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnStatisticDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
import at.tuwien.config.S3Config;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import com.google.common.io.Files;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeAll;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index 5e99f4afbcf1c144ed3566d62a21dd0cd5f771e4..b21def212370b7a6f2df9f2b753bd8b2a0348b82 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -2,8 +2,8 @@ package at.tuwien.service;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.ViewMalformedException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.ViewMalformedException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/MariaDbUtilTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/MariaDbUtilTest.java
index 6ed73e8a01563a6b0b7e950afe5f9bf7c86cfbcf..dbcf11224be662263163f4774c747785638901a3 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/MariaDbUtilTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/utils/MariaDbUtilTest.java
@@ -1,6 +1,6 @@
package at.tuwien.utils;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
import org.junit.jupiter.api.Test;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.core.MessageProperties;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java
index d833d3fc1a04c1b5f4671859801aa6f070ed6d52..03df61b44774d67d2cf9fb589b5000d282f465dd 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/validation/EndpointValidatorUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.validation;
-import at.tuwien.exception.PaginationException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.PaginationException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
index 1e9d1c4bf0653758f4334f44d5c665610b7fc0fa..cdfd1d647e2ea4e2ad995b54f9b46095682eda5f 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
@@ -1,7 +1,7 @@
package at.tuwien.auth;
-import at.tuwien.api.auth.RealmAccessDto;
-import at.tuwien.api.user.UserDetailsDto;
+import at.ac.tuwien.ifs.dbrepo.api.auth.RealmAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDetailsDto;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier;
import com.auth0.jwt.algorithms.Algorithm;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
index e70dcdc8fa01d4f1fd46d94ffa7d7a569dde9b20..66089b00b42edac0e799b80dfc23eafc14935f87 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
@@ -1,6 +1,6 @@
package at.tuwien.auth;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.service.CredentialService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
index 5ba81ea4b37212eee6e370a8779618d0b8be8a3d..ae4eedc7c75f19203f39637c919741b7965b1f33 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
@@ -1,6 +1,6 @@
package at.tuwien.auth;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.config.GatewayConfig;
import at.tuwien.service.CredentialService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/CacheConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/CacheConfig.java
index 66d68ed3e2c95a4a30949294ff40e3459fa96182..757d4b7f6b773992f10fb3170cfba4692923a95d 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/CacheConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/CacheConfig.java
@@ -1,13 +1,13 @@
package at.tuwien.config;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import org.springframework.beans.factory.annotation.Value;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 21fbf674db6fbee0890528c2cb465eab53bba1c2..4c404b9d66119f1015760782057264eb76fdb1d5 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -1,10 +1,10 @@
package at.tuwien.gateway;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.AccountNotSetupException;
-import at.tuwien.exception.AuthServiceConnectionException;
-import at.tuwien.exception.CredentialsInvalidException;
-import at.tuwien.exception.NotAllowedException;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.exception.AccountNotSetupException;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.CredentialsInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.NotAllowedException;
import org.springframework.security.authentication.BadCredentialsException;
public interface KeycloakGateway {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
index 88906063b0bde122924514ab2994d9e4b9ea3398..ecb4f9b937db0888d1b8751a0f885a5137561d5f 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/MetadataServiceGateway.java
@@ -1,13 +1,13 @@
package at.tuwien.gateway;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import jakarta.validation.constraints.NotNull;
import java.util.List;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 1e14a4b4ceec8e3738f7796b4867fb1dd455ea8d..a44034ccedfb8a2a47dc8a73487db1f8fa6ffc23 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -1,6 +1,6 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.config.KeycloakConfig;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.mapper.MetadataMapper;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
index 34d1dfab5ef1aac49b8c0379ff96b159b135d36f..2922d00f058881043204699d16002ceba3d83eb7 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
@@ -1,14 +1,14 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.MetadataMapper;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java b/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
index 929ede0a8f3e7ee1467a2def289c836d9823f531..799a5d3c795e96b33daf00788059d86e5613b5ed 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/listener/DefaultListener.java
@@ -1,11 +1,11 @@
package at.tuwien.listener;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.exception.DatabaseNotFoundException;
-import at.tuwien.exception.MetadataServiceException;
-import at.tuwien.exception.RemoteUnavailableException;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.MetadataServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.RemoteUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import at.tuwien.service.CacheService;
import at.tuwien.service.QueueService;
import com.fasterxml.jackson.core.type.TypeReference;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
index 8ab19575028fe176dc070aaed8ce1dab3549879e..9088073b0cc33226d60697465aeee57b5e51478c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
@@ -1,20 +1,20 @@
package at.tuwien.mapper;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.*;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyBriefDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
-import at.tuwien.api.database.table.constraints.foreign.ReferenceTypeDto;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.ConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ReferenceTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import org.apache.hadoop.shaded.com.google.common.hash.Hashing;
import org.apache.hadoop.shaded.org.apache.commons.io.FileUtils;
import org.jetbrains.annotations.NotNull;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index a080dfb1636e40a9af41254f3a1bec8b02d708dc..2bb7eeb084e2bbc6ec82568cbe1c16f5196d845c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -1,22 +1,22 @@
package at.tuwien.mapper;
-import at.tuwien.api.container.image.OperatorDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.FilterDto;
-import at.tuwien.api.database.query.FilterTypeDto;
-import at.tuwien.api.database.query.OrderDto;
-import at.tuwien.api.database.query.SubsetDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TupleDeleteDto;
-import at.tuwien.api.database.table.TupleDto;
-import at.tuwien.api.database.table.TupleUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.exception.ImageNotFoundException;
-import at.tuwien.exception.QueryMalformedException;
-import at.tuwien.exception.TableMalformedException;
-import at.tuwien.exception.TableNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.OperatorDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.FilterDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.FilterTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.OrderDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleDeleteDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TupleUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableNotFoundException;
import at.tuwien.utils.MariaDbUtil;
import org.jooq.Record;
import org.jooq.*;
@@ -317,7 +317,7 @@ public interface MariaDbMapper {
}
default String tableCreateDtoToCreateTableRawQuery(String databaseName,
- at.tuwien.api.database.table.internal.TableCreateDto data) {
+ at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto data) {
final StringBuilder stringBuilder = new StringBuilder("CREATE TABLE `")
.append(databaseName)
.append("`.`")
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
index e4e82010127b90f6ff5dadcb01eed1a7a48ee161..68d83d97c39d768057a7f4409e849dec0d0be7ec 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -1,21 +1,21 @@
package at.tuwien.mapper;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.image.ImageDto;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewColumnDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.identifier.IdentifierDto;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import org.keycloak.representations.AccessTokenResponse;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/AccessService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/AccessService.java
index c42fc28101ba6498e2723f4b02acca6c6d6c2a1b..1abee15a64b30b0938a0103bb5a7cabd47c27032 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/AccessService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/AccessService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
import java.sql.SQLException;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/CacheService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/CacheService.java
index e91c7407e8ad91c50d3812576bd743aa82d56a20..5f5de380ba2d353e39f8a1c7ceb1fa90dd8d6b89 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/CacheService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/CacheService.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.sql.SQLException;
import java.util.UUID;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ContainerService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ContainerService.java
index 4f9e92ed7899149b518ef6018bade9818e1a4bc5..68f953ce9aa19b23592fc3917de4600110d6605a 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ContainerService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ContainerService.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.exception.DatabaseMalformedException;
-import at.tuwien.exception.QueryStoreCreateException;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryStoreCreateException;
import java.sql.SQLException;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/CredentialService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/CredentialService.java
index b1c28cf1701772eb16f3c79a8f155faf6e8261a9..469db41a023a922c12f6b8ad19846ab7837e8467 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/CredentialService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/CredentialService.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
public interface CredentialService {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/DatabaseService.java
index 8f07b6bfb29d527e99fc85504bf00c15b5424f89..31bfc1dbbe75a218c97828b4e1ddf3a22bd69ebd 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/DatabaseService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/DatabaseService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.internal.TableCreateDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.sql.SQLException;
import java.util.List;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
index 1e8ba52923af628991d2994236378bab2e991e56..bfbe27066f7b5fe86a4e9229e01e3c6426dbd854 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
import java.sql.SQLException;
import java.util.Map;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
index 7ba3f93e714135e402ef506793393d0703f5aaa4..062d008257f22ed239d9d89547cce943e36c02c4 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/StorageService.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.ExportResourceDto;
-import at.tuwien.exception.MalformedException;
-import at.tuwien.exception.StorageNotFoundException;
-import at.tuwien.exception.StorageUnavailableException;
-import at.tuwien.exception.TableMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.exception.MalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableMalformedException;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
index 30d4baca5c0c4f555206f866cf886a4439dac58e..9e15373ee30a18ca316afd838720d9fc40fb1e46 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/SubsetService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.query.SubsetDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
index ebeb68d462e7624faba3726af7b9beb299ae7fec..9d6e1b98fbdf610ce535edf492e088cd8cc09e88 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.sql.SQLException;
import java.time.Instant;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
index 7f64f72ebefeb7daa3811aedf5f41765e2ec28d6..d0a885c7e11fabe13738ecb1faea8b1c87b7b4fe 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.exception.QueryMalformedException;
-import at.tuwien.exception.ViewMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.ViewMalformedException;
import java.sql.SQLException;
import java.time.Instant;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/AccessServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/AccessServiceMariaDbImpl.java
index fb47a158f3098e49769613c369e6a85af341c755..d7b303499d69543134980e35170ff9858a180257 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/AccessServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/AccessServiceMariaDbImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.AccessService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CacheServiceImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CacheServiceImpl.java
index 018ccba14ad5398e596f1b149fa28e1b426f108f..67fd442e777ca0ba134c371d72bf245b3e414ec0 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CacheServiceImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CacheServiceImpl.java
@@ -1,13 +1,13 @@
package at.tuwien.service.impl;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.service.CacheService;
import at.tuwien.service.TableService;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
index 9e35574d8ddb1eb21b9fd566d009abceecf49043..1fff245fd49da997ad9675fe49d457e9449d4465 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceMariaDbImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.exception.DatabaseMalformedException;
-import at.tuwien.exception.QueryStoreCreateException;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryStoreCreateException;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.ContainerService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
index 9bcde3cf3264336e386b98561a3911c2533e0763..8e24497cb83e0fbd95539d23d3de3332c7a6f5a0 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
@@ -1,6 +1,6 @@
package at.tuwien.service.impl;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.service.CredentialService;
import com.github.benmanes.caffeine.cache.Cache;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DataConnector.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DataConnector.java
index 6e6e316b5af1b2e21cbc3f0d1ad1dc7e2232dca4..a29e471f0f8d90ca99c5f8f80e0ad6d0ba8991e0 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DataConnector.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DataConnector.java
@@ -1,7 +1,7 @@
package at.tuwien.service.impl;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
import com.mchange.v2.c3p0.ComboPooledDataSource;
import lombok.extern.log4j.Log4j2;
import org.springframework.stereotype.Service;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
index 64545fd5e7ddca378a76c91601c852560d109494..55dc137c96d16501fda84370f6ea3843b02d5396 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceMariaDbImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
-import at.tuwien.api.database.table.internal.TableCreateDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MetadataMapper;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
index 07b889d536c14719988c768b16998ab9fcc1b55c..80cf9937671bd9e201c24c644d4e6c1c1dfc9191 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
@@ -1,8 +1,8 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.QueueService;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
index 2d421ed0f309a01a3390ab08bd2c5eaebf8c4cdd..db3ff4fd2677a0013b16451bd2257802a0f3254b 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
import at.tuwien.config.S3Config;
-import at.tuwien.exception.MalformedException;
-import at.tuwien.exception.StorageNotFoundException;
-import at.tuwien.exception.StorageUnavailableException;
-import at.tuwien.exception.TableMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.MalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.TableMalformedException;
import at.tuwien.service.StorageService;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.RandomStringUtils;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
index 274654db63e333f4a99fd3bdf800bfac22754f76..8b3a486bff502fe5bf2b4eac1e44ff48804b60b5 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.query.SubsetDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
index 29c9ab1a644568eb0105c82368eea3c0662ef907..75dd74dfa7ac791ae4d56be65455bb124d1c5eaf 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.query.ImportDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.ColumnStatisticDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.ImportDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.DatabaseService;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
index c1ba33ae4ae91639ba14d715a569b4b596880625..652f1c6d6c910139faa0969f8d56a72deb22f098 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.exception.QueryMalformedException;
-import at.tuwien.exception.ViewMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.exception.QueryMalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.ViewMalformedException;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.service.ViewService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/utils/MariaDbUtil.java b/dbrepo-data-service/services/src/main/java/at/tuwien/utils/MariaDbUtil.java
index a917be6d46899c62e3e166ad0610950c9463bbca..1ec5b98968816e67d453d52b9ebff518e3207dd0 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/utils/MariaDbUtil.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/utils/MariaDbUtil.java
@@ -1,6 +1,6 @@
package at.tuwien.utils;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
import java.util.List;
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
deleted file mode 100644
index be32a6d638ad606891c2626111973bbbb0f171d5..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/api/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service</artifactId>
- <version>1.8.0</version>
- </parent>
-
- <artifactId>dbrepo-metadata-service-api</artifactId>
- <name>dbrepo-metadata-service-api</name>
- <version>1.8.0</version>
-
- <dependencies>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>1.8.0</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java
deleted file mode 100644
index f883a034f55bd5f04d3059f8eb50ef50a3867c79..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated;
-
-public enum OrcidDisambiguatedSourceTypeDto {
- RINGGOLD,
- ROR
-}
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
deleted file mode 100644
index 812bd232e521d4c922016f091fbe92c95824f06e..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/entities/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service</artifactId>
- <version>1.8.0</version>
- </parent>
-
- <artifactId>dbrepo-metadata-service-entities</artifactId>
- <name>dbrepo-metadata-service-entity</name>
- <version>1.8.0</version>
-
- <dependencies/>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- </annotationProcessorPaths>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
\ No newline at end of file
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index a83f372cf5cd8c5b2589baac7b7b29bf6239d5ed..7e140e4bd43eae6f94c98cdc5d73ed187e56002f 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -22,17 +22,14 @@
<packaging>pom</packaging>
<modules>
- <module>api</module>
- <module>entities</module>
<module>oai</module>
- <module>test</module>
<module>repositories</module>
<module>services</module>
<module>rest-service</module>
<module>report</module>
</modules>
- <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.7/</url>
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.8/</url>
<developers>
<developer>
<name>Martin Weise</name>
@@ -43,10 +40,8 @@
<properties>
<java.version>17</java.version>
- <spring-cloud.version>4.1.4</spring-cloud.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<rabbitmq.version>5.20.0</rabbitmq.version>
- <jackson-datatype.version>2.15.0</jackson-datatype.version>
<commons-io.version>2.17.0</commons-io.version>
<commons-validator.version>1.8.0</commons-validator.version>
<guava.version>33.0.0-jre</guava.version>
@@ -58,7 +53,6 @@
<opencsv.version>5.7.1</opencsv.version>
<super-csv.version>2.4.0</super-csv.version>
<keycloak.version>26.0.4</keycloak.version>
- <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
<testcontainers.version>1.19.1</testcontainers.version>
<jackson.version>2.15.2</jackson.version>
<keycloak-testcontainer.version>3.2.0</keycloak-testcontainer.version>
@@ -73,44 +67,9 @@
<dependencies>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bootstrap</artifactId>
- <version>${spring-cloud.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-thymeleaf</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-data-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <!-- Open API -->
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
- <version>${springdoc-openapi.version}</version>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
+ <version>1.8.0</version>
</dependency>
<!-- Data Source -->
<dependency>
@@ -150,12 +109,6 @@
<version>${micrometer.version}</version>
<scope>test</scope>
</dependency>
- <!-- IDE -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>compile</scope>
- </dependency>
<!-- Mapping -->
<dependency>
<groupId>org.mapstruct</groupId>
@@ -168,11 +121,6 @@
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson-datatype.version}</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -183,11 +131,6 @@
<artifactId>commons-validator</artifactId>
<version>${commons-validator.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-hibernate6</artifactId>
- <version>${jackson-datatype.version}</version>
- </dependency>
<!-- Authentication -->
<dependency>
<groupId>org.keycloak</groupId>
@@ -236,6 +179,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index 00094bdcb1c674f9bbc016e04ddcbc0d0f2984a0..f7759c5757e2ac744fed70977151b295c2251479 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-api</artifactId>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -24,11 +24,7 @@
<artifactId>dbrepo-metadata-service-oai</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>${project.version}</version>
- </dependency>
+
</dependencies>
<build>
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index 1a8cb5209c769dd798b9afe5a691a388fd371417..87dfb2765e3ff6e15cc9decd9389309051def43c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -1,78 +1,78 @@
package at.tuwien.mapper;
-import at.tuwien.api.container.ContainerBriefDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.api.container.image.DataTypeDto;
-import at.tuwien.api.container.image.ImageBriefDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.api.container.image.ImageDto;
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.api.database.*;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.columns.concepts.ConceptDto;
-import at.tuwien.api.database.table.columns.concepts.ConceptSaveDto;
-import at.tuwien.api.database.table.columns.concepts.UnitDto;
-import at.tuwien.api.database.table.columns.concepts.UnitSaveDto;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyBriefDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
-import at.tuwien.api.database.table.constraints.foreign.ReferenceTypeDto;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
-import at.tuwien.api.datacite.doi.*;
-import at.tuwien.api.grafana.CreateDashboardDto;
-import at.tuwien.api.grafana.PermissionTypeDto;
-import at.tuwien.api.identifier.*;
-import at.tuwien.api.identifier.ld.LdCreatorDto;
-import at.tuwien.api.identifier.ld.LdDatasetDto;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.keycloak.UserCreateDto;
-import at.tuwien.api.maintenance.BannerMessageBriefDto;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageDto;
-import at.tuwien.api.maintenance.BannerMessageTypeDto;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedSourceTypeDto;
-import at.tuwien.api.ror.RorDto;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.OntologyBriefDto;
-import at.tuwien.api.semantics.OntologyCreateDto;
-import at.tuwien.api.semantics.OntologyDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.api.user.external.ExternalMetadataDto;
-import at.tuwien.api.user.external.ExternalResultType;
-import at.tuwien.api.user.external.affiliation.ExternalAffiliationDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.entities.container.image.DataType;
-import at.tuwien.entities.database.*;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
-import at.tuwien.entities.database.table.constraints.Constraints;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKeyReference;
-import at.tuwien.entities.database.table.constraints.foreignKey.ReferenceType;
-import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
-import at.tuwien.entities.database.table.constraints.unique.Unique;
-import at.tuwien.entities.identifier.*;
-import at.tuwien.entities.maintenance.BannerMessage;
-import at.tuwien.entities.maintenance.BannerMessageType;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.DataTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageDto;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ConceptDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ConceptSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.UnitDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.UnitSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.ConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyReferenceDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ReferenceTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.*;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.PermissionTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.ld.LdCreatorDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.ld.LdDatasetDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.UserCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedSourceTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalMetadataDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalResultType;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.affiliation.ExternalAffiliationDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.DataType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.Constraints;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKeyReference;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ReferenceType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey.PrimaryKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique.Unique;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessageType;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import org.keycloak.representations.AccessTokenResponse;
import org.keycloak.representations.idm.UserRepresentation;
import org.mapstruct.*;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/SparqlMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/SparqlMapper.java
index dff867970fa59c9d0ddd5c0b7ed60750dd508e3b..a38ce9ce2dcfa53d5aa2ffc11b4a72c41db2b860 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/SparqlMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/SparqlMapper.java
@@ -1,6 +1,6 @@
package at.tuwien.mapper;
-import at.tuwien.entities.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
import org.mapstruct.Mapper;
import java.util.List;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/BannerMessageRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/BannerMessageRepository.java
index c12dc7b83f562ec1237dc7941db60700a78f1a59..692d367a1b99a638546b646405415c9f9d5ff44d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/BannerMessageRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/BannerMessageRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ConceptRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ConceptRepository.java
index 1e70cfdfb245c7de9cda405444c6bd43176cca14..bbbe6bb74385bffd3ce0ebfcf5729adf7e7e2459 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ConceptRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ConceptRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
index 536802cf4165e746dc8a27ed796c058ed86d44e5..3c19437149465669f0f339406b3a9681e1e2e72a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ContainerRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/DatabaseRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/DatabaseRepository.java
index d984cb333737851a03c9227e1a76b0643a8282b6..38415a7464850627e47edee9172118f6dc19be4f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/DatabaseRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/DatabaseRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
index 9e49f2aa1c5e530dfe60a65aa1e1b4a35fdb0e01..19143ee2227c262c3b43d5f3759d5b080502700b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/IdentifierRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
index 6282ed90405ba08a69cadb9a8ec0a7fd01f17888..137eb8f3987cb0df24e7827ac0dfbcebddb6d908 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/LicenseRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/LicenseRepository.java
index f180cdf901439d363a9a84b88a37efa2fa4db769..8630253d7328289cdb61d4cd464a1603d12290f8 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/LicenseRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/LicenseRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.License;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/OntologyRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/OntologyRepository.java
index 69b4e204be72c14d60f45ff9535fa89bc9de7629..9849fd819dd0d4f47b6d8c81a9e5e37feef40410 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/OntologyRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/OntologyRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/TableRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/TableRepository.java
index bc126eaa27660e84b9e71d5adea18859e1be4fe7..0ccacc8b9424e2f9ce3e3a46cdd04f677cf86079 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/TableRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/TableRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UnitRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UnitRepository.java
index 6676410730a1f562638e1bc32053b2b8a5fc5c2b..ebdea2bc03cea96415e9e72b682e978305d2611a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UnitRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UnitRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UserRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UserRepository.java
index 30f2f20c1670f550f7463265f1d2d6afde967777..c6790962857df0637b71eeb5e23813eb8b100f5e 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UserRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/UserRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ViewRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ViewRepository.java
index 50544822e50db796ca862be696640b8edf3c73a1..1efc118bf7942b5d0f3bfccc2864d9829a65d12f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ViewRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ViewRepository.java
@@ -1,6 +1,6 @@
package at.tuwien.repository;
-import at.tuwien.entities.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index e8bba2136eaf04f49b558aca12385f1c7b26ceec..ed5cacbdeb86b8a80b6ca3d12c5242fc9a98fd5c 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -15,13 +15,8 @@
<dependencies>
<dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-entities</artifactId>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -29,11 +24,6 @@
<artifactId>dbrepo-metadata-service-services</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-test</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
index e931ce75091c91fc5264347103d22f4134cd1a7b..21a98f9781d89b62072b8699a884b10a327c657c 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
@@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaAuditing
@EnableTransactionManagement
-@EntityScan(basePackages = {"at.tuwien.entities"})
+@EntityScan(basePackages = {"at.ac.tuwien.ifs.dbrepo.entity"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"})
@SpringBootApplication
public class DbrepoMetadataServiceApplication {
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierStatusTypeDtoConverter.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierStatusTypeDtoConverter.java
index 96e67f63d2bb85bb0aaebd02237a2d8aaa6ecdfa..26e36a9b7e93c2b599b06f5fcb3da1f6a239e476 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierStatusTypeDtoConverter.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierStatusTypeDtoConverter.java
@@ -1,6 +1,6 @@
package at.tuwien.converters;
-import at.tuwien.api.identifier.IdentifierStatusTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierStatusTypeDto;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierTypeDtoConverter.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierTypeDtoConverter.java
index 61e169604fa2cf1e10c464fdb1d1bc310ea7f125..dd8ff85cc720f2124be70ba6858da6978cfba540 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierTypeDtoConverter.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/converters/IdentifierTypeDtoConverter.java
@@ -1,6 +1,6 @@
package at.tuwien.converters;
-import at.tuwien.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
import org.springframework.core.convert.converter.Converter;
import org.springframework.stereotype.Component;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AbstractEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AbstractEndpoint.java
index 2121f6d1ad8baf702f842a0bd5b0077f1a96f75c..ddbc125a32becb3145c1888d7573b99d33f0b475 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AbstractEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AbstractEndpoint.java
@@ -1,11 +1,11 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.user.UserDetailsDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.View;
-import at.tuwien.exception.NotAllowedException;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDetailsDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.exception.NotAllowedException;
import lombok.extern.log4j.Log4j2;
import org.springframework.security.core.Authentication;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index 06bc73601c31fba782b3cfd8ccfb1669291c5b5d..e1f5b8cc1095972d44ced48e9b5a872c0ef976bf 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -1,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.CreateAccessDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.AccessService;
import at.tuwien.service.DashboardService;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
index acf6a31ca2a583a91ba9bf9e1e4e3c544342eb65..e9a26fca60cba01cb4ce2273a35f6b152ab5c197 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ConceptEndpoint.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.table.columns.concepts.ConceptDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.ConceptService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
index 266430372d0796408030364a8f61f9642c05e415..3a5dd5281d6ee19b6e8ab54b98226ab3c166f5bb 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ContainerEndpoint.java
@@ -1,13 +1,13 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.ContainerBriefDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.ContainerNotFoundException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.ContainerService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index 60ca31dcd9d40a43a2b8156be5426fc15b950686..4c14860c3b1a19be9e08fa0cd202ce5499389be1 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -1,12 +1,13 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.*;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyDashboardDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.*;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.*;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
index 96deaea775defd1562aba3601d9ba513b771f401..14629943d4ed40ea01f3d1530e2db558f3909b9e 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/IdentifierEndpoint.java
@@ -1,16 +1,16 @@
package at.tuwien.endpoints;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.identifier.*;
-import at.tuwien.api.identifier.ld.LdDatasetDto;
-import at.tuwien.api.user.external.ExternalMetadataDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.ld.LdDatasetDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalMetadataDto;
import at.tuwien.config.EndpointConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierStatusType;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierStatusType;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.*;
import at.tuwien.validation.EndpointValidator;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
index 62c00d1ee8d4ef5a395b22e77595859c44774c56..f72404e730d1464d58328c5521ef1f4d6a51946d 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ImageEndpoint.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.image.ImageBriefDto;
-import at.tuwien.api.container.image.ImageChangeDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.api.container.image.ImageDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ImageAlreadyExistsException;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageChangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.ImageService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
index 18d5e93ca26a824f1b445e39fb82213b0f7fe649..9e59eda922182162cb7d7c0d7f69e057c825c4df 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/LicenseEndpoint.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.LicenseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LicenseDto;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.LicenseService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
index 656279a86d680877849d9d2aa6fce327b6ba8ecb..e3fca284a170a45073a6ce3dddb49f67260e0440 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MessageEndpoint.java
@@ -1,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.maintenance.BannerMessageBriefDto;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.entities.maintenance.BannerMessage;
-import at.tuwien.exception.MessageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.exception.MessageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.BannerMessageService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
index 8a36471816ee9a4d2a89e3fee2edcde59f7361ae..acdb205598a1dd5f8eed401969ef393ca44d1c89 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/MetadataEndpoint.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.exception.IdentifierNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.IdentifierNotFoundException;
import at.tuwien.oaipmh.OaiErrorType;
import at.tuwien.oaipmh.OaiListIdentifiersParameters;
import at.tuwien.oaipmh.OaiRecordParameters;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
index c723568556ce097c600ece7b8aad9b57d3914b77..a1f6c3c169601c856c6b6023372b4ce4b8df2f87 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/OntologyEndpoint.java
@@ -1,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.semantics.*;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.exception.FilterBadRequestException;
-import at.tuwien.exception.MalformedException;
-import at.tuwien.exception.OntologyNotFoundException;
-import at.tuwien.exception.UriMalformedException;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.*;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.exception.FilterBadRequestException;
+import at.ac.tuwien.ifs.dbrepo.exception.MalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.OntologyNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.UriMalformedException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.EntityService;
import at.tuwien.service.OntologyService;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index 1d1b13d007bb4ffe26c1148bfdb7182136eeb936..7c9147fcb84e412b382cd4d2ea74cc00dd7b38f2 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -1,18 +1,18 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.TableColumnEntityDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.TableColumnEntityDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.*;
import at.tuwien.validation.EndpointValidator;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
index 45aef3645ba93cb1298c6da2e658656f645778ed..6793e9c97094e465a8b99a42b588e75eefa87dca 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UnitEndpoint.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.table.columns.concepts.UnitDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.UnitDto;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.UnitService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index 8f3e15529e962e279454e40b194217accb9e2d39..8d322830d13ebbdfe4c768150a6dfafaa66df6d8 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.NotAllowedException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.auth.CreateUserDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.NotAllowedException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.UserService;
import io.micrometer.observation.annotation.Observed;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index d3fcc8d54aa1fcdfb4d8e8a8f52c546aa1cf53ce..1b4d91b8926b339ccef1d3d7bb38543d11d2278a 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.ViewBriefDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.ViewUpdateDto;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.View;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.DashboardService;
import at.tuwien.service.DatabaseService;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index 50badc32d6cc70c99321a2545aedf6430185690d..82711a4b481093d082540ab8032683f0f9dd9099 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -1,7 +1,7 @@
package at.tuwien.handlers;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import com.auth0.jwt.exceptions.TokenExpiredException;
import io.swagger.v3.oas.annotations.Hidden;
import jakarta.ws.rs.NotAuthorizedException;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index 6fe29c118bd47683874cd4a92397c62317de3a83..5a9e59138c729d48b84111371f61ab4545d92e34 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -1,17 +1,17 @@
package at.tuwien.validation;
-import at.tuwien.SortType;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.identifier.IdentifierSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.SortType;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierSaveDto;
import at.tuwien.endpoints.AbstractEndpoint;
-import at.tuwien.entities.database.AccessType;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.AccessType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.AccessService;
import at.tuwien.service.UserService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java
index f8a83baf85c36852073f120f182f1819280dec67..059d4beeb66eadb4005e20eeed9900fa0e5739ff 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/RabbitConfig.java
@@ -1,6 +1,6 @@
package at.tuwien.config;
-import at.tuwien.test.BaseTest;
+import at.ac.tuwien.ifs.dbrepo.test.BaseTest;
import lombok.Getter;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Value;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierStatusTypeDtoConverterUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierStatusTypeDtoConverterUnitTest.java
index 8c7316b3d15590979652ea4a04498271f068d2fc..20ca4650a50c010ee0fab113ab919e61c94ade82 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierStatusTypeDtoConverterUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierStatusTypeDtoConverterUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.converters;
-import at.tuwien.api.identifier.IdentifierStatusTypeDto;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierStatusTypeDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeDtoConverterUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeDtoConverterUnitTest.java
index 98abd668d8ec0e30a0f420682a0c7b7fd3e5704d..72d14ea47bfe77987634e429347e65c520a3d098 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeDtoConverterUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/converters/IdentifierTypeDtoConverterUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.converters;
-import at.tuwien.api.identifier.IdentifierTypeDto;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AbstractEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AbstractEndpointUnitTest.java
index dfa4924957b9c300aeda92ad2ed305a4dd29b444..467e58d37517c990b4233217123eb339e6ce29e0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AbstractEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AbstractEndpointUnitTest.java
@@ -1,39 +1,19 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.user.UserDetailsDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
-import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.service.AccessService;
-import at.tuwien.service.DatabaseService;
-import at.tuwien.service.UserService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDetailsDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.test.context.support.WithAnonymousUser;
-import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
-import java.util.List;
-import java.util.UUID;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
@Log4j2
@SpringBootTest
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
index 610950c58ac1eab0a05e544841c43d4880279226..4097363081e14d6b7bc1de4d15e39d0933d46382 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
@@ -1,17 +1,17 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseAccessDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.AccessService;
import at.tuwien.service.DashboardService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.UserService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
index 78b7f086c300b546c808ed161abef2e3712e64c3..b1d0cfdfd105fd07fdefa05e4344beaecd93ff1d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
@@ -1,6 +1,6 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
index d48317f119cbbdf51087b16fc4c8df999bd519bb..2bc5f0f91b8806496cbda55148abb171ec9647e4 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.table.columns.concepts.ConceptDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.service.ConceptService;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
index 67078ee40971e42f91d04b764cc5bd0f4ac2d088..07cbc1c99e5390a49734d44bade7e8f7dd2e5d57 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ContainerEndpointUnitTest.java
@@ -1,14 +1,14 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.ContainerBriefDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.ContainerNotFoundException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.service.impl.ContainerServiceImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
index fb9761ecef4e6d59f996300da4e8edf05e5ec8ae..a3a6f983c792cecc80ee3cfd0110b7083a8f8fb6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
@@ -1,12 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.*;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.*;
import at.tuwien.service.impl.DatabaseServiceImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
index 59aca6a405cf0086fb1cc39e033d4865a33df082..6af9ca1ffe006bffc5b55833b611b7ef54cfc310 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
@@ -1,17 +1,17 @@
package at.tuwien.endpoints;
-import at.tuwien.api.identifier.*;
-import at.tuwien.api.identifier.ld.LdDatasetDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.ld.LdDatasetDto;
import at.tuwien.config.EndpointConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierType;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierType;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.service.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.io.FileUtils;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
index b5be98cfb6f8ce6fc0ed840c065dca5524b10502..a2f32fcf767baafaf92b64f278410de38184ed97 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
@@ -1,15 +1,15 @@
package at.tuwien.endpoints;
-import at.tuwien.api.container.image.ImageBriefDto;
-import at.tuwien.api.container.image.ImageChangeDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.api.container.image.ImageDto;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ImageAlreadyExistsException;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageChangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.service.impl.ImageServiceImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
index f45dd85fb4d13423451599e8ffc3cd046a8ebdca..066b215cd5c12b7d7acc9ae16aa78ace4ff67ae6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.LicenseDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.LicenseDto;
import at.tuwien.repository.LicenseRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
index 0fabc67c9175fdde835e8c14a8cbbabdc14d158f..023beb37d2d006c7f0ffd7fe5be6fa5a12bdb5b7 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
@@ -1,11 +1,11 @@
package at.tuwien.endpoints;
-import at.tuwien.exception.MessageNotFoundException;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.entities.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.exception.MessageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
import at.tuwien.service.BannerMessageService;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
index 98f756a1c0a0de2674ecca8732dd319411a95223..53959172734e6406f994fe1f1614bd0169cd4334 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
@@ -3,7 +3,7 @@ package at.tuwien.endpoints;
import at.tuwien.oaipmh.OaiListIdentifiersParameters;
import at.tuwien.oaipmh.OaiRecordParameters;
import at.tuwien.repository.IdentifierRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.XmlUtils;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
index ab3d0775ad1a694d9f33d822e65e37ae8772b032..1860fe90dc0d864b48c4b6f3ee58b332fc5c2abc 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
@@ -1,10 +1,10 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.semantics.*;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.*;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.EntityService;
import at.tuwien.service.OntologyService;
import at.tuwien.service.UserService;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
index 0180368e4080137ffcf2ecad9f97b3705cee601b..f60428786cab0432b10f1da2f3a9da12e46a351d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
@@ -1,24 +1,24 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.TableColumnEntityDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.TableColumnEntityDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.validation.EndpointValidator;
import lombok.extern.log4j.Log4j2;
import org.apache.jena.sys.JenaSystem;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
index 7d74e615be3a24dfd16af29c825774361f1a7ffc..b9d2e39a61e5ad429ad4f2b9bffc0c5355234839 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
@@ -1,7 +1,7 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.table.columns.concepts.UnitDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.UnitDto;
import at.tuwien.service.UnitService;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
index 5f0341fa7b53d828554d01f166acbc1c81241860..39cad67016a7ab0e225061216eaf8cc45623c31c 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
@@ -1,15 +1,15 @@
package at.tuwien.endpoints;
-import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.api.user.UserDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.NotAllowedException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.auth.CreateUserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.NotAllowedException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.service.UserService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
index 602baec7efdd90aacfa6dd23fa12b1ed3ed907f2..374b642b804edce75cc318c229e2577796636dc6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
@@ -1,16 +1,16 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.ViewBriefDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.ViewUpdateDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/entities/EntitiesUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/entities/EntitiesUnitTest.java
index 4fdb83bcd73535f5c0aae86cccdd29ab7b6361d5..0f3ddc336ce7617fdcc2654d96166dbbf11d4635 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/entities/EntitiesUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/entities/EntitiesUnitTest.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities;
+package at.ac.tuwien.ifs.dbrepo.entity;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
index 32a8c8b1907c816d4000e544b2ec0e9d7e8a01fc..16e8ba123caa7076470bee91ef1f6c1f98fe49fb 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.api.amqp.GrantExchangePermissionsDto;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantExchangePermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
index 881f29ed04b9559884fa26ace511a0627984c963..94ac4f62a79aed070d94a4b8408d4d65706e48a6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/CrossrefGatewayUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.exception.DoiNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DoiNotFoundException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DashboardServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DashboardServiceGatewayUnitTest.java
index affb7571c5a415bf9ebfd30282f74a3b2d96775c..55f42008b7a692dd161c465a1885338a2afda7f2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DashboardServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DashboardServiceGatewayUnitTest.java
@@ -1,10 +1,10 @@
package at.tuwien.gateway;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.api.grafana.PermissionTypeDto;
-import at.tuwien.exception.DashboardServiceConnectionException;
-import at.tuwien.exception.DashboardServiceException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.PermissionTypeDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,6 +21,7 @@ import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.RestTemplate;
+import static at.ac.tuwien.ifs.dbrepo.test.BaseTest.DATABASE_2_CREATE_DASHBOARD_DTO;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.*;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
index 6a8a1cba91a421c4321ba1986427dbfe75612491..8acb7530bf2fc06508c4860ac9e15b5ea06e8bff 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/DataServiceGatewayUnitTest.java
@@ -1,13 +1,13 @@
package at.tuwien.gateway;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
index f610ef0181cb80966538936fbbbcc10ec5d63af6..7fee23320eb34fb0e9e8d57902e5f03bae3bff1d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/KeycloakGatewayIntegrationTest.java
@@ -1,9 +1,9 @@
package at.tuwien.gateway;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.impl.KeycloakGatewayImpl;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.KeycloakUtils;
import dasniko.testcontainers.keycloak.KeycloakContainer;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
index bcd27107bc0189614b4086e0b333fa16cf16cb84..63d8d5e9363238aeff5c4b3b0b9bec364cf13a47 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/OrcidGatewayUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.exception.OrcidNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.exception.OrcidNotFoundException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
index ff9d4f741c18b2dfcd94dca91c344912fddd2167..259b132f489bbe93b4f73280dca2f9cef35d0379 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/RorGatewayUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.ror.RorDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
index b39dd06bac8cd722ccc6e464b1b97438f48b4850..63a9dc407a04ecefdb2d9927ff063988e983041a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/SearchServiceGatewayUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
index 383150adf98b74e7d3620bfe82b50cb1ee055802..c458f0ee19033b4899a0851b64e518e4f52a0e59 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/handlers/ApiExceptionHandlerTest.java
@@ -1,8 +1,8 @@
package at.tuwien.handlers;
-import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import com.auth0.jwt.exceptions.TokenExpiredException;
import jakarta.ws.rs.NotAuthorizedException;
import lombok.extern.log4j.Log4j2;
@@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-import static at.tuwien.test.utils.EndpointUtils.getErrorCodes;
-import static at.tuwien.test.utils.EndpointUtils.getExceptions;
+import static at.ac.tuwien.ifs.dbrepo.test.utils.EndpointUtils.getErrorCodes;
+import static at.ac.tuwien.ifs.dbrepo.test.utils.EndpointUtils.getExceptions;
import static org.junit.jupiter.api.Assertions.*;
@Log4j2
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
index ac1103d2e5ad0a4c9a12b781c575ddff9aa39bcf..768a06c6dc78b691c399c6a47f560334cfcd5435 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
@@ -1,12 +1,12 @@
package at.tuwien.mapper;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
-import at.tuwien.api.user.UserBriefDto;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierType;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierType;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
index a7a83a6184cab52aa4739df2005680a60eb7f81b..2781f51c829e52a2c3f7635cd9bdbf71f3d2d077 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/ActuatorEndpointMvcTest.java
@@ -1,6 +1,6 @@
package at.tuwien.mvc;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
index a51482e7989e7764c85bbcd05893218b0fd55bf0..b83232cd0df67e1bbc3424316944c64c0d56d50a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
@@ -1,15 +1,15 @@
package at.tuwien.mvc;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.AuthServiceConnectionException;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.CredentialsInvalidException;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.CredentialsInvalidException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.KeycloakUtils;
import dasniko.testcontainers.keycloak.KeycloakContainer;
import jakarta.transaction.Transactional;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/IdentifierEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/IdentifierEndpointMvcTest.java
index 2594eb70b1240d7ba39c866e2ee8c900cf191ea7..fdbedbea6c1a626661d52502ec0b1e2b0a3a77b6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/IdentifierEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/IdentifierEndpointMvcTest.java
@@ -1,6 +1,6 @@
package at.tuwien.mvc;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.gateway.OrcidGateway;
import com.mchange.io.FileUtils;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
index 7f9ba9743d24f1d888f2a488bd8330755478d1e9..25dae0b211dffb30d65c3ccf8d21e769bdfac3ea 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/MetadataEndpointMvcTest.java
@@ -1,7 +1,7 @@
package at.tuwien.mvc;
import at.tuwien.repository.IdentifierRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.config.MetadataConfig;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
index d685ca65cd0478aa06ec8c9a2aa7bcfdcc61a804..e990c8b84d7180aa51720771eb97125127b24a82 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/OpenApiEndpointMvcTest.java
@@ -1,8 +1,8 @@
package at.tuwien.mvc;
-import at.tuwien.api.error.ApiErrorDto;
+import at.ac.tuwien.ifs.dbrepo.api.error.ApiErrorDto;
import at.tuwien.endpoints.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index 2adc2f0647150f47605cb4b0d70566c041cd81f7..d9f09c4b2e68f1b19c360f27e0f2d0ae1fcf6c87 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -1,14 +1,14 @@
package at.tuwien.mvc;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.api.database.DatabaseModifyImageDto;
-import at.tuwien.api.database.DatabaseModifyVisibilityDto;
-import at.tuwien.api.database.DatabaseTransferDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyImageDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyVisibilityDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseTransferDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
import at.tuwien.config.MetricsConfig;
import at.tuwien.endpoints.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import io.micrometer.observation.tck.TestObservationRegistry;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
index 1c96e6283d3d62bc5c31652f82a73312454e2035..e9e8092b3e47c3e3802a9bbc993e4e68eb66e16d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.entities.database.AccessType;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.AccessType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
import at.tuwien.repository.DatabaseRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
index 019776b3f2150502f56b8fac7a2c5317ecb0e705..6ab6c1fb2bb65815a90954b2cd1f404725e69259 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.KeycloakGateway;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.KeycloakUtils;
import dasniko.testcontainers.keycloak.KeycloakContainer;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
index d04409c87b095cfcdc41a478df87a733cdf1bb82..edd641f67b57353b8634fe6b248ecd6d3fd3bffd 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
@@ -1,15 +1,15 @@
package at.tuwien.service;
-import at.tuwien.api.amqp.GrantExchangePermissionsDto;
-import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
-import at.tuwien.api.amqp.TopicPermissionDto;
-import at.tuwien.api.amqp.VirtualHostPermissionDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantExchangePermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantVirtualHostPermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.TopicPermissionDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.VirtualHostPermissionDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.BrokerServiceConnectionException;
-import at.tuwien.exception.BrokerServiceException;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.BrokerServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.BrokerServiceException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.AmqpUtils;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
index 164f335eb73f68c986583da9881b743a32c44a06..fb23ae65791940b1217874712a3dac26d46468c0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ConceptServiceUnitTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.exception.ConceptNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ConceptNotFoundException;
import at.tuwien.repository.ConceptRepository;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
index a6fbbf759269d7f6b9331dc829ad2b83197be1ad..0d5e660cb15e43ebbbb2cf28957dada6896ab283 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceUnitTest.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.ContainerNotFoundException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.ImageRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
index 137f654b764bf5e2b50d7f07feb1cb76f0a7c866..f0dfe23ea35ef10abec5e43cd29c64b8fd592b04 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
@@ -1,20 +1,20 @@
package at.tuwien.service;
-import at.tuwien.api.datacite.DataCiteBody;
-import at.tuwien.api.datacite.doi.DataCiteDoi;
-import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.identifier.Creator;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierStatusType;
-import at.tuwien.entities.identifier.NameIdentifierSchemeType;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.DataCiteBody;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.DataCiteDoi;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.BibliographyTypeDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Creator;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierStatusType;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.NameIdentifierSchemeType;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
index db1f54faef1cbb37a0436d55ac11b6b239fe0b51..7055834b5221128bc21983dcd512dd39b13305d3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.Database;
-import at.tuwien.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 592cd0d6d6a1583e977941e1a6cd45994d426578..33be047995294a4104d1833fa6e96fc1533baa44 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -1,16 +1,16 @@
package at.tuwien.service;
-import at.tuwien.api.database.DatabaseModifyVisibilityDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyVisibilityDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.DatabaseRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java
index afe3b6e2b8b9c5e93c1afebed2eabb4a6fc9daa0..d2555c6703d5340c9f170e21b83d8d53cb9d8bce 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.TableColumnEntityDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.TableColumnEntityDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
index b5d5278219f33931a75cdbb52167b12a64be8d91..68a50698cac8e55addcf4310b23e7ef2763398de 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
@@ -1,19 +1,19 @@
package at.tuwien.service;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.License;
-import at.tuwien.entities.identifier.*;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.BibliographyTypeDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
index fb501cb28179e895dfcf4340afb7dc0cfee547fb..f23a7c96d04cf26c7e3f661350756f5c92ee37ca 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.ImageRepository;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
index dc77ff263b37406845afb93e80a5afc27f59f380..12737718aaf25a3cdebdba2a4ac94155f711d98a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.exception.ImageNotFoundException;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.container.image.ImageChangeDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageChangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
import at.tuwien.repository.ImageRepository;
import at.tuwien.service.impl.ImageServiceImpl;
import jakarta.validation.ConstraintViolationException;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceUnitTest.java
index a73ce8df2497dbdcedffa589f08f73ad2e174397..88935be4216a29c9397146756ac8bd37d986d2b5 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceUnitTest.java
@@ -1,8 +1,8 @@
package at.tuwien.service;
-import at.tuwien.exception.LicenseNotFoundException;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.entities.database.License;
+import at.ac.tuwien.ifs.dbrepo.exception.LicenseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
import at.tuwien.repository.LicenseRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageServiceUnitTest.java
index fb7806f454684e10e8dd819018a03283b90fb418..68b569962bbe802ca4c98e4d21b11f259117a568 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageServiceUnitTest.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.exception.MessageNotFoundException;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.entities.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.exception.MessageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
import at.tuwien.repository.BannerMessageRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
index 2f4fd3a85aaca28de490b2953acde20804fb70cd..32d45fc41a971fb8617e5febc35bdd4c8f408c89 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
@@ -1,18 +1,18 @@
package at.tuwien.service;
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.api.ror.RorDto;
-import at.tuwien.api.user.external.ExternalMetadataDto;
-import at.tuwien.api.user.external.affiliation.ExternalAffiliationDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalMetadataDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.affiliation.ExternalAffiliationDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.CrossrefGateway;
import at.tuwien.gateway.OrcidGateway;
import at.tuwien.gateway.RorGateway;
import at.tuwien.oaipmh.OaiErrorType;
import at.tuwien.oaipmh.OaiListIdentifiersParameters;
import at.tuwien.oaipmh.OaiRecordParameters;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
index 5ef5f9742bbfdcc8c5ab21360ca926fd61261244..608ae03fc9fb6fc4abcc92f962d7c53e7ca344b3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StorageServiceIntegrationTest.java
@@ -1,8 +1,8 @@
package at.tuwien.service;
import at.tuwien.config.S3Config;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
index 459c3b6dbe9b96077c1c48d8aadd5955a03b1303..41e131da8bff3bc4f16461afad368c5394045a27 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
@@ -1,24 +1,24 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.columns.TableColumnType;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
-import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
-import at.tuwien.entities.database.table.constraints.unique.Unique;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey.PrimaryKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique.Unique;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index af866d5614b889a9be8a914b878276da380736f4..0748065d07fbd16a057284078e919255894380f0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -1,26 +1,26 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnStatisticDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.ColumnEnum;
-import at.tuwien.entities.database.table.columns.ColumnSet;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.columns.TableColumnType;
-import at.tuwien.entities.database.table.constraints.Constraints;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.CreateForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.ColumnEnum;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.ColumnSet;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.Constraints;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.DatabaseRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
index 67b396c66015ca66f392fbd424c0c94daa717a69..d76b26f9049875524badb7d64bc52f1a2e5fa579 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UnitServiceUnitTest.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
import at.tuwien.repository.UnitRepository;
-import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
-import at.tuwien.exception.UnitNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.exception.UnitNotFoundException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index 897ec6b82a42cbadc2c34c5e015d58ecfa6ebbba..0d498c989ccbd75383f9c7fc8bb018158e01ab19 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.utils.KeycloakUtils;
import dasniko.testcontainers.keycloak.KeycloakContainer;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
index c224fa9a856e41e6c327fe6d05334fc953c91cea..8a0f771fd319016574bff232875fe79e525f8aed 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServicePersistenceTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index c610f3ee95d6d8e78cc11a4b6ac826b5a296c80b..31977d53e4f533f3bf5b1627b3d28d4f2a39ae6f 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index 57a84965dc81615613f201e6aee4e771582ac090..1980117bf1bf48b1c7b300386dcbaf4388d4000d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -1,16 +1,16 @@
package at.tuwien.service;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.database.ViewColumn;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.database.ViewColumn;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.repository.UserRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
index e94a9bdb9b3ae0dbd0bfd02ea3dba31c2c6a4f3a..4a3225e595de9f20d30690b6f7286073e50ab68e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceUnitTest.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.View;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.DatabaseRepository;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
index df86598714d65600e0dc79b5f6a3048fb3df16b5..5a9430da8f170809055e8831d19f3e97660b8970 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/AmqpUtils.java
@@ -1,7 +1,7 @@
package at.tuwien.utils;
-import at.tuwien.api.amqp.*;
-import at.tuwien.test.BaseTest;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.*;
+import at.ac.tuwien.ifs.dbrepo.test.BaseTest;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
index 100178a337fc142d9694c1ad5813d71b34c6423e..5bad3fa03a21a52e3291d028ad3ab72375852a67 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/utils/KeycloakUtils.java
@@ -1,8 +1,8 @@
package at.tuwien.utils;
-import at.tuwien.api.keycloak.UserCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.UserCreateDto;
import at.tuwien.config.KeycloakConfig;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import jakarta.ws.rs.core.Response;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
index 1e7ce07afde0616c8915549cfa3e1bcc72bcb658..d55f12aafe7abee5027de20fae975e2c5c212a1e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
@@ -1,17 +1,17 @@
package at.tuwien.validator;
-import at.tuwien.SortType;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.identifier.IdentifierSaveDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.SortType;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierSaveDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.service.AccessService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.TableService;
-import at.tuwien.test.AbstractUnitTest;
+import at.ac.tuwien.ifs.dbrepo.test.AbstractUnitTest;
import at.tuwien.validation.EndpointValidator;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index 5ba1a94840940b52665734f5fffec4d08633426f..12d34b7e8f86b527853cee5cfad50ad98b6a9113 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-api</artifactId>
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -24,11 +24,6 @@
<artifactId>dbrepo-metadata-service-oai</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>at.tuwien</groupId>
- <artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
index e3caa8ac4c3798561a47f9f93be687fd0c7738cd..21afd981dd47c7f9850b41b7c778535ae608e6c3 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java
@@ -1,7 +1,7 @@
package at.tuwien.auth;
-import at.tuwien.api.auth.RealmAccessDto;
-import at.tuwien.api.user.UserDetailsDto;
+import at.ac.tuwien.ifs.dbrepo.api.auth.RealmAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDetailsDto;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTVerifier;
import com.auth0.jwt.algorithms.Algorithm;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
index e70dcdc8fa01d4f1fd46d94ffa7d7a569dde9b20..66089b00b42edac0e799b80dfc23eafc14935f87 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java
@@ -1,6 +1,6 @@
package at.tuwien.auth;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.service.CredentialService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
index 6d7480ba8034a9108492ab0816005f4a92f8046c..0e1e06d9e1e3498dbb5eab742e671c4d5015dace 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java
@@ -1,6 +1,6 @@
package at.tuwien.auth;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.config.GatewayConfig;
import at.tuwien.service.CredentialService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/CacheConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/CacheConfig.java
index 9229927e83c19a8b73ca66f100a38091289750fb..1ddee07ee2eb6097519f4e87127e455f36c7463a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/CacheConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/CacheConfig.java
@@ -1,6 +1,6 @@
package at.tuwien.config;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import org.springframework.beans.factory.annotation.Value;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
index b86a97a4dc66bf4e265dc82438d1083bed3c4ebd..f955451abec1bc0eb3196cad2ed7a5b2cc4d3722 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
@@ -1,6 +1,6 @@
package at.tuwien.config;
-import at.tuwien.entities.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.IdentifierRepository;
import at.tuwien.repository.TableRepository;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
index 42e8912d0c1c716309ead8d8ddfc3829f3206709..973864164e950618b6f9893f879daa81a8c91023 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.api.amqp.*;
-import at.tuwien.api.user.ExchangeUpdatePermissionsDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.*;
+import at.ac.tuwien.ifs.dbrepo.api.user.ExchangeUpdatePermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
public interface BrokerServiceGateway {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/CrossrefGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/CrossrefGateway.java
index 58e023ac9d32c3e1820969b1c73478a4d141de9d..359de85f70569a12e38b5f1d215e4cf39b0974d5 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/CrossrefGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/CrossrefGateway.java
@@ -1,7 +1,7 @@
package at.tuwien.gateway;
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.exception.DoiNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DoiNotFoundException;
public interface CrossrefGateway {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DashboardServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DashboardServiceGateway.java
index a46ffea3204de6306644199b3af35681a6db037b..768bd8066b75e787f4ec54a4ecb6340d51f79c6e 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DashboardServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DashboardServiceGateway.java
@@ -1,12 +1,12 @@
package at.tuwien.gateway;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.grafana.CreateDashboardDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.api.grafana.PermissionTypeDto;
-import at.tuwien.exception.DashboardServiceConnectionException;
-import at.tuwien.exception.DashboardServiceException;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.PermissionTypeDto;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceException;
public interface DashboardServiceGateway {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
index 03e093606824341bb7e2bc3896e4100d60cb4c09..8e43c5e7eb88f677db8c5f1040d23a049d293065 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/DataServiceGateway.java
@@ -1,17 +1,17 @@
package at.tuwien.gateway;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.util.List;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 9436db80cb4ccde9c03cccc64482b9279b1d6d81..738af7a3835d4c171bd510862b894c3aefcf6434 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -1,9 +1,9 @@
package at.tuwien.gateway;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import org.keycloak.representations.idm.UserRepresentation;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
index 2cd5f142e6638f087265d6f605aa271fd518c51b..3bca2250e24f3ae3c88f0876d599e10b34fe8513 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/OrcidGateway.java
@@ -1,7 +1,7 @@
package at.tuwien.gateway;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.exception.OrcidNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.exception.OrcidNotFoundException;
import org.springframework.stereotype.Service;
@Service
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/RorGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/RorGateway.java
index 27603b99191708e22970c7452fc6a44337809128..b4208eb48339f68f4f01ba551163c0c3f4443d72 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/RorGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/RorGateway.java
@@ -1,7 +1,7 @@
package at.tuwien.gateway;
-import at.tuwien.api.ror.RorDto;
-import at.tuwien.exception.RorNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.exception.RorNotFoundException;
public interface RorGateway {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/SearchServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/SearchServiceGateway.java
index 1b3b20485f22d1f11ef92c6bc1698271923e9f0f..2742e3e0e574a6e848ccdbbcdf60bedd5b391dc8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/SearchServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/SearchServiceGateway.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
index da1c28918576b0a0bf606b23c15e5d0a02a63820..d99a0e015c988a35baa66ab460331bd960a9d33f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.amqp.*;
-import at.tuwien.api.user.ExchangeUpdatePermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.*;
+import at.ac.tuwien.ifs.dbrepo.api.user.ExchangeUpdatePermissionsDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
index 8fd957f330a947793f9bfc4e4fcbb08616bbf90f..099c63efbabb533a2f5854d65d6c35e59bcc58d7 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/CrossrefGatewayImpl.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.DoiNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.DoiNotFoundException;
import at.tuwien.gateway.CrossrefGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DashboardServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DashboardServiceGatewayImpl.java
index 489c7a94ac007aff0d22248a5353ff86d81d6ee4..6be2b761ed159be992a65f5721763483f387a489 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DashboardServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DashboardServiceGatewayImpl.java
@@ -1,14 +1,14 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.grafana.CreateDashboardDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.api.grafana.PermissionTypeDto;
-import at.tuwien.api.grafana.UpdateDashboardAccessDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.PermissionTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.UpdateDashboardAccessDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.DashboardServiceConnectionException;
-import at.tuwien.exception.DashboardServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceException;
import at.tuwien.gateway.DashboardServiceGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
index 47003fafce22e007fe704f44de16c62b76544de1..d6846ff2b675f7dbb34ea0fa558b9c588ecd53a5 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
@@ -1,15 +1,15 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.database.*;
-import at.tuwien.api.database.internal.CreateDatabaseDto;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 4eb96aeee5b025b996d2bbbaf783a625f25372e2..d443015141653c8d94123ca819f47fd9156bc98e 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -1,10 +1,10 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
import at.tuwien.config.KeycloakConfig;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.mapper.MetadataMapper;
import jakarta.ws.rs.ForbiddenException;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
index 7634e421fe2cda96ebaaa13d029282d682c5d240..fe3e475a690dd12b2f15251fbc3b4c78a299b75c 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/OrcidGatewayImpl.java
@@ -1,7 +1,7 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.exception.OrcidNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.exception.OrcidNotFoundException;
import at.tuwien.gateway.OrcidGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
index 37ed982f9e4489431e9e86b7fb5c5ec61fed57ec..d2ad4523e1479b7680cc68b1324594a979944d3f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/RorGatewayImpl.java
@@ -1,8 +1,8 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.RorNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.RorNotFoundException;
import at.tuwien.gateway.RorGateway;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
index 67c4762a2f5224e2b92c5ef042ed6fd225ff7baa..13517aa073ce86600f46f92679891190e0de6b6f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/SearchServiceGatewayImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.gateway.impl;
-import at.tuwien.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.exception.DatabaseNotFoundException;
-import at.tuwien.exception.SearchServiceConnectionException;
-import at.tuwien.exception.SearchServiceException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.exception.DatabaseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.SearchServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.SearchServiceException;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
index d521014ca0e9b9cdd565b7e419155e5ea7842079..559d1ff1714107bbec283f898e8af9e61ab1c4ca 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AccessService.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.security.Principal;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
index db18fbc5adfad210b04daa7cff08b9889db84c4c..0c168383a77bcde1bcf1076b0ca863828febd251 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
@@ -1,8 +1,8 @@
package at.tuwien.service;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
public interface AuthenticationService {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BannerMessageService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BannerMessageService.java
index a7973b6171d8cf941a0cc24b264b69f76255628e..e4d008d8e74c1bf40aefac51bd70cdfa8dbfd7c0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BannerMessageService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BannerMessageService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.entities.maintenance.BannerMessage;
-import at.tuwien.exception.MessageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.exception.MessageNotFoundException;
import java.util.List;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
index a21e1cf30f19f169cb501f80a6188122684c835c..603f4e8816993bbce6747df1ce84210198e48b00 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/BrokerService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
public interface BrokerService {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ConceptService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ConceptService.java
index 94fa1e0c890637d62e3faa20382c0fb668d8904a..8b7287d5789d981d2a89ca19dc2dbbcc098e79b0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ConceptService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ConceptService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.exception.ConceptNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.exception.ConceptNotFoundException;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ContainerService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ContainerService.java
index 92fc9dabe184a109746bb6cb95272c017a9443f2..b91d13550219cfb52dda9c29cdf30b8e53ac85b4 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ContainerService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ContainerService.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.ContainerNotFoundException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import java.util.List;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/CredentialService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/CredentialService.java
index b1c28cf1701772eb16f3c79a8f155faf6e8261a9..469db41a023a922c12f6b8ad19846ab7837e8467 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/CredentialService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/CredentialService.java
@@ -1,6 +1,6 @@
package at.tuwien.service;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
public interface CredentialService {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DashboardService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DashboardService.java
index 1603f9adc324dd8fa8f0ce80cd380e1b0533cb83..c2ca00ed419d6e474ae2808934c5ec44ae429a30 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DashboardService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DashboardService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.DashboardServiceConnectionException;
-import at.tuwien.exception.DashboardServiceException;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceException;
public interface DashboardService {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
index d2994ec1a6108f773f5d2dab79a942e4869c3cd7..34dad941b9b9c8157b01388adc8a9834894beb26 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/DatabaseService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.CreateDatabaseDto;
-import at.tuwien.api.database.DatabaseModifyVisibilityDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyVisibilityDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/EntityService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/EntityService.java
index d52bbe9b12436881c102e1478f5ae7fec86f91d8..76aa0dabf972bb71005cc7f1d370af163d7214e8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/EntityService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/EntityService.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.TableColumnEntityDto;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.exception.MalformedException;
-import at.tuwien.exception.OntologyNotFoundException;
-import at.tuwien.exception.SemanticEntityNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.TableColumnEntityDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.exception.MalformedException;
+import at.ac.tuwien.ifs.dbrepo.exception.OntologyNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.SemanticEntityNotFoundException;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
index 666d80e734109239ad47c6263830ab8dfe7b724b..bfd541fe7fc284a8322cd161d2a4c8580eaec791 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/IdentifierService.java
@@ -1,13 +1,13 @@
package at.tuwien.service;
-import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.CreateIdentifierDto;
-import at.tuwien.api.identifier.IdentifierSaveDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.BibliographyTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.CreateIdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import org.springframework.core.io.InputStreamResource;
import org.springframework.stereotype.Service;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
index 5edda64d084da291b8baa421813514849941e8f0..c732695ac7659c51dffffc0bb48de311ba87824b 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.container.image.ImageChangeDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ImageAlreadyExistsException;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageChangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import java.security.Principal;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/LicenseService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/LicenseService.java
index 4bea3499465405333a26551591bdfe508da1ff7e..72a8aa0ee018ed67dbf1e7aa50ad118b9b19e02f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/LicenseService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/LicenseService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.entities.database.License;
-import at.tuwien.exception.LicenseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
+import at.ac.tuwien.ifs.dbrepo.exception.LicenseNotFoundException;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MetadataService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MetadataService.java
index 7118422a866f00a2dd648f6e8cc506293f25f876..656266fdbd9cc4c3ae6b231803df4b97a4986a50 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MetadataService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MetadataService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.api.user.external.ExternalMetadataDto;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalMetadataDto;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.oaipmh.OaiErrorType;
import at.tuwien.oaipmh.OaiListIdentifiersParameters;
import at.tuwien.oaipmh.OaiRecordParameters;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/OntologyService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/OntologyService.java
index 5a94238a80948817653d326253dae053d302c42a..8ddda5091ab5207992468e8cdb3902828750fda7 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/OntologyService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/OntologyService.java
@@ -1,9 +1,9 @@
package at.tuwien.service;
-import at.tuwien.api.semantics.OntologyCreateDto;
-import at.tuwien.api.semantics.OntologyModifyDto;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.exception.OntologyNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyModifyDto;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.exception.OntologyNotFoundException;
import java.security.Principal;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
index 630697cee71f6030e97ec854591f2f4cc2151287..0d7998418e902e99ea8fcb7e8a761a356fc0b0b2 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/StorageService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.exception.StorageNotFoundException;
-import at.tuwien.exception.StorageUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageUnavailableException;
import java.io.InputStream;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
index 3bb957b525fb31ba0a06251f64d6f09d026cf9b4..ce0cd81e12f1344706b0e0fbb5f3b341c8143624 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.security.Principal;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UnitService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UnitService.java
index 85c6da6c5e27c4f76bdb7c2cd2b2164862985e1a..696148e5819db720c5c5c16911e488eb6247e6d6 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UnitService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UnitService.java
@@ -1,7 +1,7 @@
package at.tuwien.service;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
-import at.tuwien.exception.UnitNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.exception.UnitNotFoundException;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
index 9ddd8086cc8494e64d7651e54215f865f267a6eb..6d2eb63afb64e45bcebde66f56d4b742351a37e0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
@@ -1,10 +1,10 @@
package at.tuwien.service;
-import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.auth.CreateUserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import java.util.List;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
index 081022e6cd87ce374f6cb1803a1365761da54d12..d88d0d84a38725cd7b75ea4b8af5da11d4df93f4 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.ViewUpdateDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
index e5b59ebda8accad54421a1ed9834c7114b9ab911..01cac24ee0d7a4bd5e6728268cf5b290d338dccd 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
@@ -1,10 +1,10 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.DatabaseAccess;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
index e6bb056bfe31f23563acad6fe801021a830f9528..5db94a2f1a87344d47ff72b519670beb492b9ced 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
@@ -1,8 +1,8 @@
package at.tuwien.service.impl;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.service.AuthenticationService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BannerMessageServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BannerMessageServiceImpl.java
index d75d384b3c293e68d00eba2da092ae85214617d5..15c56da40b37c71cf5dad69b0dbd80fef2580f72 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BannerMessageServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BannerMessageServiceImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.entities.maintenance.BannerMessage;
-import at.tuwien.exception.MessageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.exception.MessageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.BannerMessageRepository;
import at.tuwien.service.BannerMessageService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
index 2800c96bc9d376e14cb990edb4d8fe5f9cc5d3a3..c0b3eb361c1597d326966d9ba3a2eb97f84cd4fb 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/BrokerServiceRabbitMqImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.api.amqp.GrantExchangePermissionsDto;
-import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantExchangePermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.entities.database.AccessType;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.AccessType;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.service.BrokerService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ConceptServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ConceptServiceImpl.java
index 647d4fe198abc4b4ab4caf3836ab552bb521ce2c..e49eb155fcb6004c1f8646e0e904552b9066849f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ConceptServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ConceptServiceImpl.java
@@ -1,7 +1,7 @@
package at.tuwien.service.impl;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.exception.ConceptNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.exception.ConceptNotFoundException;
import at.tuwien.repository.ConceptRepository;
import at.tuwien.service.ConceptService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
index d92b6c17dc052728af0eb2e861baecdcda150995..c555f8213abfe3a1d010c5275e9e9f99f63c26de 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ContainerServiceImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.api.container.CreateContainerDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ContainerAlreadyExistsException;
-import at.tuwien.exception.ContainerNotFoundException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.CreateContainerDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ContainerNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.ImageRepository;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
index 7cf7d1eff4394ae174b0e724fa8e34455b363578..fd43aee8dbc0faaa7d040dce6bbc5b4f447de0bd 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/CredentialServiceImpl.java
@@ -1,6 +1,6 @@
package at.tuwien.service.impl;
-import at.tuwien.api.keycloak.TokenDto;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.TokenDto;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.service.CredentialService;
import com.github.benmanes.caffeine.cache.Cache;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DashboardServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DashboardServiceImpl.java
index f5a29737aecaf9b97bbc74cae035cd34cbe624cb..5b5fcc7e6ae2336962f649ebb023687cbe6055e0 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DashboardServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DashboardServiceImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.DashboardServiceConnectionException;
-import at.tuwien.exception.DashboardServiceException;
+import at.ac.tuwien.ifs.dbrepo.api.database.AccessTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceConnectionException;
+import at.ac.tuwien.ifs.dbrepo.exception.DashboardServiceException;
import at.tuwien.gateway.DashboardServiceGateway;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.DashboardService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
index 84d3a1d31f4b3aec696c9f4fee47423697686c6e..844774e92ade20a6030c9a72693da3e705c7477f 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DataCiteIdentifierServiceImpl.java
@@ -1,21 +1,21 @@
package at.tuwien.service.impl;
-import at.tuwien.api.datacite.DataCiteBody;
-import at.tuwien.api.datacite.DataCiteData;
-import at.tuwien.api.datacite.doi.DataCiteCreateDoi;
-import at.tuwien.api.datacite.doi.DataCiteDoi;
-import at.tuwien.api.datacite.doi.DataCiteDoiEvent;
-import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.CreateIdentifierDto;
-import at.tuwien.api.identifier.IdentifierSaveDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.DataCiteBody;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.DataCiteData;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.DataCiteCreateDoi;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.DataCiteDoi;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.DataCiteDoiEvent;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.BibliographyTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.CreateIdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
import at.tuwien.config.DataCiteConfig;
import at.tuwien.config.EndpointConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierStatusType;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierStatusType;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.IdentifierRepository;
import at.tuwien.service.IdentifierService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
index 7bbd6a1c30785ad4708f3a235e5a83d276565022..5ae46f9cd0d4b2c047f2d2ea993515ecbd4a6fc8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
@@ -1,23 +1,23 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.CreateDatabaseDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.DatabaseModifyVisibilityDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.database.ViewColumn;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKeyReference;
-import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
-import at.tuwien.entities.database.table.constraints.unique.Unique;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateDatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseModifyVisibilityDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.database.ViewColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKeyReference;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey.PrimaryKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique.Unique;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
@@ -117,7 +117,7 @@ public class DatabaseServiceImpl implements DatabaseService {
.identifiers(new LinkedList<>())
.build();
/* create in data database */
- final at.tuwien.api.database.internal.CreateDatabaseDto payload = at.tuwien.api.database.internal.CreateDatabaseDto.builder()
+ final at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto payload = at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto.builder()
.containerId(data.getCid())
.userId(user.getId())
.username(user.getUsername())
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/EntityServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/EntityServiceImpl.java
index dba30481f5c3884ddea7da87930e295df91be37d..f82d9a47af87050ab86d28cc9f31348b6935fbfa 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/EntityServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/EntityServiceImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.semantics.EntityDto;
-import at.tuwien.api.semantics.TableColumnEntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.EntityDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.TableColumnEntityDto;
import at.tuwien.config.JenaConfig;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.mapper.SparqlMapper;
import at.tuwien.service.EntityService;
import at.tuwien.service.OntologyService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
index f545a01d9749840d4988bf93e6553baa8e818806..b818e853603f3a12a0fb1192245e783eb000bbe3 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java
@@ -1,19 +1,19 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.query.QueryDto;
-import at.tuwien.api.identifier.BibliographyTypeDto;
-import at.tuwien.api.identifier.CreateIdentifierDto;
-import at.tuwien.api.identifier.IdentifierSaveDto;
-import at.tuwien.api.identifier.IdentifierTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.QueryDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.BibliographyTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.CreateIdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierSaveDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierTypeDto;
import at.tuwien.config.MetadataConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.LanguageType;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.identifier.IdentifierStatusType;
-import at.tuwien.entities.identifier.IdentifierTitle;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.LanguageType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierStatusType;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierTitle;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
index b82c8ca38290d5bc24dff6f60a14c5051ecf4697..a4ea58b80c9badbda5a012a2ba8b06f9f548e982 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
@@ -1,11 +1,11 @@
package at.tuwien.service.impl;
-import at.tuwien.api.container.image.ImageChangeDto;
-import at.tuwien.api.container.image.ImageCreateDto;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.exception.ImageAlreadyExistsException;
-import at.tuwien.exception.ImageInvalidException;
-import at.tuwien.exception.ImageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageChangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageAlreadyExistsException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageInvalidException;
+import at.ac.tuwien.ifs.dbrepo.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.ImageRepository;
import at.tuwien.service.ImageService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/LicenseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/LicenseServiceImpl.java
index de5018f8c7e6c99fe301e1ba734dd0da3450e1dd..0fe72f0f57786bff988c4b229455a4818d5cd6a1 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/LicenseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/LicenseServiceImpl.java
@@ -1,7 +1,7 @@
package at.tuwien.service.impl;
-import at.tuwien.entities.database.License;
-import at.tuwien.exception.LicenseNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
+import at.ac.tuwien.ifs.dbrepo.exception.LicenseNotFoundException;
import at.tuwien.repository.LicenseRepository;
import at.tuwien.service.LicenseService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
index d28dd0665104888b4bec83900f81057eab043dcf..4f26ebd111a7226e8adfb2eeefbbb4b4de1f6232 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/MetadataServiceImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.crossref.CrossrefDto;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.api.ror.RorDto;
-import at.tuwien.api.user.external.ExternalMetadataDto;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.CrossrefDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.api.ror.RorDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.ExternalMetadataDto;
import at.tuwien.config.MetadataConfig;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.CrossrefGateway;
import at.tuwien.gateway.OrcidGateway;
import at.tuwien.gateway.RorGateway;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
index d40239a06eb560272aea8acdf35a0f3bdc39fe4f..c1f84b9c21b744d5aa110942b1a83aec90db2fee 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
@@ -1,9 +1,9 @@
package at.tuwien.service.impl;
-import at.tuwien.api.semantics.OntologyCreateDto;
-import at.tuwien.api.semantics.OntologyModifyDto;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.exception.OntologyNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.OntologyModifyDto;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.exception.OntologyNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.mapper.SparqlMapper;
import at.tuwien.repository.OntologyRepository;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
index aef3213ccf2cac81ef70ad4a053c803cde16002d..5c6687671d75ad94bd83db8cdb468bfd591bdc71 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/StorageServiceS3Impl.java
@@ -1,8 +1,8 @@
package at.tuwien.service.impl;
import at.tuwien.config.S3Config;
-import at.tuwien.exception.StorageNotFoundException;
-import at.tuwien.exception.StorageUnavailableException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.exception.StorageUnavailableException;
import at.tuwien.service.StorageService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index 46a5638ab8184ea771dec3ead2897687e566383e..b8ee7b42884728720f8e9a117ce1d6b7c04fb34a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -1,17 +1,17 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.table.CreateTableDto;
-import at.tuwien.api.database.table.TableStatisticDto;
-import at.tuwien.api.database.table.TableUpdateDto;
-import at.tuwien.api.database.table.columns.ColumnStatisticDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.CreateTableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.*;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.*;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UnitServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UnitServiceImpl.java
index 03270abcd597683a39e106a1bb12325719a9dde0..a53f5bceeec23a3aa5020d0f9bfddbaf9de3ca23 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UnitServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UnitServiceImpl.java
@@ -1,7 +1,7 @@
package at.tuwien.service.impl;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
-import at.tuwien.exception.UnitNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.exception.UnitNotFoundException;
import at.tuwien.repository.UnitRepository;
import at.tuwien.service.UnitService;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
index 8b20f96ed748733cb352be76150cd5f523f5ebea..b33464dd03d095bc6a571d4c04aa844371e4673a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
@@ -1,10 +1,10 @@
package at.tuwien.service.impl;
-import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.user.UserUpdateDto;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.AuthServiceException;
-import at.tuwien.exception.UserNotFoundException;
+import at.ac.tuwien.ifs.dbrepo.api.auth.CreateUserDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.AuthServiceException;
+import at.ac.tuwien.ifs.dbrepo.exception.UserNotFoundException;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
import at.tuwien.service.UserService;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
index 4c9e9399f504de12486871a1f0b8f2f77f0a400e..e6d39f12882d7a05ea01152f4c62ece0cbc8ba0c 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
@@ -1,12 +1,12 @@
package at.tuwien.service.impl;
-import at.tuwien.api.database.CreateViewDto;
-import at.tuwien.api.database.ViewDto;
-import at.tuwien.api.database.ViewUpdateDto;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.View;
-import at.tuwien.entities.user.User;
-import at.tuwien.exception.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.CreateViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.ViewUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.View;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.mapper.MetadataMapper;
diff --git a/lib/java/dbrepo-core/.gitignore b/lib/java/dbrepo-core/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b425f09ad0e75e91fc43f1aee01bb3a918eec8c0
--- /dev/null
+++ b/lib/java/dbrepo-core/.gitignore
@@ -0,0 +1,35 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
\ No newline at end of file
diff --git a/lib/java/dbrepo-core/pom.xml b/lib/java/dbrepo-core/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb1580c93c52ed5a7d5ae5a5f6919594f144c4f5
--- /dev/null
+++ b/lib/java/dbrepo-core/pom.xml
@@ -0,0 +1,117 @@
+<?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>
+
+ <parent>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-parent</artifactId>
+ <version>3.3.5</version>
+ </parent>
+
+ <organization>
+ <name>TU Wien</name>
+ <url>https://www.tuwien.ac.at</url>
+ </organization>
+
+ <groupId>at.ac.tuwien.ifs.dbrepo</groupId>
+ <artifactId>dbrepo-core</artifactId>
+ <name>dbrepo-core</name>
+ <version>1.8.0</version>
+
+ <description>Core library for DBRepo</description>
+
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.8/</url>
+ <developers>
+ <developer>
+ <name>Martin Weise</name>
+ <email>martin.weise@tuwien.ac.at</email>
+ <organization>TU Wien</organization>
+ </developer>
+ </developers>
+
+ <properties>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <lombok.version>1.18.36</lombok.version>
+ <spring-cloud.version>4.1.4</spring-cloud.version>
+ <jackson-datatype.version>2.15.0</jackson-datatype.version>
+ <springdoc-openapi.version>2.8.5</springdoc-openapi.version>
+ </properties>
+
+ <dependencies><dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ <version>${spring-cloud.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-thymeleaf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <!-- Api -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <!-- Entities -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson-datatype.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-hibernate6</artifactId>
+ <version>${jackson-datatype.version}</version>
+ </dependency>
+ <!-- Open API -->
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+ <version>${springdoc-openapi.version}</version>
+ </dependency>
+ <!-- Tests -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
+ </dependencies>
+
+ <licenses>
+ <license>
+ <name>Apache-2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+</project>
\ No newline at end of file
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/CacheableDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/CacheableDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/CacheableDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/CacheableDto.java
index e947ece6320820e926a3674834310c785042603d..b8a273e9d00f0a0308c2d36e08ccb2b40891a8c0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/CacheableDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/CacheableDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api;
+package at.ac.tuwien.ifs.dbrepo.api;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/ExportResourceDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ExportResourceDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/ExportResourceDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ExportResourceDto.java
index 5c5bf22005be92dbd172bfa4abd580dd298d6d5c..7bdd514672d0ab64c00d31e2e393d8edf7feddc3 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/ExportResourceDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ExportResourceDto.java
@@ -1,4 +1,4 @@
-package at.tuwien;
+package at.ac.tuwien.ifs.dbrepo.api;
import lombok.*;
import org.springframework.core.io.InputStreamResource;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ChannelDetailsDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ChannelDetailsDto.java
index 03aeb19ab41e375822af6741e61b3161d67a7591..c6bbe825a39a444e0ac8a24549698e876822237d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ChannelDetailsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ChannelDetailsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ConsumerDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ConsumerDto.java
index ad82492d7d4d867c4c706bfbc1f1549e9fafcd95..cc76cb60e6b50f41a7b69f9e62a1def6e1ac86a5 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ConsumerDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ConsumerDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateExchangeDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateExchangeDto.java
index dffe2c1e0e300fb631d7af34a09e605e1064a462..627f80015db512cc5a975328f77f3eaeb2660f1d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateExchangeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateExchangeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateUserDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateUserDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateUserDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateUserDto.java
index 372ce8219b0ee2ac63308c9f8028361d8471cb10..2d40a1cc7fb4f9b2fd1f933177e7fa3af3a8af67 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateUserDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateUserDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateVirtualHostDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateVirtualHostDto.java
index b27ea597c20a670df8897834b28bc62fcb95c0f7..fc8a62ee658db8d03387b815af348eaa10c644f0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/CreateVirtualHostDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/CreateVirtualHostDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ExchangeDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ExchangeDto.java
index 403a04f00b4d437db1746cca1977989e61a85dc8..702d60ab5299ebccc69002867712b5b9740b70e6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/ExchangeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/ExchangeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantExchangePermissionsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantExchangePermissionsDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantExchangePermissionsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantExchangePermissionsDto.java
index 054548dbf06e683bcd787109afbff0359b59ca65..9abb7476ecb82bc87fc08568304cb46c1d0b764c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantExchangePermissionsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantExchangePermissionsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantVirtualHostPermissionsDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantVirtualHostPermissionsDto.java
index 7e84edb80eb21faafbc4eb0ca87f4c5aa65464e4..92190e285f17d04d287b52e1693de29f8821d737 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/GrantVirtualHostPermissionsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/GrantVirtualHostPermissionsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueBriefDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueBriefDto.java
index 8a266043a1a63f216d2ca0a378d69f11458e6555..3cbfb38d7e3eb692347646c324ffbaef189461ba 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueDto.java
index acc2091d41a158b07c7b23679be7e7ac1c385fc5..fba523416fef441b093b89a448b3f479bd845b3a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/QueueDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/QueueDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/TopicPermissionDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/TopicPermissionDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/TopicPermissionDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/TopicPermissionDto.java
index bdd806f71e1312c05d27f034704297fa7c2bd885..a90b4c396bcd12e7bbbee448afdd1525517e92cd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/TopicPermissionDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/TopicPermissionDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/UserDetailsDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/UserDetailsDto.java
index a786456efd0945d480ace653457f3e8a284ab78c..65df7d04933cee576aee36a153b20b31c5ae447f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/UserDetailsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/UserDetailsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/VirtualHostPermissionDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/VirtualHostPermissionDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/VirtualHostPermissionDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/VirtualHostPermissionDto.java
index 0602c418da993c7bea9e2e557203128c9772fc8c..cc53833e23c8e0bf3d775e76c515de865ebfb8fb 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/amqp/VirtualHostPermissionDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/amqp/VirtualHostPermissionDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.amqp;
+package at.ac.tuwien.ifs.dbrepo.api.amqp;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/CreateUserDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/CreateUserDto.java
index 9742986ae08df9f9d00f5c1bc9da15b245bad8fc..174d6fe3db7819bb7d7409e7ee1ceed59d7b9fb8 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/CreateUserDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/CreateUserDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.auth;
+package at.ac.tuwien.ifs.dbrepo.api.auth;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/RealmAccessDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/RealmAccessDto.java
index b759aff16843ef5cf8cc13466af20c1383599996..35ab8bc159c2bf4c67cdd830ae809786e1c593dd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/auth/RealmAccessDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/auth/RealmAccessDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.auth;
+package at.ac.tuwien.ifs.dbrepo.api.auth;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerActionTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerActionTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerActionTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerActionTypeDto.java
index 2ea7a8f8a4eac80b4bae193a6b2f3f45c2674651..26069b6389ae6e57794a6bbef70fae8437aa709d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerActionTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerActionTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container;
+package at.ac.tuwien.ifs.dbrepo.api.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerBriefDto.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerBriefDto.java
index 91253b12baaefc02c0b078bf31fd832a01f29864..49212a57c7aba6742be5b48aa36a7e1700c25c2f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerBriefDto.java
@@ -1,7 +1,6 @@
-package at.tuwien.api.container;
+package at.ac.tuwien.ifs.dbrepo.api.container;
-import at.tuwien.api.container.image.ImageBriefDto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageBriefDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
@@ -9,7 +8,6 @@ import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import java.time.Instant;
import java.util.UUID;
@Getter
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerDto.java
index 39eb0116527395ca9dcfdf634e44b675fc46b122..a53276db9ee2ef3970918642843b73beb68fda14 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/ContainerDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.container;
+package at.ac.tuwien.ifs.dbrepo.api.container;
-import at.tuwien.api.CacheableDto;
-import at.tuwien.api.container.image.ImageDto;
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.ImageDto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/CreateContainerDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/CreateContainerDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/CreateContainerDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/CreateContainerDto.java
index f2ac7df46abb989797bc1bab23d8145d71ee5687..a837a352707ca1f35443b70dcffe907793e0872d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/CreateContainerDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/CreateContainerDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container;
+package at.ac.tuwien.ifs.dbrepo.api.container;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/DataTypeDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/DataTypeDto.java
index 908f54a1b45fb247f13550b15cf8c2ce5d80e821..9aed748c689e5a80a628c68a2ea2795b2e37f2f2 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/DataTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageBriefDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageBriefDto.java
index ecbd050966f43c6f8fbe8a04b6f458570448fd59..629ba34d40f24ee0216523253b4705d1bf96c72c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageChangeDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageChangeDto.java
index 520449d1de7bfb8d92f33f15763c13813e6c935b..b262ac33c8052bb02269374c3b4909734c97793f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageChangeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageChangeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageCreateDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageCreateDto.java
index 4e9fea5b7cbada74155ad2760ccdc99fb2e23490..f698bec7d9fc154d52195e1f172cf07f40aaede7 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageCreateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.Parameter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageDto.java
index ec4b0ad4894bcb220d03d4bb86828ba3b25bfc63..6dc178c3c21002308633530fe8b75b58f4dd77be 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/ImageDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/OperatorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/OperatorDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/OperatorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/OperatorDto.java
index 7eaee0481064384e762b296661565f5534714beb..3585383892f88310d11186f84e85d127f646b71c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/OperatorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/container/image/OperatorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.container.image;
+package at.ac.tuwien.ifs.dbrepo.api.container.image;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/CrossrefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/CrossrefDto.java
similarity index 76%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/CrossrefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/CrossrefDto.java
index 4a689a69ce93dead9cbb6bd27916326a986f22f1..eff98449e32f345e1e2f03f8adc28a548322f611 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/CrossrefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/CrossrefDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.crossref;
+package at.ac.tuwien.ifs.dbrepo.api.crossref;
-import at.tuwien.api.crossref.label.CrossrefPrefLabelDto;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.label.CrossrefPrefLabelDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/form/CrossrefLiteralFormDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/form/CrossrefLiteralFormDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/form/CrossrefLiteralFormDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/form/CrossrefLiteralFormDto.java
index b493cf89ff6ea61df68ef919c6a380b9a81769d2..80c6b75d2c0fa4f07b50ce99c8d14cfd0398a80d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/form/CrossrefLiteralFormDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/form/CrossrefLiteralFormDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.crossref.form;
+package at.ac.tuwien.ifs.dbrepo.api.crossref.form;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefLabelDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefLabelDto.java
similarity index 76%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefLabelDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefLabelDto.java
index 7bdaf0f93117c31dd91017f0e3fcda885060cd54..c8c971ede377f3e9f0ed52e42e181d41e2feeb16 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefLabelDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefLabelDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.crossref.label;
+package at.ac.tuwien.ifs.dbrepo.api.crossref.label;
-import at.tuwien.api.crossref.form.CrossrefLiteralFormDto;
+import at.ac.tuwien.ifs.dbrepo.api.crossref.form.CrossrefLiteralFormDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefPrefLabelDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefPrefLabelDto.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefPrefLabelDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefPrefLabelDto.java
index a70c161d83752cc338c0e0ccf416cc84a8ee8c8b..04b04f5e2391076c5d8f7cce1d75cfd569fef0b2 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/crossref/label/CrossrefPrefLabelDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/crossref/label/CrossrefPrefLabelDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.crossref.label;
+package at.ac.tuwien.ifs.dbrepo.api.crossref.label;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/AccessTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/AccessTypeDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/AccessTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/AccessTypeDto.java
index 4116376ace445275bc03b7ec0216bfaa7cd7c5e5..bb0c03c752cf9e09ef36d5715bd5c42ca7c79deb 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/AccessTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/AccessTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateAccessDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateAccessDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateAccessDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateAccessDto.java
index 965e10afd50884605ca8788a4653b2b2dc3b9f09..67e2e0bb82653c22e7d4478adb6266174ee51875 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateAccessDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateAccessDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateDatabaseDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateDatabaseDto.java
index e7fd08e771176346fb13d361f2c436ce3aaf6627..1cd51efd83ff2885e8eaa51ea5ded11cc85a9014 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateDatabaseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateDatabaseDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateViewDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateViewDto.java
index 9a9558470f575e07e9baf77b531911a80dac8757..5631ff2445b528cb6b77d07362620ff218f3fee0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/CreateViewDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/CreateViewDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
-import at.tuwien.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.SubsetDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseAccessDto.java
similarity index 85%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseAccessDto.java
index 7e393561f844b3f10f8fc450b04a29158e3e3cbd..161c1fe9db5406fe11aae332036607aee36c8ec0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseAccessDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseAccessDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseBriefDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseBriefDto.java
index 4bb262b781d3c18013cf3ae65401e39f2469c3e1..1c549f1f7f62fecbc735ec1b910e6bea19d2daa7 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseBriefDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseDto.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseDto.java
index e155de3bf705ec3070dfaf02f4d9a5d13a5ff10b..bc7df3152af73d917b8e8c25402ab1dc5debc282 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseDto.java
@@ -1,11 +1,11 @@
-package at.tuwien.api.database;
-
-import at.tuwien.api.CacheableDto;
-import at.tuwien.api.container.ContainerBriefDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.identifier.IdentifierDto;
-import at.tuwien.api.user.UserBriefDto;
+package at.ac.tuwien.ifs.dbrepo.api.database;
+
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyDashboardDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyDashboardDto.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyDashboardDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyDashboardDto.java
index f9588ccb41caa6290442ebd60d891cf2d9edcd9c..599af4ef3949c245b3993304aca6c98ab2a13f2e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyDashboardDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyDashboardDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyImageDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyImageDto.java
similarity index 83%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyImageDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyImageDto.java
index 5160ae76bfc3b9fc6445a33ff9c1bb277f9bc4dd..95235c551251f137b643b852653be3b3a63353b0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyImageDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyImageDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyVisibilityDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyVisibilityDto.java
index f3284006948d5b2cc05ac705c9487cb56ad5ec19..3ed9a0ace5aaf076a3371e5df91b4d3a2f5f7712 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseModifyVisibilityDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseModifyVisibilityDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseTransferDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseTransferDto.java
index 5a8e6beb1086a996aa77f47ff4f1530b62af00df..65deb8151905f4cf8bade04ab6cb7a8337f0a7cf 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/DatabaseTransferDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/DatabaseTransferDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LanguageTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LanguageTypeDto.java
similarity index 99%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LanguageTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LanguageTypeDto.java
index 38918528613dc47436723432eca8faa132041535..7e586e9ed33e5319afc1ae209ae7deefff986ff6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LanguageTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LanguageTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LicenseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LicenseDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LicenseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LicenseDto.java
index a6384b3487bf1df7d320c2befa303ad59613d5f1..993701dc2d1c7fe6b73e28866009cc65af0c82e9 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LicenseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LicenseDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LoadFileDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LoadFileDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LoadFileDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LoadFileDto.java
index 65f5120d9b7cc78442bd071a6b02cbf70f534a41..2cd4aadafcac85d1d4513616269fd7fd93a2956c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/LoadFileDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/LoadFileDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewBriefDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewBriefDto.java
index 47107ac54fe042b026e3a0ac954e5be2650b59d8..cd75aa8b6ac3b5aa7edb7eea198dfec330aa3d82 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewColumnDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewColumnDto.java
index 0d406d3d875ece82655e97f01dfc2c8d2856130d..126244b92e76a3081ecb9fee9e03bddccdbd9a29 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewColumnDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.EnumDto;
-import at.tuwien.api.database.table.columns.SetDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.EnumDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.SetDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewDto.java
index ab588767588de471d9371e8970ff8c3f3b06dc2a..52612d3c026a798d9d767ac86f81a4d45a737739 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
-import at.tuwien.api.CacheableDto;
-import at.tuwien.api.identifier.IdentifierDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewUpdateDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewUpdateDto.java
index 434ce0d9b695ba45d127bcc16725cc72e3bc83c2..9322d99bc27a0a4538d7e4691cfb885722096b4c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/ViewUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database;
+package at.ac.tuwien.ifs.dbrepo.api.database;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/internal/CreateDatabaseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/internal/CreateDatabaseDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/internal/CreateDatabaseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/internal/CreateDatabaseDto.java
index a8368e2166cc148e3d389008a831df046cca7ef9..d7e4619d30548394dbb34d215f9961cf8155163b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/internal/CreateDatabaseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/internal/CreateDatabaseDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.internal;
+package at.ac.tuwien.ifs.dbrepo.api.database.internal;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExecuteStatementDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExecuteStatementDto.java
index fbc8bfebe0b58bfe48e976af1c2e00fcc159e12d..afdb671952a9c61c262bce62c0518950ebac70ce 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExecuteStatementDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExecuteStatementDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExportDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExportDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExportDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExportDto.java
index 36a13b348770945035292c8bbe32722688f8eea9..cf558ea0829e98108120c68179a76eb29401a42a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ExportDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ExportDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterDto.java
index 3fe8744661c4308d7403b950a15bfed104d9e5a1..d77d32ce4ef313c1ffa8d964891d24c07bdd87e1 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterTypeDto.java
index ba200da535531a0d5feae6e4b4eb5f72754c04f9..faa7409ee97c7e0ce8414e46f009394d4ae3f321 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/FilterTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/FilterTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ImportDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ImportDto.java
index 20817e017622ff5619cf1eaf284f238ba02dff4b..932f25b4f9086d1c3e0783d98021684ba9d62832 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/ImportDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderDto.java
index bb58ad483145927ee0f12fd60d553123228f488d..98ca6f1704482b5b72805f13dcafc939cdfa1d34 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderTypeDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderTypeDto.java
index 0fa42cc198abb31eacab4782320bcb8f1b4d548c..8f7de6ccb8461fe9fcd39c9a7a98df55f9c6b545 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/OrderTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/OrderTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryBriefDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryBriefDto.java
index c55a108cfcb215bca68e2d826ab09be39283cccf..6c7bfad2046deed78250a0f0a6b9e59c86881e3f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryBriefDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryDto.java
index 24915a3dd5f4cbe82dd93744d214b2488b99acd5..dc4d653185e1349b379a1b9b83d191c858b2a8f5 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.identifier.IdentifierBriefDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryPersistDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryPersistDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryPersistDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryPersistDto.java
index 5bc3ac2054452f007c256917c8eaa6a3288f1a1a..059cf20c7f47048ce150e695c5fe5251cee35829 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryPersistDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryPersistDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryTypeDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryTypeDto.java
index 7356f1a45906acf7c3e28b09f244030e11ca2fbf..bee4673c9ae4432028a9498522b211ac91805b26 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/QueryTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SaveStatementDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SaveStatementDto.java
index 876dd5dfdd3c3f6a1e199138dfa7a3bfadc6292f..952219e82eb658117213ae25a0b1dbf05ce040fd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SaveStatementDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SaveStatementDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SubsetDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SubsetDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SubsetDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SubsetDto.java
index 6e8c238417a7d81d65a08b639fb3ddcd9b1750df..599a686746681b5a2b69b40f5838fdc7cc84f5c7 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/SubsetDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/query/SubsetDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.query;
+package at.ac.tuwien.ifs.dbrepo.api.database.query;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/CreateTableDto.java
similarity index 82%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/CreateTableDto.java
index 15a798ee2d6bd237a6f578678d8885ca3b0f87dd..0ef3d5f74bec74e18abd489de4950a3f3bfcba34 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/CreateTableDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/CreateTableDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/HistoryEventTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/HistoryEventTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/HistoryEventTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/HistoryEventTypeDto.java
index bcb736951bd5e4148009ac02cd03b365c9344e73..901726b77f414daa235e08f63fc39a4b76cb1045 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/HistoryEventTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/HistoryEventTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/SortType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortType.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/SortType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortType.java
index 10325b1ccfb5171e9061d5f3846ea503339a9a97..fbc0934f81cc996d0e141cdca70e1d96bb82bdf0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/SortType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortType.java
@@ -1,4 +1,4 @@
-package at.tuwien;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/SortTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortTypeDto.java
similarity index 81%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/SortTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortTypeDto.java
index 37bc6aedb9412b4b4167e2f537c07b9f800276a8..208786dccf67a816f9a5310feb44801cb8f25481 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/SortTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/SortTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableBriefDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableBriefDto.java
index 3ba910b97950253569a080246cd603ccec6d9854..4959eb668daebce913990861c2d9a205e1624ec9 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateRawQuery.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableCreateRawQuery.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateRawQuery.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableCreateRawQuery.java
index ec221ae5f0ac5f1e9063a1cfbfcbcc2813f6ff60..8ecf083e24e145cce36380b719041a9da62f4ae5 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableCreateRawQuery.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableCreateRawQuery.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableDto.java
index 6f6139fce453f2ef6a1c07e42c7d1154bf4ea940..215c8e3a7444be24d1a032c383df4562ef2522d2 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableDto.java
@@ -1,15 +1,14 @@
-package at.tuwien.api.database.table;
-
-import at.tuwien.api.CacheableDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.database.DatabaseBriefDto;
-import at.tuwien.api.database.DatabaseDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.identifier.IdentifierDto;
-import at.tuwien.api.user.UserBriefDto;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
+
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.ConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.IdentifierDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableHistoryDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableHistoryDto.java
index e6ed6672350788bf3dc730a5273f0a5b35ec0c7d..a20ef71757878735ed8332ed67c645b57b199cd1 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableHistoryDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableHistoryDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableInsertRawQuery.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableInsertRawQuery.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableInsertRawQuery.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableInsertRawQuery.java
index de6ff7feb7f35eeeb82fa8b028409268a473a7ed..c81fbea83ed0c9f28568ea7617b1ab17c3268eda 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableInsertRawQuery.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableInsertRawQuery.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableStatisticDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableStatisticDto.java
index 9fbbc97d3437c8a9d0590ad8e22d307af5f63abc..7f0ed7a4e2ae5287c105464dd33b1675782a66cf 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableStatisticDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableStatisticDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
-import at.tuwien.api.database.table.columns.ColumnStatisticDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnStatisticDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableUpdateDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableUpdateDto.java
index d8db27005306a871fc3b8c250fcda5737abd79ef..ce3fcfd89d409dea38b298e8f16c5ab07c2bd92c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TableUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TableUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDeleteDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDeleteDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDeleteDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDeleteDto.java
index f74ffb3d89a1cfc5582be30e89ff0cb6a573f8c5..5495106e703bba60a4524b07d640d6a7088e9dec 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDeleteDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDeleteDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDto.java
index 13dc2b9723e763a5b255c762f1d94974ef90d074..6a2c9f0fcc295f47a24e2975b7180bbe799e516e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleUpdateDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleUpdateDto.java
index ab3f1ae8758c69a9bfa0958e9a53e5326d8c91a9..ce3b7fe2c5c0e01172ac71726084b8023bd3a996 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/TupleUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/TupleUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table;
+package at.ac.tuwien.ifs.dbrepo.api.database.table;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnBriefDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnBriefDto.java
index 08ee40caa46f977fe3b7bd81055d94ab18d410c5..bb60b9bfc2a7c53f21492391532d57c4e2940b40 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnDto.java
index 6325702c7c13c6bd9a873681e40be23efc2e5710..8e772433bc22df95d942f1c8de302e39eb98579a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnDto.java
@@ -1,9 +1,8 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
-import at.tuwien.api.database.table.columns.concepts.ConceptBriefDto;
-import at.tuwien.api.database.table.columns.concepts.UnitBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.ConceptBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.UnitBriefDto;
import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnStatisticDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnStatisticDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnStatisticDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnStatisticDto.java
index 3662722b8b0ece855370097536f227cee212a4e7..d0101cac2bb21ca92dc3ff63539cb8372a785010 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnStatisticDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnStatisticDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnTypeDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnTypeDto.java
index 4440e986befe680f7ffb4f7d061aed3fe4b78fa9..8cbb621e6d27dd955cbd36981015fe940d33d06a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/ColumnTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/CreateTableColumnDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/CreateTableColumnDto.java
index 9733f64a163fcede451627fbbe2fc6a9b8df405d..02a9665da8aff9ce22d53b67f32e8254451c5792 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/CreateTableColumnDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/CreateTableColumnDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/EnumDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/EnumDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/EnumDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/EnumDto.java
index 9038648513bb949a99895070cfcedf6e96260bbb..c2cc0f7466441beead59efe9da1f4f278f8cad48 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/EnumDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/EnumDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SetDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SetDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SetDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SetDto.java
index 6986212592d56a16633fc41b0b7ce4b28257bc97..084452d59466fcef27992295d35376f32edb6b24 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SetDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SetDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SiUnitDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SiUnitDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SiUnitDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SiUnitDto.java
index b327a53cec6e43c7a851aa0f855a959bfac369c3..25949b89210b7d5d321674d9a68bdf1270bb440e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/SiUnitDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/SiUnitDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java
index 9c74981f1416740ee6e5679d1ea2ed3fbc59e2bc..f9c298b4e7db8df5065904b4a4f673c024476fdd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ColumnSemanticsUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptBriefDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptBriefDto.java
index 160807e7aaf1e7c59e33dc7813a4d4691fd06ba3..04ef35ac8595ad0217052c5237074c79827cff42 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptDto.java
similarity index 81%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptDto.java
index 13595569439bc999e40c58a2be29469883631909..1dc91c9e69e2865dfd219d6ec6ba69ad826d5d51 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptSaveDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptSaveDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptSaveDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptSaveDto.java
index b61d911ef9b3141954fe041fa18f8ee9d1362680..05de242e545377caa5600610fa3fb26d181b08ae 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptSaveDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/ConceptSaveDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
import jakarta.validation.constraints.NotBlank;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitBriefDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitBriefDto.java
index 789f3de1500900848205e0598e8fab89f9a50c11..e5094b7d6e45640a260147131ec98fab272d1a30 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitDto.java
similarity index 81%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitDto.java
index ca3899f7cc1f7d858d4e85fa0aa3107e6633dbf7..92f9564e969506e84d6fed9f149a21575a079ecb 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitSaveDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitSaveDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitSaveDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitSaveDto.java
index 530c7c8fbb806e8ffc2eac124f0bd6fec3321ea4..9b4f4c7f857dffa6d145871c809e5f119136709d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/concepts/UnitSaveDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/columns/concepts/UnitSaveDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.columns.concepts;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts;
import jakarta.validation.constraints.NotBlank;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/ConstraintsDto.java
similarity index 65%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/ConstraintsDto.java
index b9288b659bb7e2accb18c14e8258f631327d10f3..95ba9ad99a7993174250a439d556632c357c250f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/ConstraintsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/ConstraintsDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.database.table.constraints;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints;
-import at.tuwien.api.database.table.constraints.foreign.ForeignKeyDto;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.ForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/CreateTableConstraintsDto.java
similarity index 80%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/CreateTableConstraintsDto.java
index 7b223372d2ae0057149e3b9ed95824c7a5baa05d..46ebaf1c0b292b6f214b781f1de4335ec51a2a73 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/CreateTableConstraintsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/CreateTableConstraintsDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database.table.constraints;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints;
-import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.CreateForeignKeyDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/CreateForeignKeyDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/CreateForeignKeyDto.java
index 5e1d0a9f86c8055c69d5c4c03ac8f7c06aec6206..896d0d40585ddd394d9b6d179efda7ae1d200863 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/CreateForeignKeyDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/CreateForeignKeyDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.constraints.foreign;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyBriefDto.java
similarity index 82%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyBriefDto.java
index 4acc205efdebaec4b6e82c322a539d9fb945a30c..5ea08a414c252aeb4ad860078515ba4507f05177 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.constraints.foreign;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyDto.java
similarity index 78%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyDto.java
index 94063c77dc579a13aad2c52af5ac32739fdf89d0..8e7c54414d74f45388a1d73df9168139ca16705b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.database.table.constraints.foreign;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java
similarity index 82%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java
index 2423b92a624042f6b638b8baa1b1dbe818b14235..7248ce52fcc7f99c70c58ec4f78515161d9adf69 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ForeignKeyReferenceDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.database.table.constraints.foreign;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ReferenceTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ReferenceTypeDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ReferenceTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ReferenceTypeDto.java
index 239b95e7e916a01e596e78e41154d0fdae6e9bf8..2e80aa43bcdd8ae83d0b2d9c1a7713ac3be337e1 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/foreign/ReferenceTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/foreign/ReferenceTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.database.table.constraints.foreign;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/primary/PrimaryKeyDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/primary/PrimaryKeyDto.java
similarity index 69%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/primary/PrimaryKeyDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/primary/PrimaryKeyDto.java
index 59117a579576e86cd9b01828695de57aaece9fd7..48299470b122cfac6aeed0715d0c5ce15a12b464 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/primary/PrimaryKeyDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/primary/PrimaryKeyDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database.table.constraints.primary;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/unique/UniqueDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/unique/UniqueDto.java
similarity index 73%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/unique/UniqueDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/unique/UniqueDto.java
index 64db6dfde0b0ce6d8de017a0cba9f61c7e64d304..de5572e25f93d09ab730bf919fc9dbf6c304079e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/constraints/unique/UniqueDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/constraints/unique/UniqueDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database.table.constraints.unique;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique;
-import at.tuwien.api.database.table.TableBriefDto;
-import at.tuwien.api.database.table.columns.ColumnBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.TableBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.ColumnBriefDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/internal/TableCreateDto.java
similarity index 81%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/internal/TableCreateDto.java
index f8db928e8e9bb3d7491e67ea36756b95749a4482..1e2509ab3b6cd8c4025eb49a0a188fce8c0935e6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/internal/TableCreateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/database/table/internal/TableCreateDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.database.table.internal;
+package at.ac.tuwien.ifs.dbrepo.api.database.table.internal;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.CreateTableColumnDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteBody.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteBody.java
similarity index 85%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteBody.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteBody.java
index 8ef874acba25e24be3ad2e8240bfea157e1cdffc..3e45a47543d358157a8532e3000a90403ec4fb17 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteBody.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteBody.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite;
+package at.ac.tuwien.ifs.dbrepo.api.datacite;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteData.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteData.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteData.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteData.java
index 62b8ad411c343b30188e5feaffb87d2b473f6568..e95a57945b4a4f5801908f54ed1d75c489c1d516 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteData.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteData.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite;
+package at.ac.tuwien.ifs.dbrepo.api.datacite;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteError.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteError.java
similarity index 85%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteError.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteError.java
index dcbc312d31d2ac4ac6a5799ba96876ce9f5854f8..09d9d4a2bd9be6729e50c483aa628ab00ab6312c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/DataCiteError.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/DataCiteError.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite;
+package at.ac.tuwien.ifs.dbrepo.api.datacite;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteCreateDoi.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteCreateDoi.java
index 24da7bc82a2cfbfd5346abd87bcfc66e6cf9dd27..43afab69cdf6ac60b7bc5ab1da238044d2256da8 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteCreateDoi.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteCreateDoi.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoi.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoi.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoi.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoi.java
index 5d3e0b2c1e30f2924e2ef6fa6dd3710f7e1d5507..6cb8189463d9fd986d014b34b6052913842b6047 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoi.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoi.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreator.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreator.java
index 3d093adf74d7bf9cc834f87bf0d9362c737b2d2b..8bac1e2505597752a0f1ce9afce0994d3fd6b9bd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreator.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreator.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorAffiliation.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorAffiliation.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorAffiliation.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorAffiliation.java
index a361452b96dcae2cb0de304df4011f88f930c790..152124fc554f1bcde689c3bc9b30ab41473f56f3 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorAffiliation.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorAffiliation.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java
index 449c814171c45070a74b8e62447893f82b3ca0dc..2f26c389fb53a081d851dd5a5a82bb95c153e9bd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiCreatorNameIdentifier.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiEvent.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiEvent.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiEvent.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiEvent.java
index 35b6c670da99c68d75754fd9ea0c9c75768d152d..8a1381136b55ad06bb237d34eae76505646c8129 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiEvent.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiEvent.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReference.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReference.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReference.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReference.java
index 595c808a24ec96e2e1e9bf36235b590b3c09911e..479fb675e371f8868c60729698d021421df42453 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReference.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReference.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java
index 1bdc94605f935766ebd89e9a9d32c8a683cb6f2e..0bf5da085fa18ed9f4d25590aac5fea9a605d963 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiFundingReferenceIdentifier.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRelatedIdentifier.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRelatedIdentifier.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRelatedIdentifier.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRelatedIdentifier.java
index d446029eae714ac0146bbe70ff7eb71d2ab5df94..0f459d0fd4a4c205cf03abe19206d5a07827788e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRelatedIdentifier.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRelatedIdentifier.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRights.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRights.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRights.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRights.java
index 4a53c7f7c5b651d5e88f2111473a443eb19a066d..879cff355817b536774fede1c908ea6adce43813 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiRights.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiRights.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTitle.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTitle.java
index a0358da69a1aead0263a679b3fe4ceca7ff87abb..4f9531c06e46002fb1034a75c49ef38bc6745ca2 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTitle.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTitle.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTypes.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTypes.java
index 778853ce78e6ea24a2b1748b8ffbb977a9211a80..a00127dda353620d39b7a7d23872a50261bbd296 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteDoiTypes.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteDoiTypes.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteNameType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteNameType.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteNameType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteNameType.java
index 76468540f50dda26cb34979e641f6f3f680e40c3..0c92807ef7e6ef59be9d225b3dc26091cfbc6116 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/datacite/doi/DataCiteNameType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/datacite/doi/DataCiteNameType.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.datacite.doi;
+package at.ac.tuwien.ifs.dbrepo.api.datacite.doi;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/error/ApiErrorDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/error/ApiErrorDto.java
index bb271f5ed6065595898f0a4f73b9758f66da2294..587561374912f0db0b172865190d8df736f5af0b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/error/ApiErrorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/error/ApiErrorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.error;
+package at.ac.tuwien.ifs.dbrepo.api.error;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/file/UploadResponseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/file/UploadResponseDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/file/UploadResponseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/file/UploadResponseDto.java
index 3b1cdab22301aa8d97a9427d9fc58fe5398d542d..b9fda2537692928f64b8a72453ec4d32055981b6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/file/UploadResponseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/file/UploadResponseDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.file;
+package at.ac.tuwien.ifs.dbrepo.api.file;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/AccessTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/AccessTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/AccessTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/AccessTypeDto.java
index 251b7c2c11ac9f57f9c092da11be8e4a3525a46a..e56122448d76a0df7559e53610118544511d0c5b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/AccessTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/AccessTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardDto.java
index 5d7a0d68dc21713e90f86f7d6c5fd8a497c447fa..b83b0ea0ecb34e3641af78c8c7e9d34637d21eff 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardResponseDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardResponseDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardResponseDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardResponseDto.java
index 7cbaf4c0db2874da76b8cc721b46fc802b7344c2..a3d798120a158a08c298ab174914fcb6ba869bb0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/CreateDashboardResponseDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/CreateDashboardResponseDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceDto.java
index 9f6d4ca2f90839aefc84294dcabc8eaff994d616..d9b271018d1fda43af9461ab2cc4055975879207 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceTypeDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceTypeDto.java
index 33354a019f8524354e5a5478a726eefd39489e58..92ae9acef5fc04c89134358328daf1150d5ffe6a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/DatasourceTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/DatasourceTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/PermissionTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/PermissionTypeDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/PermissionTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/PermissionTypeDto.java
index 6fa7ef78fc69b690799c1cd14607266f1d1b5d5c..e8a9cb027d12968f2ec6a67d88c53923ec0e5f06 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/PermissionTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/PermissionTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/UpdateDashboardAccessDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/UpdateDashboardAccessDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/UpdateDashboardAccessDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/UpdateDashboardAccessDto.java
index 902b2336c1074a97a7f0c4a0957d02dd34fdec51..c5e2b7e9e47784c019fc55419a7019ee35800d1d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/grafana/UpdateDashboardAccessDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/grafana/UpdateDashboardAccessDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.grafana;
+package at.ac.tuwien.ifs.dbrepo.api.grafana;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/AffiliationIdentifierSchemeTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/AffiliationIdentifierSchemeTypeDto.java
similarity index 70%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/AffiliationIdentifierSchemeTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/AffiliationIdentifierSchemeTypeDto.java
index 3c089e6454f0121bbea61fd17bbdd6a55e02c9b6..7591059990bbb968a51856f34d0724e89eeec06e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/AffiliationIdentifierSchemeTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/AffiliationIdentifierSchemeTypeDto.java
@@ -1,5 +1,5 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/BibliographyTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/BibliographyTypeDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/BibliographyTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/BibliographyTypeDto.java
index 83b5aa4e09c38082ae004a345147b1c28fe7dc63..9cf8b40f533f4a075e8e1e2e46cd6e3e15d060a0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/BibliographyTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/BibliographyTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreateIdentifierDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreateIdentifierDto.java
index 5f2e73fc07badf436c3527fc8423b21d641967b7..c1bdf1ed1a06747654cafe279ba0d6ea9cd4fd7e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreateIdentifierDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreateIdentifierDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
-import at.tuwien.api.database.LicenseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LicenseDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorBriefDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorBriefDto.java
index 95b0d588f7bccc0c812c3bd823f94022d3da9d38..c57435b6ddbb67c979b6b6fc2aa249a78531e253 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorDto.java
index 1382baec51d8f3de1b048fafc8d8f564aecc6e4f..bc3e577ebc4df280cb19e84cc245c325d8f40f50 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/CreatorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/CreatorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -7,7 +7,6 @@ import lombok.*;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.extern.jackson.Jacksonized;
-import org.springframework.data.annotation.Id;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/DescriptionTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/DescriptionTypeDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/DescriptionTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/DescriptionTypeDto.java
index fb30ec3a3c3167e92223a9a46480513252aea06d..558b0005e88a1c78900d43a9111ccdba51067c24 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/DescriptionTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/DescriptionTypeDto.java
@@ -1,5 +1,5 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierBriefDto.java
similarity index 97%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierBriefDto.java
index 0434d1b21fe85c60b0596507e65e1bb7a67b3be9..e713b3a4b943302b37357531c4c13844561cd589 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDescriptionDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDescriptionDto.java
similarity index 85%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDescriptionDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDescriptionDto.java
index 32ff2455ccde07b8d8ce39ad674245d65dd21174..45173b503188c710b707cab7b049e68ad817bf94 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDescriptionDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDescriptionDto.java
@@ -1,12 +1,11 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import org.springframework.data.annotation.Id;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDto.java
index 0bc16d61cd9a1dc45c129184ec18cfb49ed0d754..2ae1ed21b6e9a3e69f7f9c6a279e4985b8618a82 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierDto.java
@@ -1,8 +1,8 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
-import at.tuwien.api.database.LicenseDto;
-import at.tuwien.api.user.UserBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LicenseDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderDto.java
index 4184f2cf2afade6121711cca63a629b047156120..4f73605540c197e3f259296d8e26486424e152cf 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -6,7 +6,6 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import org.springframework.data.annotation.Id;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderTypeDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderTypeDto.java
index b54e24f6c198b3658086ff6737fef0ea106fa036..85e54ec1e5b389b4b3c9b6607bbf6ef4a43b0556 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierFunderTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierFunderTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierSaveDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierSaveDto.java
index f63c3ae79cdc84c9c4ec85edb62917282e06c815..64aad71c36b06fe2dccbc68daa780a8e611955e8 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierSaveDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierSaveDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
-import at.tuwien.api.database.LicenseDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LicenseDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierStatusTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierStatusTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierStatusTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierStatusTypeDto.java
index 1148a55fba95bb60f53971f461995687f512ddab..8f5a885bcab85a3b335ce3952f41c38bf418e20e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierStatusTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierStatusTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTitleDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTitleDto.java
similarity index 84%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTitleDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTitleDto.java
index d995527d88d281e22f96b220cd0566e05811dbbc..790e1b93e1b6e7202372b936b38955b10fbad73a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTitleDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTitleDto.java
@@ -1,12 +1,11 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import org.springframework.data.annotation.Id;
import java.util.UUID;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTypeDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTypeDto.java
index 1f36335c385927b41c46c60dce2dafa33fc36fa8..95e8f3e8137c7c5f74482a39ba4ebf56eafc4454 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/IdentifierTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/IdentifierTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/LinksDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/LinksDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/LinksDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/LinksDto.java
index 4e9c309f23fa9c03313766fa7442565af8c1b148..19ebcc78a7ae5e22aff6b64767b5c8f770ea683e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/LinksDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/LinksDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameIdentifierSchemeTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameIdentifierSchemeTypeDto.java
similarity index 70%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameIdentifierSchemeTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameIdentifierSchemeTypeDto.java
index 3ea4c2d7f843e57ee819322a667403b60db3751f..0a7834b8e47f42679188ab555ff7610e30d03971 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameIdentifierSchemeTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameIdentifierSchemeTypeDto.java
@@ -1,5 +1,5 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameTypeDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameTypeDto.java
index 81215957c66d58c3f5032454952423173a8e77de..b7f21671ba10aeb40105b22162140f78cfa5650a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/NameTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/NameTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedIdentifierDto.java
similarity index 69%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedIdentifierDto.java
index 7205bc6e0b76e823bb3d2405aced77dd41b9adb5..24c7d616ac70f11fa6036122fb2f3e2830473923 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedIdentifierDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedIdentifierDto.java
@@ -1,17 +1,12 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.user.UserDto;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import jakarta.validation.constraints.NotNull;
import lombok.extern.jackson.Jacksonized;
-import org.springframework.data.annotation.Id;
-import java.time.Instant;
import java.util.UUID;
@Getter
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedTypeDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedTypeDto.java
index e8ab99a9234805ec361511da0451b01eef4ae41a..85ce2aabc71bce43514e6374feee031e6f66808d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelatedTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelatedTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelationTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelationTypeDto.java
similarity index 98%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelationTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelationTypeDto.java
index d95ce73d0090518f7fc9808b1a179ac3067a04ac..61c635a89f6b59c441da291b6a05fe323e82322c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/RelationTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/RelationTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierCreatorDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierCreatorDto.java
index 0866a5cb3b5dc36f7ad0484dddf860c7371816d9..ab7b02847d0176ef6662ac439e7d5c0d545dec0c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierCreatorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierCreatorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierDescriptionDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierDescriptionDto.java
index bc1ad4f3dfd98fbbbd4c2edc1d73f562cc1f0d23..a5d41577964a566ec316d376382b4b5fe128a348 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierDescriptionDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierDescriptionDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierFunderDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierFunderDto.java
index 1709c109b28a9aa3c57c10bcea1589d445d91c6c..60bf49f171aedeb54bfec06a801ae8513e236180 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierFunderDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierFunderDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierTitleDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierTitleDto.java
index 07ebc35e2ca6ce2458746ee9253dbf9dc296a337..f32337f04480a1aa626f3b1049bd8ecf74da1c44 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveIdentifierTitleDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveIdentifierTitleDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
-import at.tuwien.api.database.LanguageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.LanguageTypeDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveRelatedIdentifierDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveRelatedIdentifierDto.java
index d22c8216e366d602e119abe824af6f543a5fac8f..11af0c0062e17a6010fd730e2e6e9cc402d40c20 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/SaveRelatedIdentifierDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/SaveRelatedIdentifierDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/TitleTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/TitleTypeDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/TitleTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/TitleTypeDto.java
index d1540e782ad478f463f4da30afa2560ccd8037e1..e5a56887dc20ffe751f564249d644e8094cd5e9c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/TitleTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/TitleTypeDto.java
@@ -1,5 +1,5 @@
-package at.tuwien.api.identifier;
+package at.ac.tuwien.ifs.dbrepo.api.identifier;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdCreatorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdCreatorDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdCreatorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdCreatorDto.java
index 0bde2d2968b8bba6f6656056b31ddcf42f73753e..c8c4e0c6800e187c8acdd01c82ddff3959151a07 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdCreatorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdCreatorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier.ld;
+package at.ac.tuwien.ifs.dbrepo.api.identifier.ld;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdDatasetDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdDatasetDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdDatasetDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdDatasetDto.java
index bab1deb2d16dfa005c2a08273afc6fb8d33b8841..10119f7e71fe6bacdb44290858f7586b8c5e8c46 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/identifier/ld/LdDatasetDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/identifier/ld/LdDatasetDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.identifier.ld;
+package at.ac.tuwien.ifs.dbrepo.api.identifier.ld;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialDto.java
index 172b844e1bf4e6b3fd77ab1530a9a8578255d2c6..3bf106f8353f769ba8d96db6c0ecaad84c840ab6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialTypeDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialTypeDto.java
index c3d297604861a3ef3c2811c0399f61d1a5253068..12fbef9fd20640f71895038d98726a1e256757ed 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/CredentialTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/CredentialTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/ModifyUserDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/ModifyUserDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/ModifyUserDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/ModifyUserDto.java
index 26d700e798e1517ae484dc60e9359bd8b5646965..1fc599c5d0f74d5cc93f67c42c6d182beeae63e6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/ModifyUserDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/ModifyUserDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/RoleRepresentationDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/RoleRepresentationDto.java
index 8f7d795fdbb0a529fa4492c18f9028016e306d9e..10ae9089964fbe45c4819ae9768cd8ad22aec100 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/RoleRepresentationDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/RoleRepresentationDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/TokenDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/TokenDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/TokenDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/TokenDto.java
index dcd14c4d2a469b0bdfe88166aae9afba8048ba4c..540e795da64bc80d7d0765d8b1d3fa64c6616a34 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/TokenDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/TokenDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
-import at.tuwien.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UpdateCredentialsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UpdateCredentialsDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UpdateCredentialsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UpdateCredentialsDto.java
index c8bac04d455afa80bc061b7e391ed38e10f2edd1..9c1eb72f8496fde3ecfda99cac2a03e05642cd26 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UpdateCredentialsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UpdateCredentialsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserAttributesDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserAttributesDto.java
index 50718bc8034d500c2d707abacac58acf2bb95012..49e4e6e9385256ba619434f48c6a3c5d4ba812e6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserAttributesDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserAttributesDto.java
@@ -1,12 +1,10 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import java.util.UUID;
-
@Getter
@Setter
@Builder
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateAttributesDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateAttributesDto.java
similarity index 86%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateAttributesDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateAttributesDto.java
index 6df8ce5e8f733313e9c9f2534e6cef03adb0d5e5..707a8caa278b8eb1e3fe4f62a5147c09c032a68e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateAttributesDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateAttributesDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateDto.java
index 2a80811b6247cd18fde5b3eadea1921b1ab2c3a9..fc339b6a4efa841c7069574c76fc82f87f66e2ae 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserCreateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserCreateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserIdAttributesDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserIdAttributesDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserIdAttributesDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserIdAttributesDto.java
index 3155d75f027d2864f2a06ecf19376c13c9be7d35..ee1046d20e459a59c41b9f947f90faa545657a83 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/keycloak/UserIdAttributesDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/keycloak/UserIdAttributesDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.keycloak;
+package at.ac.tuwien.ifs.dbrepo.api.keycloak;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ldap/UserDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ldap/UserDto.java
index e6aec082263ebe4ebe2789a683264d06df43cc9b..e3be6be7bc4fe47d74654d7a982d7c2af7d4acab 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ldap/UserDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ldap/UserDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.ldap;
+package at.ac.tuwien.ifs.dbrepo.api.ldap;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageBriefDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageBriefDto.java
index a11c70f6219d1bd362775c50fedbefa5a9aa07f4..d99e8e7eac161e20735c1d7e03d1be1b0b78b021 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.maintenance;
+package at.ac.tuwien.ifs.dbrepo.api.maintenance;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageCreateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageCreateDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageCreateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageCreateDto.java
index f7466d3e2c1688756e61fd88364eba9373ec040d..1673bbe2674cfc5c62a3d1b968053350edd84f04 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageCreateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageCreateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.maintenance;
+package at.ac.tuwien.ifs.dbrepo.api.maintenance;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageDto.java
index d344ccd6b461460d77b7f865ab03e44d84fc6956..8ff6644fbbccd05f75745f9b3bdadb6343fbfa47 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.maintenance;
+package at.ac.tuwien.ifs.dbrepo.api.maintenance;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageTypeDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageTypeDto.java
index 9be93f41bcefdf4f5fe05c7e26a94d435619b184..75f5c6bef641c0f84e84ab8f9e9845f095c5b76c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.maintenance;
+package at.ac.tuwien.ifs.dbrepo.api.maintenance;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageUpdateDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageUpdateDto.java
index f6aad1989e3e5872b0edcc810878b8299cf7ce23..a88ac45ea05e26fc0ad5e9d127ea3ca9c80b52cd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/maintenance/BannerMessageUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/maintenance/BannerMessageUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.maintenance;
+package at.ac.tuwien.ifs.dbrepo.api.maintenance;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/OrcidDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/OrcidDto.java
similarity index 68%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/OrcidDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/OrcidDto.java
index c4ea89b005df0f5506e91b2bcc428c95a173bc7f..d75058a687ad6d2ec24c2a38fe06f965fd2c6274 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/OrcidDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/OrcidDto.java
@@ -1,7 +1,7 @@
-package at.tuwien.api.orcid;
+package at.ac.tuwien.ifs.dbrepo.api.orcid;
-import at.tuwien.api.orcid.activities.OrcidActivitiesSummaryDto;
-import at.tuwien.api.orcid.person.OrcidPersonDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.OrcidActivitiesSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.person.OrcidPersonDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/OrcidActivitiesSummaryDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/OrcidActivitiesSummaryDto.java
similarity index 67%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/OrcidActivitiesSummaryDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/OrcidActivitiesSummaryDto.java
index 625611abd27a28864b310354936f9d167adee12f..c384e846d2d9cd0b4856de6f0ba99730bdcb90a8 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/OrcidActivitiesSummaryDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/OrcidActivitiesSummaryDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities;
-import at.tuwien.api.orcid.activities.employments.OrcidEmploymentsDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.OrcidEmploymentsDto;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/OrcidEmploymentsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/OrcidEmploymentsDto.java
similarity index 67%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/OrcidEmploymentsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/OrcidEmploymentsDto.java
index dea853b62bc3680e8bcefcedb50f85aa567b2c74..823c88ae2b8ca89b3b47d398592f1518ac985382 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/OrcidEmploymentsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/OrcidEmploymentsDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities.employments;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments;
-import at.tuwien.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java
similarity index 58%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java
index a82a88869bb076791a85e8a9a51f45afb8e3a937..6882badd5f5cb2fd03ce75d931f9530393c1c188 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/OrcidAffiliationGroupDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities.employments.affiliation;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java
similarity index 64%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java
index 984dc8a6d07fe69b00a49636268e4334f3037678..60eed0e5d2102a235d0b2b99771da0d042e664bc 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/OrcidEmploymentSummaryDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities.employments.affiliation.group;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java
similarity index 70%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java
index 1377a73dba186cab8fafcda307643ae62144a601..64856f355dfa06d84b70cbd35fab80db0014c056 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/OrcidSummaryDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities.employments.affiliation.group.summary;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java
similarity index 61%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java
index 149af1b3e693c2bd2da2e2f3decb102ee878e2d0..d8303aef2e394fd8d60c90299d719dffef22bdb0 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/OrcidOrganizationDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated.OrcidDisambiguatedDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java
similarity index 79%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java
index c5ed53e37ff2ddab6a79e76465578d306ce50952..e6c60e9b740cd4b64b72aa34d83c7f575c4c3331 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..1ba420ad9810759d01889b30959d3bc30f44b6ce
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/activities/employments/affiliation/group/summary/organization/disambiguated/OrcidDisambiguatedSourceTypeDto.java
@@ -0,0 +1,6 @@
+package at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.disambiguated;
+
+public enum OrcidDisambiguatedSourceTypeDto {
+ RINGGOLD,
+ ROR
+}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/OrcidPersonDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/OrcidPersonDto.java
similarity index 66%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/OrcidPersonDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/OrcidPersonDto.java
index f7de2794d721f283514562dfd8abecd687c229e5..62ca759f03782c6d590a878ac0ffc497107db7cf 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/OrcidPersonDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/OrcidPersonDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.orcid.person;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.person;
-import at.tuwien.api.orcid.person.name.OrcidNameDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.person.name.OrcidNameDto;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidNameDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidNameDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidNameDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidNameDto.java
index 44c2ac0e6bdcc58229b0189709adc20729697669..81765d9b65a1a1bcd12dac449091d070e9d18146 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidNameDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidNameDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.orcid.person.name;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.person.name;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidValueDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidValueDto.java
similarity index 80%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidValueDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidValueDto.java
index 251a39c23c3cd8d7dd4eb013461b530e76305647..9194a6247fef503ce9c47e36d0df38a44767e041 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/orcid/person/name/OrcidValueDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/orcid/person/name/OrcidValueDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.orcid.person.name;
+package at.ac.tuwien.ifs.dbrepo.api.orcid.person.name;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ror/RorDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ror/RorDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ror/RorDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ror/RorDto.java
index 8e9407885ca4f7e31994836a5664025ce7d499bb..22cde2d7735fafede44220fa38108dbe2213e377 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/ror/RorDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/ror/RorDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.ror;
+package at.ac.tuwien.ifs.dbrepo.api.ror;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/EntityDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/EntityDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/EntityDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/EntityDto.java
index 5c1d6cc13a05b7a2c6887139bc88db6e9b314423..30142ad9fcfb936579a4c40af8e48767fc93bdbd 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/EntityDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/EntityDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyBriefDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyBriefDto.java
index 29d5116a70bfe3b59c1223534616eebb80b9c57e..be02f87bbd897e5cdf984467ee897c3228bb5a3b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyCreateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyCreateDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyCreateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyCreateDto.java
index 1e2cf441674dc7a32ae608472e1e44247e3a0664..2ee4270167ad53808f4efde25832aae0d64f76f5 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyCreateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyCreateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyDto.java
index a3e7c46d014d5de6c06ec5ed3608f51cb8700de3..10d2811d709c2f8089789dd898385b5252543820 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyDto.java
@@ -1,7 +1,6 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
-import at.tuwien.api.user.UserBriefDto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserBriefDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
@@ -9,7 +8,6 @@ import jakarta.validation.constraints.NotNull;
import lombok.*;
import lombok.extern.jackson.Jacksonized;
-import java.time.Instant;
import java.util.UUID;
@Getter
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyModifyDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyModifyDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyModifyDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyModifyDto.java
index f003790922ad28f5f583dfbf51303d545034be27..96219dca2b3993721f2920d3846920b03ec87302 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/OntologyModifyDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/OntologyModifyDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/TableColumnEntityDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/TableColumnEntityDto.java
index f4a2147a29cbdb1f0ee7aa03a26fa500eb370d91..84e39722a66b8abd09317184fe73b979986e8e26 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/semantics/TableColumnEntityDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/semantics/TableColumnEntityDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.semantics;
+package at.ac.tuwien.ifs.dbrepo.api.semantics;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/ExchangeUpdatePermissionsDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/ExchangeUpdatePermissionsDto.java
index f545f6204187a66a1c8942cb5e8a3eef9d73ae65..ff3ba42b90ab8b037d441732c9b14d35e5dfe900 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/ExchangeUpdatePermissionsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/ExchangeUpdatePermissionsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/GrantedAuthorityDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/GrantedAuthorityDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/GrantedAuthorityDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/GrantedAuthorityDto.java
index 07e0029a716b1d4414b1c10c71b4ad6bcb11ae4a..54922ad1cb8163da5276a66e7597b4238afaeaea 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/GrantedAuthorityDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/GrantedAuthorityDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/RoleTypeDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/RoleTypeDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/RoleTypeDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/RoleTypeDto.java
index 9e5e4b7bddc9d5628c59658f0efab5cffca7e87d..b0841c3e7bf5691f50f531df8cd720e1506b91a7 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/RoleTypeDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/RoleTypeDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserAttributesDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserAttributesDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserAttributesDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserAttributesDto.java
index ef9bae650c9c8615c9f7c43198dd61285aa2ce41..4f55c0f23838d120d8387d38d34fa832e36de596 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserAttributesDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserAttributesDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserBriefDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserBriefDto.java
similarity index 96%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserBriefDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserBriefDto.java
index d245bbaf4c46584b9f0cd93fa7b43c2b31ef6333..243e60d9539f306f37670713acdac076eee559eb 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserBriefDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserBriefDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDetailsDto.java
similarity index 95%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDetailsDto.java
index 2ab170d616c75c40d4be36af42854d518d3ec7c5..4885182d45fdc2dabc0504176e827975230bc27b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDetailsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDetailsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDto.java
similarity index 93%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDto.java
index e7367e2fb4e513a9681783dfdec89b55e57519e0..ccbda5e4d55ca1ed1ec69b6ae33c130c20724d44 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
-import at.tuwien.api.CacheableDto;
+import at.ac.tuwien.ifs.dbrepo.api.CacheableDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserEmailDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserEmailDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserEmailDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserEmailDto.java
index caaf33249710f14c7c49540aa8dd2afe0a18e0c3..af63a34632bb824e2cc3121662f8d6f576c3f40b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserEmailDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserEmailDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Email;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserForgotDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserForgotDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserForgotDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserForgotDto.java
index 5ebcbae7429c335c122c62e58644b739d8fc90ea..2e57299fc10da0312744f36413dbfe519cd3b137 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserForgotDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserForgotDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Email;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserModifyPasswordDto.java
similarity index 91%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserModifyPasswordDto.java
index 2b86672cc2704886a287912ff39c70eba63f1904..b0dd8a0b8d73b00fed8dfa78a777832982315452 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserModifyPasswordDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserModifyPasswordDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserPasswordDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserPasswordDto.java
index dcf53932840057f6916b8ac281eae9031a40677e..5ee021f1e0355b1156a6f62bc00589132e0db046 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserPasswordDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserPasswordDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserResetDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserResetDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserResetDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserResetDto.java
index 6cac59a904c529b1aa226b788bff427092e5bb1f..633f5eb6dace214bc90464d3d56693ad94c80a0d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserResetDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserResetDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserRolesDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserRolesDto.java
similarity index 88%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserRolesDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserRolesDto.java
index 5667f38ec6c6f639981376292af5d16cda58b866..ae66c63b4751b3e4992d48a5eb9d6ae15460df43 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserRolesDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserRolesDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import jakarta.validation.constraints.NotNull;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserThemeSetDto.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserThemeSetDto.java
index 3f5b899df8777459e4df5faa86dccad01d6ac703..66f423f9f884afcf7fcc5f0e09d89b96f2dd026b 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserThemeSetDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserThemeSetDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdateDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdateDto.java
similarity index 94%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdateDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdateDto.java
index 68d674a7c2287dbd747969d3ad58cdf303cd2bf6..9a37802b8f5803332c57f31ceedf3af50bd0b53e 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdateDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdateDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdatePermissionsDto.java
similarity index 90%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdatePermissionsDto.java
index 99f1eab30af6dc537ae767adb4e5e8cc8a1f5048..479dff036aa7f86d21b504cefa44e94139eb0f87 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/UserUpdatePermissionsDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/UserUpdatePermissionsDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user;
+package at.ac.tuwien.ifs.dbrepo.api.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalMetadataDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalMetadataDto.java
similarity index 79%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalMetadataDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalMetadataDto.java
index fb40af09487d8b65a2efabb0cb18d46e317484bb..1382ab367bf5d62e72300b15a5601165e7e7af9f 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalMetadataDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalMetadataDto.java
@@ -1,6 +1,6 @@
-package at.tuwien.api.user.external;
+package at.ac.tuwien.ifs.dbrepo.api.user.external;
-import at.tuwien.api.user.external.affiliation.ExternalAffiliationDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.external.affiliation.ExternalAffiliationDto;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalResultType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalResultType.java
similarity index 89%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalResultType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalResultType.java
index 1a8d73b47cecc87a27354298a4ca4077eb1bc573..d897b258430a217e707646e5cb10a55044c4f926 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/ExternalResultType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/ExternalResultType.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user.external;
+package at.ac.tuwien.ifs.dbrepo.api.user.external;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/affiliation/ExternalAffiliationDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/affiliation/ExternalAffiliationDto.java
similarity index 92%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/affiliation/ExternalAffiliationDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/affiliation/ExternalAffiliationDto.java
index d8d30894bcb443a5bfb33426c01f3910bd4ee9b2..c354edc34124c806965ae5ba70ad3a1a37dec890 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/external/affiliation/ExternalAffiliationDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/external/affiliation/ExternalAffiliationDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user.external.affiliation;
+package at.ac.tuwien.ifs.dbrepo.api.user.external.affiliation;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/internal/UpdateUserPasswordDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/internal/UpdateUserPasswordDto.java
similarity index 87%
rename from dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/internal/UpdateUserPasswordDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/internal/UpdateUserPasswordDto.java
index c89e795bd367739c5b9d371e73c0191fa6758842..f2a52d59bf7f998f7e1141e9a5cafa6c11dd738c 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/user/internal/UpdateUserPasswordDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/api/user/internal/UpdateUserPasswordDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.api.user.internal;
+package at.ac.tuwien.ifs.dbrepo.api.user.internal;
import jakarta.validation.constraints.NotBlank;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/Container.java
similarity index 93%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/Container.java
index f36c6ced7431c4017cbe2660d707be20c0c9d5cb..e81ef5942ade7555819f2250dcdfe8fbfd74f14d 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/Container.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/Container.java
@@ -1,7 +1,7 @@
-package at.tuwien.entities.container;
+package at.ac.tuwien.ifs.dbrepo.entity.container;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.entities.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/ContainerImage.java
similarity index 95%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/ContainerImage.java
index 336a278d7d8ff6f2f4d2b56ebbde1f156e198659..2c0bc705c697ce3b8a08c49a26288945dd5c7a7d 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/ContainerImage.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.container.image;
+package at.ac.tuwien.ifs.dbrepo.entity.container.image;
-import at.tuwien.entities.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/DataType.java
similarity index 97%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/DataType.java
index 347ca47e960e74f846eea32b3ddc166e3a0efc0e..e623680a7cd9f0f12381cb83d7c318ebfce191a3 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/DataType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.container.image;
+package at.ac.tuwien.ifs.dbrepo.entity.container.image;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/Operator.java
similarity index 95%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/Operator.java
index adeb6dd8ef7c977222021d3c1b0fdb54fb304a17..b07c2ff714511b30299f250608b533343701be06 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/Operator.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/container/image/Operator.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.container.image;
+package at.ac.tuwien.ifs.dbrepo.entity.container.image;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/AccessType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/AccessType.java
similarity index 72%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/AccessType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/AccessType.java
index 7260d00e3d1eee65327c27a2b45efeaf5e71f139..00baac63495d646a1d2c5cf41bf85a50e6d6a746 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/AccessType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/AccessType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
import lombok.Getter;
import lombok.ToString;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/Database.java
similarity index 95%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/Database.java
index 1c1821c63eee6109859a92cbef21d166c6e1fad6..7a22597fb9363b6d753ef5e44a78a3bc5ac03418 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/Database.java
@@ -1,9 +1,8 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
@@ -18,8 +17,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder(toBuilder = true)
@@ -104,7 +101,7 @@ public class Database implements Serializable {
@OrderBy("id DESC")
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
- private List<Table> tables;
+ private List<at.ac.tuwien.ifs.dbrepo.entity.database.table.Table> tables;
@OrderBy("id DESC")
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccess.java
similarity index 89%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccess.java
index e5f7dd3012d9d5b510f7e072dfadf255297e4a8e..57cdb36cba56ef89539abebc5cf50e9565b157c7 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccess.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccess.java
@@ -1,14 +1,11 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
-import at.tuwien.entities.user.User;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
-import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import java.time.Instant;
import java.util.UUID;
@Data
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccessKey.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccessKey.java
similarity index 81%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccessKey.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccessKey.java
index b6963c290c38186fc7d78af149b07622804e7301..6e078dad1acbd26d9ab25894bfd6b57fe67bbfd1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/DatabaseAccessKey.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/DatabaseAccessKey.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
import lombok.EqualsAndHashCode;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/LanguageType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/LanguageType.java
similarity index 98%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/LanguageType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/LanguageType.java
index df9081ea2fbfc81cde943e23804400e4a2853e8d..884b695cb73b94e0c3674fd50aceb25f4fbf70b2 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/LanguageType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/LanguageType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/License.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/License.java
similarity index 92%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/License.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/License.java
index 4d43a3ba042c6fcffcc5ee52cf4f8fd884db49ff..bb1901bd8e3b1c12ee4bfb3486b94d5e0b4d35b4 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/License.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/License.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
import lombok.*;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/View.java
similarity index 96%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/View.java
index 8f84a8f066d577e6ba009f6ffbc4ff144d671fc8..bcce570754dc56ac4e3da0f699a27279fd81e7d3 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/View.java
@@ -1,7 +1,7 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/ViewColumn.java
similarity index 94%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/ViewColumn.java
index 4fb7ace10d6cc2b4bea5b0134778b71ee015fa96..5a7d595745e419e86cdf8bc0840d0354b14e4e95 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/ViewColumn.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.database;
+package at.ac.tuwien.ifs.dbrepo.entity.database;
-import at.tuwien.entities.database.table.columns.TableColumnType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnType;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/Table.java
similarity index 91%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/Table.java
index 1e2aa72b924cdd6c1a37aa5c98f64728ba92fc20..38da4ffbba0c3de6bbe136d123cbf91bbf444dd6 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/Table.java
@@ -1,10 +1,10 @@
-package at.tuwien.entities.database.table;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.constraints.Constraints;
-import at.tuwien.entities.identifier.Identifier;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.Constraints;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.Identifier;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
@@ -21,8 +21,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnEnum.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnEnum.java
similarity index 89%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnEnum.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnEnum.java
index 99002c812970c355b27ead84e2f6ad3626ec2132..2fa054469eced3941eee545de9413fbe4be1314a 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnEnum.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnEnum.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
import jakarta.persistence.*;
import lombok.*;
@@ -6,8 +6,6 @@ import org.hibernate.annotations.JdbcTypeCode;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder(toBuilder = true)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnSet.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnSet.java
similarity index 89%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnSet.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnSet.java
index 036c0202db40719227b90e6be6f30a8157a5e0fd..ce8cdc8be788f3f6fc6ca20a646d467fd91ca4a7 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/ColumnSet.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/ColumnSet.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
import jakarta.persistence.*;
import lombok.*;
@@ -6,8 +6,6 @@ import org.hibernate.annotations.JdbcTypeCode;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder(toBuilder = true)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumn.java
similarity index 96%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumn.java
index eefa648dfd2aea752e1fd8a5944ea3fe51c234c3..3a6b8e8f55a2ec76ac007ef06f06f54569f04e26 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumn.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
-import at.tuwien.entities.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
@@ -16,8 +16,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder(toBuilder = true)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnConcept.java
similarity index 95%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnConcept.java
index edf39d84e36a41fdf9d783fb3c5fdaea4fd920cf..a192473a71187dc5ad40998e063adb207cf76066 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnConcept.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
@@ -11,8 +11,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnType.java
similarity index 88%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnType.java
index 3a287123f8c1b29fab15c0adfc61017906f49bc4..5ba076b64c2fb5163a940b36aa748a3e24cd58e0 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
import lombok.Getter;
import lombok.ToString;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnUnit.java
similarity index 95%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnUnit.java
index 9d48062d33a3489892fee857b0c06440336e362c..297ce92618e79f71a014318a1552e5c3935fa45c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/columns/TableColumnUnit.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.columns;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.columns;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
@@ -11,8 +11,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/Constraints.java
similarity index 72%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/Constraints.java
index 2676eaf3e1843c395c2d4e08b24020661398d5ce..10174e03697476e00b4ef4b53b9d7abed213b9c8 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/Constraints.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/Constraints.java
@@ -1,8 +1,8 @@
-package at.tuwien.entities.database.table.constraints;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
-import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
-import at.tuwien.entities.database.table.constraints.unique.Unique;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey.PrimaryKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique.Unique;
import lombok.*;
import jakarta.persistence.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKey.java
similarity index 92%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKey.java
index 92271b32328ed66215311389de57413b722d5ebe..8aec4443fff00dfa157aac3c5fcd43b0a22e952c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKey.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKey.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.database.table.constraints.foreignKey;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey;
-import at.tuwien.entities.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKeyReference.java
similarity index 89%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKeyReference.java
index 850b25ac5ca3d156600c5c0b5be92663c33f2cca..b8349c200cd9d8c08c0291f5bcd66ba0f1cd951c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ForeignKeyReference.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.database.table.constraints.foreignKey;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey;
-import at.tuwien.entities.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
@@ -8,8 +8,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ReferenceType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ReferenceType.java
similarity index 68%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ReferenceType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ReferenceType.java
index 88be5c81aa918ec6c310bb5ed98eaec3842483f6..f9fec8cf926d7507a80b3cb58129230eccb444de 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ReferenceType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/foreignKey/ReferenceType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.database.table.constraints.foreignKey;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey;
import lombok.Getter;
import lombok.ToString;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/primaryKey/PrimaryKey.java
similarity index 86%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/primaryKey/PrimaryKey.java
index 26e0f132991a5b8bf7a1b2f572575f8f6a48820f..1dbe4e4ffbfe303920c63e7a99003f9624509c8c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/primaryKey/PrimaryKey.java
@@ -1,7 +1,7 @@
-package at.tuwien.entities.database.table.constraints.primaryKey;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/unique/Unique.java
similarity index 88%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/unique/Unique.java
index e1ad4c4c4d167bf5ccf21b33d5a22e67d424d988..173dd33c7561673687ca278f3cb0798af50bc709 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/database/table/constraints/unique/Unique.java
@@ -1,7 +1,7 @@
-package at.tuwien.entities.database.table.constraints.unique;
+package at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/AffiliationIdentifierSchemeType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/AffiliationIdentifierSchemeType.java
similarity index 68%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/AffiliationIdentifierSchemeType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/AffiliationIdentifierSchemeType.java
index 0d794ff431005a17a34294b19816ea84cc6e3ab6..016cc2d4b117ba5b50f682ad8d456f182304b96f 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/AffiliationIdentifierSchemeType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/AffiliationIdentifierSchemeType.java
@@ -1,5 +1,5 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Creator.java
similarity index 96%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Creator.java
index cdbcf797773cc2d7e9d7dbdecb6dc0fcb0d6afae..109ed5e865481d5c99c485bef550a410a520e09a 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Creator.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Creator.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import jakarta.persistence.*;
import lombok.*;
@@ -7,8 +7,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/DescriptionType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/DescriptionType.java
similarity index 89%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/DescriptionType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/DescriptionType.java
index 4f979674260ae628ee199478976c8f46a5e20313..71b8241fcd2b59cf57de272f8ae68942ff271d3c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/DescriptionType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/DescriptionType.java
@@ -1,5 +1,5 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Identifier.java
similarity index 96%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Identifier.java
index 43dbb849e341c7aba5dbfc4a3097115ef1ce378b..f8e16ef7bfad94766b726749333f7fb23e57ba27 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/Identifier.java
@@ -1,9 +1,9 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
-import at.tuwien.entities.database.Database;
-import at.tuwien.entities.database.LanguageType;
-import at.tuwien.entities.database.License;
-import at.tuwien.entities.user.User;
+import at.ac.tuwien.ifs.dbrepo.entity.database.Database;
+import at.ac.tuwien.ifs.dbrepo.entity.database.LanguageType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.License;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
import com.fasterxml.jackson.annotation.JsonFormat;
import jakarta.persistence.*;
import lombok.*;
@@ -17,8 +17,6 @@ import java.time.Instant;
import java.util.List;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder(toBuilder = true)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierDescription.java
similarity index 93%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierDescription.java
index 32adddccfc7c73750a1fd516edc6c4638d150739..345939723214348aff9eeec605ce5659a374d6f9 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierDescription.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierDescription.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
-import at.tuwien.entities.database.LanguageType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.LanguageType;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
@@ -9,8 +9,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.io.Serializable;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunder.java
similarity index 93%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunder.java
index 5b69b2e8f70a947dad40460609b0ee5ffc530dfa..1f70b31d1c61074c9e199ca9155f08163ab7eb21 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunder.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunder.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import jakarta.persistence.*;
import lombok.*;
@@ -8,8 +8,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.io.Serializable;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunderType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunderType.java
similarity index 66%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunderType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunderType.java
index ea538dcbfbc062884c19cfc4998e33c114f189d9..8e6abe9ab4d788ed3c02ebc72d750de9439abd6c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierFunderType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierFunderType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
public enum IdentifierFunderType {
CROSSREF_FUNDER_ID,
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierStatusType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierStatusType.java
similarity index 64%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierStatusType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierStatusType.java
index f056c3e723957431306082b5c2c3ae7e132eb164..96d27340330ccea99bd3a4d882f90ad1b1e7387b 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierStatusType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierStatusType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierTitle.java
similarity index 93%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierTitle.java
index 769ff12a678a9f18d10f877e29461585f5cd2b59..6241cd98ebe243da0dcb18cdd08f334b68a133a7 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierTitle.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierTitle.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
-import at.tuwien.entities.database.LanguageType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.LanguageType;
import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.JdbcTypeCode;
@@ -9,8 +9,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.io.Serializable;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierType.java
similarity index 68%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierType.java
index 58b2fcf69989f8f56cfa1dd25193012571712fc1..748efbc83438c7a3337fc2f50c81a108fa99939f 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/IdentifierType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/IdentifierType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameIdentifierSchemeType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameIdentifierSchemeType.java
similarity index 68%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameIdentifierSchemeType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameIdentifierSchemeType.java
index 6a7eb73a12a15cfd7360cfe7e3034349caa0b75f..b8c5c883c95b8b2bc4d4fd30ba5e17cdd35b222e 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameIdentifierSchemeType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameIdentifierSchemeType.java
@@ -1,5 +1,5 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameType.java
similarity index 63%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameType.java
index b44da71a59ae3d425741f9e4a875d6e91de0ab58..f068c63f753de5d8d9e3f395652a8ed7f484a35c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/NameType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/NameType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedIdentifier.java
similarity index 97%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedIdentifier.java
index 24ac7adb1fe1fabd49491a320b29256f8178a0de..52c2d5a24adaf181b36fa336c39da0762ef675db 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedIdentifier.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import jakarta.persistence.*;
import lombok.*;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedType.java
similarity index 91%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedType.java
index feacfb03c2f233e8f726a880fc1973a80090b331..e58d21b73d03d9b0664efb7f614ce61c65d75ada 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelatedType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelatedType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
public enum RelatedType {
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelationType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelationType.java
similarity index 96%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelationType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelationType.java
index 5bcfb14111c18f389bb44391cc3de814cd889554..ea272d6a64dbb190ad84528d361cb18b8c0105c4 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/RelationType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/RelationType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
public enum RelationType {
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/TitleType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/TitleType.java
similarity index 87%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/TitleType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/TitleType.java
index caf3ae65536af9ebde87a56be72fb77bcb7a95b6..5fa91e1498922fb3679a25e23bd8ca8ebd986ac1 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/identifier/TitleType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/identifier/TitleType.java
@@ -1,5 +1,5 @@
-package at.tuwien.entities.identifier;
+package at.ac.tuwien.ifs.dbrepo.entity.identifier;
import lombok.Getter;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessage.java
similarity index 93%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessage.java
index 8a5f2d76a3d4b73f89d7223af8df88c7ac7efdb9..891f7dc1416dced3a3c0b7d527cc2b64b52ccac8 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessage.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.maintenance;
+package at.ac.tuwien.ifs.dbrepo.entity.maintenance;
import jakarta.persistence.*;
import lombok.*;
@@ -8,8 +8,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.time.Instant;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessageType.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessageType.java
similarity index 71%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessageType.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessageType.java
index cbd793f7140d5a60bddd500dcdb58de17dcf1745..71a3342c4c4b2d31925b6b2c00569e85014dfb28 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessageType.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/maintenance/BannerMessageType.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.maintenance;
+package at.ac.tuwien.ifs.dbrepo.entity.maintenance;
import lombok.Getter;
import lombok.ToString;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/semantics/Ontology.java
similarity index 94%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/semantics/Ontology.java
index 664b284c3d087250fee1623a624f77305e19c1eb..0ace319c0643ca95e3058af1f1254040f149f3a7 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/semantics/Ontology.java
@@ -1,4 +1,4 @@
-package at.tuwien.entities.semantics;
+package at.ac.tuwien.ifs.dbrepo.entity.semantics;
import jakarta.persistence.*;
import lombok.*;
@@ -10,8 +10,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import java.time.Instant;
import java.util.UUID;
-import static jakarta.persistence.GenerationType.IDENTITY;
-
@Data
@Entity
@Builder
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/user/User.java
similarity index 94%
rename from dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/user/User.java
index 44d36e5e03c1e38a3fd9ecd807abce21116eb768..abc6de1a52bb02170ee96e44c30a81d2ee51c426 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/user/User.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/entity/user/User.java
@@ -1,6 +1,6 @@
-package at.tuwien.entities.user;
+package at.ac.tuwien.ifs.dbrepo.entity.user;
-import at.tuwien.entities.database.DatabaseAccess;
+import at.ac.tuwien.ifs.dbrepo.entity.database.DatabaseAccess;
import jakarta.persistence.*;
import lombok.*;
import lombok.extern.log4j.Log4j2;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccessNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccessNotFoundException.java
index d308361ae1be8b203212fe460a7098234ccc1e87..8b5f6ade2f92505f4e152d32ae1c247ae7b1a073 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccessNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccountNotSetupException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccountNotSetupException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccountNotSetupException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccountNotSetupException.java
index 395e63d4239337b4dc58e3ad1ee3945b46900f4f..35648b619f8373344d964f9f44408a98295701cc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccountNotSetupException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AccountNotSetupException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AnalyseServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AnalyseServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AnalyseServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AnalyseServiceException.java
index 44cd0d3dc812b8ac2ff2aa8e19ea022a6c93113e..082d828ecfbb6c659630cb7352aa30b83dc1ed50 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AnalyseServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AnalyseServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceConnectionException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceConnectionException.java
index 08cb54f9de186033e1513c270e4461c5638db9d0..26b38feb87309d2f1ce6f89811c1674b674cf9ba 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceException.java
index de43ce1cbefab60f6e56d4aa942d107c921f7291..ceb80dd3a410acdfcd153d72a1e5dc95385a5611 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AuthServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/AuthServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceConnectionException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceConnectionException.java
index 6efa16fa8757fbfcf218f09f0750a500d40161b3..c5a9bf2078e33859df4f3368ab3b77f34d35707f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceException.java
index 86201c5d691bdede33bca6bef2606125b29775de..0d47571f1dd04d155954c83fbd871bfd8b510244 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/BrokerServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ConceptNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ConceptNotFoundException.java
index 33e093ae5af1a12fe642934139ac23fc50a8d133..c3c7dc918bb3cba18217970dd175b2b875b81814 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ConceptNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerAlreadyExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerAlreadyExistsException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerAlreadyExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerAlreadyExistsException.java
index f27ea0aa19bc91e324ec783e819b52fa2a9c188c..c2f91177c7442d34b910fc1d48fb634a0807388d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerAlreadyExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerNotFoundException.java
index 0d17faafab86f9591a573a337b1d598a03cc7f7d..8bda8f5d0ee746619f1747af607c463e8ef062ca 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerQuotaException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerQuotaException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerQuotaException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerQuotaException.java
index 6679775f00473632a2e2e28cd17f3d3303edd0a6..c7238c758701c451dab041c4324c545cf7198cb3 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerQuotaException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ContainerQuotaException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/CredentialsInvalidException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/CredentialsInvalidException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/CredentialsInvalidException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/CredentialsInvalidException.java
index 984c70f4857262c158a7fc15075376aa8e425186..1639c284f092f1c6d08e3e4c0625efab397f6964 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/CredentialsInvalidException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/CredentialsInvalidException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceConnectionException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceConnectionException.java
index ede02a2070c49b9567bde7369421111675bf7f2b..2319a5a38136bda997c4eb9696b2e1c5331bd30b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceException.java
index 98d84042eb8c320b0528da0dafc97c3336e0013c..a3b27235cf6f2f8620f29ff92c4f1d6d3ee17773 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DashboardServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DashboardServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceConnectionException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceConnectionException.java
index 0125a781add4e384e43ec87690b0f8afaeb30c92..d2f0669f6d397e37e8a21bc76dd0513efe508f53 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceException.java
index f76e662a655593ffe5991ec84da207b58df052b2..5c53b364c65f2d6e65894e9c7217212448331b62 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DataServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseMalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseMalformedException.java
index 4bdc362256cc6a8778649a3a22f0aa2ca72761ae..223b90c6ae1c803503dece440556a1697bebf90a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseMalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseNotFoundException.java
index c50349f33bd3f5df80f163ecddd9b9e43569416f..33afcef14f02379175476a62c049096aea475070 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseUnavailableException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseUnavailableException.java
index 12c13d0754070f7b8eb425442e6dbc7e53023e51..966186025e9c6a7590f800650a6106f88f2e2beb 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseUnavailableException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DatabaseUnavailableException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DoiNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DoiNotFoundException.java
index 3b8e1732cce6b8b7e8f1c2f8e9a138f074bb1682..5f7b7a40bcd468762e36e759801383b00e638542 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/DoiNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/EmailExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/EmailExistsException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/EmailExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/EmailExistsException.java
index 4ce6c9b0ba51cfbd9f438069266785eb123bdf1b..e2bad430c0f8047c339b48d8ce9a939e43f6ad69 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/EmailExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/EmailExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExchangeNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExchangeNotFoundException.java
index 251f09081e6ea9fc0ed09c14dfbe01eb60a4d69a..fd5000756db6298820c1e0733ebf5eb45689a20c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExchangeNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExternalServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExternalServiceException.java
index d5f399c40205b886607f5fc1c22d17d9b159f6e4..7d0f9a2877fcdbecd39bf822520e7b590b9509e6 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExternalServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ExternalServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FilterBadRequestException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FilterBadRequestException.java
index 88689409aebad584a02b69db0639379788ee9536..1d5054554f8fcdd4f4417b337234ede272143b3a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FilterBadRequestException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FormatNotAvailableException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FormatNotAvailableException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FormatNotAvailableException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FormatNotAvailableException.java
index 2681e8d442cf873eef9d07497f4b18cfb6a4c5fe..e66f19d3d4c91585bc906ce92031cd013066cbcc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FormatNotAvailableException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/FormatNotAvailableException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotFoundException.java
index dee6a000352dd6c501f539b38bb5be34b50ede7a..ec9640097d28075e87ebcc31a952f03eb84bab01 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotSupportedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotSupportedException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotSupportedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotSupportedException.java
index 23b26ac6d674b2e0e306787f5cebd2e91c01904d..715cc12ca03633719e0c33b169b5daf14cad5594 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotSupportedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/IdentifierNotSupportedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageAlreadyExistsException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageAlreadyExistsException.java
index 2db757ed21db3a0d022f1e85a23762c280974a39..29d375f088bd665537200085d074684014a21de3 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageInvalidException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageInvalidException.java
index 401b587aedf5b5665315e76c7a4615ea65a19f82..9da867c2140e052a8a384598c3aedb0299fcb876 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageInvalidException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageNotFoundException.java
index a0235cc7536c3e23a25093bb638c1eee64fd543d..ac63df1307d0eb67b3d82f97205146fa92e54b04 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ImageNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/LicenseNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/LicenseNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/LicenseNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/LicenseNotFoundException.java
index fec3ad4128788ea8bd6700d979eada0afbb837e7..e48ad40c7d3377991d8cfa27759f4d969a8148fa 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/LicenseNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/LicenseNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MalformedException.java
index 974c2dadd6563cdf84799fbe661978ccf89a1c7c..e271b15c2e3d5ccdb8a01a4d84dc4ed4ff02e850 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MessageNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MessageNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MessageNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MessageNotFoundException.java
index 90905905514396c90a6c64b1131269d8660ca56b..6cbb5435ad0b28384ffc388297816a6ea47e6fd7 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MessageNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MessageNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceConnectionException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceConnectionException.java
index 329de6ffc4b82b859da0ea41aca7ed99a3b1802c..ce85b7d6fcec4c654628a9dd3ab816d935d9bc07 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceException.java
index a6784d6dd01ed0c60379246373b26d3c49a8875d..8e87db03c2389fefd090c3e17b645e8a8530e0c5 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/MetadataServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/MetadataServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/NotAllowedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/NotAllowedException.java
index 52a2867b017fa3a141b7dc573e47e9d0c010de53..e4324ea595c40452729e6babf9a6f3a9b397bc4d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/NotAllowedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OntologyNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OntologyNotFoundException.java
index 5f15403d67a48d7ed28d04f4f80776d9e3c3ce4d..a8641d74ec3e4f533a2c6cbbe168275c7bc7fb8e 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OntologyNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OrcidNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OrcidNotFoundException.java
index cf1ad7c067dcd8e9423507df45b0dc78458fa4ae..533735f15244687a313668cea0932540e2afc68a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/OrcidNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/PaginationException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/PaginationException.java
index 5d71d0c4046b2cf8b29800efb41c0d0d6dfef1aa..500d33a117eb6ea38175ebc970ce55aaea1c0f2a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/PaginationException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryMalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryMalformedException.java
index 0782bc3269d3e3457d0d54215a5699db360fc2d3..37e8cb7e34ab873327957c2457534c79ea655732 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryMalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotFoundException.java
index 631fb1f0d832d22d2966f3e44c1db05c18166fea..ec525c453f4e6aafcc0bc572fdb5c584960bf70a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotSupportedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotSupportedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotSupportedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotSupportedException.java
index e5894f0fdde0617634b99b59d436d13c656d449f..8f0c264e4e1e5900a9dd5d8ed44756d9f0043e41 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotSupportedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryNotSupportedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreCreateException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreCreateException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreCreateException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreCreateException.java
index 27ddb85e2c7eb6746eedf3e6e4e0c137a5a55227..c9bf4e3dd5e3fc8358c4a0e7b67b47a0adec8f10 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreCreateException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreCreateException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreGCException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreGCException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreGCException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreGCException.java
index 00302c55eab047c7b565413a0d0a0a7e50383596..116cc1475d60add289ee2cb460f9b6b901519b09 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreGCException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreGCException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreInsertException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreInsertException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreInsertException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreInsertException.java
index 564383c844ee31ad55f383df81e5c1c783dc310f..876fafb4af04578105c6ca69f85f0122713360ab 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreInsertException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStoreInsertException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStorePersistException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStorePersistException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStorePersistException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStorePersistException.java
index 5b17442a3a804504755a9c16675b3f30258d0ea2..f68a52368197476dc6d1ae523d6e4bdac891ad6f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStorePersistException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueryStorePersistException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueueNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueueNotFoundException.java
index d06eca74382987d0ab855d3637b38a2f9bbd4c3c..df145a10175664950c9e7b5ea5d45a30d5ce53a2 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/QueueNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RemoteUnavailableException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RemoteUnavailableException.java
index 6c2b14bb9bb0005689d820170c2dc1901f16810e..a6ffb9adfa647f6787a5fe2a49b9271272ecd9ec 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RemoteUnavailableException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RorNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RorNotFoundException.java
index afee080b5edc983ab157977560555536ad1c2298..e273a913a0147957ac3fc04f8c0e28e98b9e21d4 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/RorNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceConnectionException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceConnectionException.java
similarity index 93%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceConnectionException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceConnectionException.java
index d68185102a00e33419ae8cf2c4250c0775082a23..3152cb9e9e99a2f9fc5f8ec2efc8f5a64ab358cb 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceConnectionException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceConnectionException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceException.java
index aef3ae7f7cd75db6ec7ed59f95980f2c8e021c2b..ecfca56a01118f3f3892c7c1acd87fa5cff3d0cc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SearchServiceException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SearchServiceException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SemanticEntityNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SemanticEntityNotFoundException.java
index 83c2f07f57d709f410c1a7b44b9aab07e167a322..cdf229106f4590791bc68e0368f5acd5f1d7a955 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SemanticEntityNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SortException.java
similarity index 91%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SortException.java
index f70f0fbef996d4e7032ecf6dc73b5037223c7b20..f79890e334cdf69a6ccd3c4bcaf2bbe5af401a77 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/SortException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageNotFoundException.java
index bbb780ea919d33c64c34f719f99c5ed30eae326a..7b5888ded84a1cfdb684e017e79b0a6bab044bc4 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageUnavailableException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageUnavailableException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageUnavailableException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageUnavailableException.java
index 08e49ada9ed210046c755c04eb6e4a07c224020c..c75e0a21ea8078dd3dd411c6222cb71293ffd3a6 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/StorageUnavailableException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/StorageUnavailableException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableExistsException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableExistsException.java
index 252c1b0fa67e57f73e17a971cbcec1ccca6f1caf..5c28dfe3b40e0bd23b658026ee50aefdd1512c04 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableMalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableMalformedException.java
index 0878f3607070f2a18976454714f6e6e64a23ce7d..baaa0e92316bfcd1c054166333d4019892f1e1fe 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableMalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableNotFoundException.java
index 5380be1e60058b51d0832f69fbc875449f3d0bf1..4ec9224f6d96acfeafd2fbcc7efa231abfa2ea28 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableSchemaException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableSchemaException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableSchemaException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableSchemaException.java
index 539e39897e52c3447378aa46112b96d654cdb7d1..48229595b56462f14575d53ddb6ce2b7363b833d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableSchemaException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/TableSchemaException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UnitNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UnitNotFoundException.java
index 1cc030875525cef47f135821f2827cc8aca6c2a9..b52c8910bf12b31791493185797112ed74851e01 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UnitNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UriMalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UriMalformedException.java
index 05d10c1323d84cbeaef3d9a29122fc04c6ec9cf1..6dfc31d2dd8aec2c07e46feef8c7eb06a28a8b42 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UriMalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserExistsException.java
similarity index 91%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserExistsException.java
index 712e79fa26fb768c7c25dbc6aa971a4269396de6..416e3bcb5abbbf3cb3a3df8e5d88894e8a2b8fea 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserNotFoundException.java
index 1aa6adafecb5fbe86ab0307efec87c3a2ea6cc0b..b4d61532ab01c3ff6ebe064ed8702f4ccd5c386b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/UserNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewExistsException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewExistsException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewExistsException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewExistsException.java
index 265974db55184f6f770190068c79596b39281b6d..719e8aed74b0a6729fd4409646d1e7bebac3c52d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewExistsException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewExistsException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewMalformedException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewMalformedException.java
index 0f8d5bef5520a5b1f93f3ec7aa5cf77051c85378..46255f0d8ed2e221d98e158a0b25f316d59d9b6d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewMalformedException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewNotFoundException.java
similarity index 92%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewNotFoundException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewNotFoundException.java
index 2c8cf52e0e60e9375a1c91e01912b631388bfe0a..29a1a3c275540af35d3c9eaf2170a4a336fe6084 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewNotFoundException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewNotFoundException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewSchemaException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewSchemaException.java
similarity index 91%
rename from dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewSchemaException.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewSchemaException.java
index 4761b6e964a1db84de55fbd2a70006c1cc15a54c..480a735442851735abc27baeb917071f3c76132a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewSchemaException.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/exception/ViewSchemaException.java
@@ -1,4 +1,4 @@
-package at.tuwien.exception;
+package at.ac.tuwien.ifs.dbrepo.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/AbstractUnitTest.java
similarity index 98%
rename from dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/AbstractUnitTest.java
index 29223d6076a1712697a2045714a532780911072b..6c5dff507a849d34cfab7e046bf8e2f20a1c5e1b 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/AbstractUnitTest.java
@@ -1,7 +1,7 @@
-package at.tuwien.test;
+package at.ac.tuwien.ifs.dbrepo.test;
-import at.tuwien.entities.database.AccessType;
-import at.tuwien.entities.identifier.IdentifierStatusType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.AccessType;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.IdentifierStatusType;
import org.springframework.test.context.TestPropertySource;
import java.util.LinkedList;
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/BaseTest.java
similarity index 98%
rename from dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/BaseTest.java
index 673aa7a6e262020c9b59ee4ef10e6f88de5066cc..d03cc8bd9322b60fa51ebcd6887091b0df738103 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/BaseTest.java
@@ -1,70 +1,70 @@
-package at.tuwien.test;
-
-import at.tuwien.ExportResourceDto;
-import at.tuwien.api.amqp.CreateVirtualHostDto;
-import at.tuwien.api.amqp.ExchangeDto;
-import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
-import at.tuwien.api.amqp.QueueDto;
-import at.tuwien.api.auth.CreateUserDto;
-import at.tuwien.api.container.ContainerBriefDto;
-import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.image.*;
-import at.tuwien.api.database.*;
-import at.tuwien.api.database.query.*;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.*;
-import at.tuwien.api.database.table.columns.concepts.*;
-import at.tuwien.api.database.table.constraints.ConstraintsDto;
-import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
-import at.tuwien.api.database.table.constraints.foreign.*;
-import at.tuwien.api.database.table.constraints.primary.PrimaryKeyDto;
-import at.tuwien.api.database.table.constraints.unique.UniqueDto;
-import at.tuwien.api.datacite.DataCiteBody;
-import at.tuwien.api.datacite.DataCiteData;
-import at.tuwien.api.datacite.doi.DataCiteDoi;
-import at.tuwien.api.grafana.CreateDashboardDto;
-import at.tuwien.api.grafana.CreateDashboardResponseDto;
-import at.tuwien.api.identifier.*;
-import at.tuwien.api.keycloak.*;
-import at.tuwien.api.maintenance.BannerMessageCreateDto;
-import at.tuwien.api.maintenance.BannerMessageDto;
-import at.tuwien.api.maintenance.BannerMessageTypeDto;
-import at.tuwien.api.maintenance.BannerMessageUpdateDto;
-import at.tuwien.api.orcid.OrcidDto;
-import at.tuwien.api.orcid.activities.OrcidActivitiesSummaryDto;
-import at.tuwien.api.orcid.activities.employments.OrcidEmploymentsDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
-import at.tuwien.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
-import at.tuwien.api.orcid.person.OrcidPersonDto;
-import at.tuwien.api.orcid.person.name.OrcidNameDto;
-import at.tuwien.api.orcid.person.name.OrcidValueDto;
-import at.tuwien.api.semantics.*;
-import at.tuwien.api.user.UserAttributesDto;
-import at.tuwien.api.user.*;
-import at.tuwien.api.user.internal.UpdateUserPasswordDto;
-import at.tuwien.entities.container.Container;
-import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.entities.container.image.Operator;
-import at.tuwien.entities.database.*;
-import at.tuwien.entities.database.table.Table;
-import at.tuwien.entities.database.table.columns.TableColumn;
-import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.entities.database.table.columns.TableColumnType;
-import at.tuwien.entities.database.table.columns.TableColumnUnit;
-import at.tuwien.entities.database.table.constraints.Constraints;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
-import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKeyReference;
-import at.tuwien.entities.database.table.constraints.foreignKey.ReferenceType;
-import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
-import at.tuwien.entities.database.table.constraints.unique.Unique;
-import at.tuwien.entities.identifier.*;
-import at.tuwien.entities.maintenance.BannerMessage;
-import at.tuwien.entities.maintenance.BannerMessageType;
-import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.entities.user.User;
-import at.tuwien.test.utils.ArrayUtils;
+package at.ac.tuwien.ifs.dbrepo.test;
+
+import at.ac.tuwien.ifs.dbrepo.api.ExportResourceDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.CreateVirtualHostDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.ExchangeDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.GrantVirtualHostPermissionsDto;
+import at.ac.tuwien.ifs.dbrepo.api.amqp.QueueDto;
+import at.ac.tuwien.ifs.dbrepo.api.auth.CreateUserDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerBriefDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.ContainerDto;
+import at.ac.tuwien.ifs.dbrepo.api.container.image.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.query.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.columns.concepts.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.ConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.CreateTableConstraintsDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.foreign.*;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.primary.PrimaryKeyDto;
+import at.ac.tuwien.ifs.dbrepo.api.database.table.constraints.unique.UniqueDto;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.DataCiteBody;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.DataCiteData;
+import at.ac.tuwien.ifs.dbrepo.api.datacite.doi.DataCiteDoi;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardDto;
+import at.ac.tuwien.ifs.dbrepo.api.grafana.CreateDashboardResponseDto;
+import at.ac.tuwien.ifs.dbrepo.api.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.api.keycloak.*;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageCreateDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageTypeDto;
+import at.ac.tuwien.ifs.dbrepo.api.maintenance.BannerMessageUpdateDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.OrcidDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.OrcidActivitiesSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.OrcidEmploymentsDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.OrcidAffiliationGroupDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.OrcidEmploymentSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.OrcidSummaryDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.activities.employments.affiliation.group.summary.organization.OrcidOrganizationDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.person.OrcidPersonDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.person.name.OrcidNameDto;
+import at.ac.tuwien.ifs.dbrepo.api.orcid.person.name.OrcidValueDto;
+import at.ac.tuwien.ifs.dbrepo.api.semantics.*;
+import at.ac.tuwien.ifs.dbrepo.api.user.UserAttributesDto;
+import at.ac.tuwien.ifs.dbrepo.api.user.*;
+import at.ac.tuwien.ifs.dbrepo.api.user.internal.UpdateUserPasswordDto;
+import at.ac.tuwien.ifs.dbrepo.entity.container.Container;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.ContainerImage;
+import at.ac.tuwien.ifs.dbrepo.entity.container.image.Operator;
+import at.ac.tuwien.ifs.dbrepo.entity.database.*;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.Table;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumn;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnConcept;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.columns.TableColumnUnit;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.Constraints;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ForeignKeyReference;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.foreignKey.ReferenceType;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.primaryKey.PrimaryKey;
+import at.ac.tuwien.ifs.dbrepo.entity.database.table.constraints.unique.Unique;
+import at.ac.tuwien.ifs.dbrepo.entity.identifier.*;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessage;
+import at.ac.tuwien.ifs.dbrepo.entity.maintenance.BannerMessageType;
+import at.ac.tuwien.ifs.dbrepo.entity.semantics.Ontology;
+import at.ac.tuwien.ifs.dbrepo.entity.user.User;
+import at.ac.tuwien.ifs.dbrepo.test.utils.ArrayUtils;
import org.springframework.core.io.InputStreamResource;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
@@ -649,7 +649,7 @@ public abstract class BaseTest {
.authorities(AUTHORITY_DEFAULT_RESEARCHER_AUTHORITIES)
.build();
- public static final at.tuwien.api.amqp.UserDetailsDto USER_2_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.amqp.UserDetailsDto USER_2_DETAILS_DTO = at.ac.tuwien.ifs.dbrepo.api.amqp.UserDetailsDto.builder()
.name(USER_2_USERNAME)
.tags(new String[]{})
.build();
@@ -723,7 +723,7 @@ public abstract class BaseTest {
public static final Principal USER_3_PRINCIPAL = new UsernamePasswordAuthenticationToken(USER_3_DETAILS,
USER_3_PASSWORD, USER_3_DETAILS.getAuthorities());
- public static final at.tuwien.api.amqp.UserDetailsDto USER_3_DETAILS_DTO = at.tuwien.api.amqp.UserDetailsDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.amqp.UserDetailsDto USER_3_DETAILS_DTO = at.ac.tuwien.ifs.dbrepo.api.amqp.UserDetailsDto.builder()
.name(USER_3_USERNAME)
.tags(new String[]{})
.build();
@@ -1191,7 +1191,7 @@ public abstract class BaseTest {
.cid(CONTAINER_1_ID)
.build();
- public static final at.tuwien.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.tuwien.api.database.internal.CreateDatabaseDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto DATABASE_1_CREATE_INTERNAL = at.ac.tuwien.ifs.dbrepo.api.database.internal.CreateDatabaseDto.builder()
.internalName(DATABASE_1_INTERNALNAME)
.containerId(CONTAINER_1_ID)
.username(USER_1_USERNAME)
@@ -2183,7 +2183,7 @@ public abstract class BaseTest {
.constraints(TABLE_4_CONSTRAINTS_CREATE_DTO)
.build();
- public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_4_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto TABLE_4_CREATE_INTERNAL_DTO = at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_4_NAME)
.description(TABLE_4_DESCRIPTION)
.columns(TABLE_4_COLUMNS_CREATE_DTO)
@@ -3090,14 +3090,14 @@ public abstract class BaseTest {
.constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
.build();
- public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_DTO = at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
.constraints(TABLE_1_CONSTRAINTS_CREATE_DTO)
.build();
- public static final at.tuwien.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_INVALID_DTO = at.tuwien.api.database.table.internal.TableCreateDto.builder()
+ public static final at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto TABLE_1_CREATE_INTERNAL_INVALID_DTO = at.ac.tuwien.ifs.dbrepo.api.database.table.internal.TableCreateDto.builder()
.name(TABLE_1_NAME)
.description(TABLE_1_DESCRIPTION)
.columns(TABLE_1_COLUMNS_CREATE_DTO)
@@ -7396,14 +7396,14 @@ public abstract class BaseTest {
.accesses(new LinkedList<>())
.identifiers(new LinkedList<>())
.build();
-
+
public static final CreateDashboardDto DATABASE_1_CREATE_DASHBOARD_DTO = CreateDashboardDto.builder()
.databaseName(DATABASE_1_INTERNALNAME)
.isPublic(DATABASE_1_PUBLIC)
.isSchemaPublic(DATABASE_1_SCHEMA_PUBLIC)
.ownerUsername(USER_1_USERNAME)
.build();
-
+
public static final CreateDashboardResponseDto DATABASE_1_CREATE_DASHBOARD_RESPONSE_DTO = CreateDashboardResponseDto.builder()
.uid(DATABASE_1_DASHBOARD_UID)
.build();
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/dto/LocaleDto.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/dto/LocaleDto.java
similarity index 88%
rename from dbrepo-metadata-service/test/src/main/java/at/tuwien/test/dto/LocaleDto.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/dto/LocaleDto.java
index d14ad880d9b1ee634f720eaaed48999fdda4f048..4c0cbc2e756212dc262d7f447f68a0376c713e7c 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/dto/LocaleDto.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/dto/LocaleDto.java
@@ -1,4 +1,4 @@
-package at.tuwien.test.dto;
+package at.ac.tuwien.ifs.dbrepo.test.dto;
import lombok.*;
diff --git a/dbrepo-metadata-service/test/pom.xml b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/pom.xml
similarity index 100%
rename from dbrepo-metadata-service/test/pom.xml
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/pom.xml
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ArrayUtils.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/ArrayUtils.java
similarity index 89%
rename from dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ArrayUtils.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/ArrayUtils.java
index 50dff12d856f79bcd78c8474fea34f757f33a13c..5a45c0b02d962da17a9da935b8f842493b4e78d2 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ArrayUtils.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/ArrayUtils.java
@@ -1,4 +1,4 @@
-package at.tuwien.test.utils;
+package at.ac.tuwien.ifs.dbrepo.test.utils;
import java.util.Arrays;
import java.util.LinkedList;
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/EndpointUtils.java
similarity index 95%
rename from dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java
rename to lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/EndpointUtils.java
index a2101bf3abf5ed68b910a55c064cda00aaf4b847..04e9f4149f92ab2c9e4c331d53a775b92740f802 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/EndpointUtils.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/test/utils/EndpointUtils.java
@@ -1,6 +1,6 @@
-package at.tuwien.test.utils;
+package at.ac.tuwien.ifs.dbrepo.test.utils;
-import at.tuwien.test.dto.LocaleDto;
+import at.ac.tuwien.ifs.dbrepo.test.dto.LocaleDto;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.config.BeanDefinition;