From fe7a0781803846a1ffcafadda8d8533f3185c146 Mon Sep 17 00:00:00 2001
From: ThanKarab <tkarabatsis@hotmail.com>
Date: Wed, 2 Aug 2023 11:34:01 +0300
Subject: [PATCH] Moved eu.hbp.mip to hbp.mip

---
 pom.xml                                       |  2 +-
 .../java/{eu => }/hbp/mip/MIPApplication.java |  2 +-
 .../PersistenceConfiguration.java             |  6 ++--
 .../configurations/SecurityConfiguration.java |  2 +-
 .../hbp/mip/controllers/ActiveUserAPI.java    |  8 ++---
 .../hbp/mip/controllers/AlgorithmsAPI.java    | 11 +++---
 .../hbp/mip/controllers/ExperimentAPI.java    | 10 +++---
 .../hbp/mip/controllers/PathologiesAPI.java   | 17 +++++-----
 .../hbp/mip/models/DAOs/ExperimentDAO.java    |  2 +-
 .../{eu => }/hbp/mip/models/DAOs/UserDAO.java |  2 +-
 .../mip/models/DTOs/Exareme2AlgorithmDTO.java |  2 +-
 .../DTOs/Exareme2AlgorithmRequestDTO.java     |  4 +--
 .../models/DTOs/Exareme2AttributesDTO.java    |  2 +-
 .../DTOs/Exareme2CommonDataElement.java       |  2 +-
 .../mip/models/DTOs/ExaremeAlgorithmDTO.java  |  2 +-
 .../DTOs/ExaremeAlgorithmRequestParamDTO.java |  4 +--
 .../DTOs/ExaremeAlgorithmResultDTO.java       |  2 +-
 .../hbp/mip/models/DTOs/ExperimentDTO.java    |  6 ++--
 .../mip/models/DTOs/MetadataHierarchyDTO.java |  2 +-
 .../hbp/mip/models/DTOs/PathologyDTO.java     |  4 +--
 .../{eu => }/hbp/mip/models/DTOs/UserDTO.java |  6 ++--
 .../repositories/ExperimentRepository.java    | 18 +++++-----
 .../ExperimentSpecifications.java             |  6 ++--
 .../hbp/mip/repositories/UserRepository.java  |  4 +--
 .../hbp/mip/services/ActiveUserService.java   |  6 ++--
 .../hbp/mip/services/AlgorithmService.java    | 16 ++++-----
 .../hbp/mip/services/ExperimentService.java   | 34 +++++++++----------
 .../{eu => }/hbp/mip/utils/ClaimUtils.java    |  8 ++---
 .../mip/utils/ControllerExceptionHandler.java |  4 +--
 .../hbp/mip/utils/CustomResourceLoader.java   |  2 +-
 .../utils/Exceptions/BadRequestException.java |  2 +-
 .../ExperimentNotFoundException.java          |  2 +-
 .../utils/Exceptions/InternalServerError.java |  2 +-
 .../hbp/mip/utils/Exceptions/NoContent.java   |  2 +-
 .../Exceptions/UnauthorizedException.java     |  2 +-
 .../java/{eu => }/hbp/mip/utils/HTTPUtil.java |  2 +-
 .../hbp/mip/utils/InputStreamConverter.java   |  2 +-
 .../hbp/mip/utils/JsonConverters.java         |  2 +-
 .../java/{eu => }/hbp/mip/utils/Logger.java   |  2 +-
 39 files changed, 106 insertions(+), 108 deletions(-)
 rename src/main/java/{eu => }/hbp/mip/MIPApplication.java (94%)
 rename src/main/java/{eu => }/hbp/mip/configurations/PersistenceConfiguration.java (92%)
 rename src/main/java/{eu => }/hbp/mip/configurations/SecurityConfiguration.java (99%)
 rename src/main/java/{eu => }/hbp/mip/controllers/ActiveUserAPI.java (89%)
 rename src/main/java/{eu => }/hbp/mip/controllers/AlgorithmsAPI.java (83%)
 rename src/main/java/{eu => }/hbp/mip/controllers/ExperimentAPI.java (96%)
 rename src/main/java/{eu => }/hbp/mip/controllers/PathologiesAPI.java (93%)
 rename src/main/java/{eu => }/hbp/mip/models/DAOs/ExperimentDAO.java (98%)
 rename src/main/java/{eu => }/hbp/mip/models/DAOs/UserDAO.java (96%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java (99%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java (98%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/Exareme2AttributesDTO.java (92%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/Exareme2CommonDataElement.java (96%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java (96%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java (97%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java (86%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/ExperimentDTO.java (93%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/MetadataHierarchyDTO.java (98%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/PathologyDTO.java (91%)
 rename src/main/java/{eu => }/hbp/mip/models/DTOs/UserDTO.java (77%)
 rename src/main/java/{eu => }/hbp/mip/repositories/ExperimentRepository.java (88%)
 rename src/main/java/{eu => }/hbp/mip/repositories/ExperimentSpecifications.java (97%)
 rename src/main/java/{eu => }/hbp/mip/repositories/UserRepository.java (71%)
 rename src/main/java/{eu => }/hbp/mip/services/ActiveUserService.java (96%)
 rename src/main/java/{eu => }/hbp/mip/services/AlgorithmService.java (95%)
 rename src/main/java/{eu => }/hbp/mip/services/ExperimentService.java (97%)
 rename src/main/java/{eu => }/hbp/mip/utils/ClaimUtils.java (94%)
 rename src/main/java/{eu => }/hbp/mip/utils/ControllerExceptionHandler.java (97%)
 rename src/main/java/{eu => }/hbp/mip/utils/CustomResourceLoader.java (92%)
 rename src/main/java/{eu => }/hbp/mip/utils/Exceptions/BadRequestException.java (78%)
 rename src/main/java/{eu => }/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java (80%)
 rename src/main/java/{eu => }/hbp/mip/utils/Exceptions/InternalServerError.java (78%)
 rename src/main/java/{eu => }/hbp/mip/utils/Exceptions/NoContent.java (75%)
 rename src/main/java/{eu => }/hbp/mip/utils/Exceptions/UnauthorizedException.java (78%)
 rename src/main/java/{eu => }/hbp/mip/utils/HTTPUtil.java (98%)
 rename src/main/java/{eu => }/hbp/mip/utils/InputStreamConverter.java (93%)
 rename src/main/java/{eu => }/hbp/mip/utils/JsonConverters.java (96%)
 rename src/main/java/{eu => }/hbp/mip/utils/Logger.java (92%)

diff --git a/pom.xml b/pom.xml
index d5a08e25c..c9d5b258e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <name>portal-backend</name>
     <description>Medical Informatics Platform - portal-backend</description>
-    <groupId>eu.hbp.mip</groupId>
+    <groupId>hbp.mip</groupId>
     <artifactId>portal-backend</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
diff --git a/src/main/java/eu/hbp/mip/MIPApplication.java b/src/main/java/hbp/mip/MIPApplication.java
similarity index 94%
rename from src/main/java/eu/hbp/mip/MIPApplication.java
rename to src/main/java/hbp/mip/MIPApplication.java
index f4001f93c..920f5e287 100644
--- a/src/main/java/eu/hbp/mip/MIPApplication.java
+++ b/src/main/java/hbp/mip/MIPApplication.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package eu.hbp.mip;
+package hbp.mip;
 
 
 import org.springframework.boot.SpringApplication;
diff --git a/src/main/java/eu/hbp/mip/configurations/PersistenceConfiguration.java b/src/main/java/hbp/mip/configurations/PersistenceConfiguration.java
similarity index 92%
rename from src/main/java/eu/hbp/mip/configurations/PersistenceConfiguration.java
rename to src/main/java/hbp/mip/configurations/PersistenceConfiguration.java
index 23df36815..e74501504 100644
--- a/src/main/java/eu/hbp/mip/configurations/PersistenceConfiguration.java
+++ b/src/main/java/hbp/mip/configurations/PersistenceConfiguration.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.configurations;
+package hbp.mip.configurations;
 
 import org.flywaydb.core.Flyway;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -16,7 +16,7 @@ import javax.sql.DataSource;
 
 
 @Configuration
-@EnableJpaRepositories("eu.hbp.mip.repositories")
+@EnableJpaRepositories("hbp.mip.repositories")
 public class PersistenceConfiguration {
 
     @Primary
@@ -33,7 +33,7 @@ public class PersistenceConfiguration {
         emfb.setDataSource(portalDataSource());
         JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         emfb.setJpaVendorAdapter(vendorAdapter);
-        emfb.setPackagesToScan("eu.hbp.mip.models.DAOs");
+        emfb.setPackagesToScan("hbp.mip.models.DAOs");
         return emfb;
     }
 
diff --git a/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java b/src/main/java/hbp/mip/configurations/SecurityConfiguration.java
similarity index 99%
rename from src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java
rename to src/main/java/hbp/mip/configurations/SecurityConfiguration.java
index e57bc1432..33b3279ea 100644
--- a/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java
+++ b/src/main/java/hbp/mip/configurations/SecurityConfiguration.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.configurations;
+package hbp.mip.configurations;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java b/src/main/java/hbp/mip/controllers/ActiveUserAPI.java
similarity index 89%
rename from src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java
rename to src/main/java/hbp/mip/controllers/ActiveUserAPI.java
index 5aaeaa77e..3ba191fdc 100644
--- a/src/main/java/eu/hbp/mip/controllers/ActiveUserAPI.java
+++ b/src/main/java/hbp/mip/controllers/ActiveUserAPI.java
@@ -1,8 +1,8 @@
-package eu.hbp.mip.controllers;
+package hbp.mip.controllers;
 
-import eu.hbp.mip.models.DAOs.UserDAO;
-import eu.hbp.mip.services.ActiveUserService;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DAOs.UserDAO;
+import hbp.mip.services.ActiveUserService;
+import hbp.mip.utils.Logger;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java b/src/main/java/hbp/mip/controllers/AlgorithmsAPI.java
similarity index 83%
rename from src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java
rename to src/main/java/hbp/mip/controllers/AlgorithmsAPI.java
index 181c5eb22..fd477e768 100644
--- a/src/main/java/eu/hbp/mip/controllers/AlgorithmsAPI.java
+++ b/src/main/java/hbp/mip/controllers/AlgorithmsAPI.java
@@ -1,14 +1,13 @@
-package eu.hbp.mip.controllers;
+package hbp.mip.controllers;
 
-import eu.hbp.mip.models.DTOs.ExaremeAlgorithmDTO;
-import eu.hbp.mip.services.ActiveUserService;
-import eu.hbp.mip.services.AlgorithmService;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DTOs.ExaremeAlgorithmDTO;
+import hbp.mip.services.ActiveUserService;
+import hbp.mip.services.AlgorithmService;
+import hbp.mip.utils.Logger;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java b/src/main/java/hbp/mip/controllers/ExperimentAPI.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java
rename to src/main/java/hbp/mip/controllers/ExperimentAPI.java
index bdb82d8a2..6b3795818 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentAPI.java
+++ b/src/main/java/hbp/mip/controllers/ExperimentAPI.java
@@ -1,10 +1,10 @@
-package eu.hbp.mip.controllers;
+package hbp.mip.controllers;
 
 
-import eu.hbp.mip.models.DTOs.ExperimentDTO;
-import eu.hbp.mip.services.ActiveUserService;
-import eu.hbp.mip.services.ExperimentService;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DTOs.ExperimentDTO;
+import hbp.mip.services.ActiveUserService;
+import hbp.mip.services.ExperimentService;
+import hbp.mip.utils.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java b/src/main/java/hbp/mip/controllers/PathologiesAPI.java
similarity index 93%
rename from src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java
rename to src/main/java/hbp/mip/controllers/PathologiesAPI.java
index 73c12fbea..d1a93e021 100644
--- a/src/main/java/eu/hbp/mip/controllers/PathologiesAPI.java
+++ b/src/main/java/hbp/mip/controllers/PathologiesAPI.java
@@ -1,19 +1,20 @@
-package eu.hbp.mip.controllers;
+package hbp.mip.controllers;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import eu.hbp.mip.models.DTOs.Exareme2AttributesDTO;
-import eu.hbp.mip.models.DTOs.Exareme2CommonDataElement;
-import eu.hbp.mip.models.DTOs.PathologyDTO;
-import eu.hbp.mip.services.ActiveUserService;
-import eu.hbp.mip.utils.*;
-import eu.hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.models.DTOs.Exareme2AttributesDTO;
+import hbp.mip.models.DTOs.Exareme2CommonDataElement;
+import hbp.mip.models.DTOs.PathologyDTO;
+import hbp.mip.services.ActiveUserService;
+import hbp.mip.utils.ClaimUtils;
+import hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.utils.HTTPUtil;
+import hbp.mip.utils.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
diff --git a/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java b/src/main/java/hbp/mip/models/DAOs/ExperimentDAO.java
similarity index 98%
rename from src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java
rename to src/main/java/hbp/mip/models/DAOs/ExperimentDAO.java
index 244b55d6f..f2ac7ea97 100644
--- a/src/main/java/eu/hbp/mip/models/DAOs/ExperimentDAO.java
+++ b/src/main/java/hbp/mip/models/DAOs/ExperimentDAO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DAOs;
+package hbp.mip.models.DAOs;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.gson.Gson;
diff --git a/src/main/java/eu/hbp/mip/models/DAOs/UserDAO.java b/src/main/java/hbp/mip/models/DAOs/UserDAO.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/models/DAOs/UserDAO.java
rename to src/main/java/hbp/mip/models/DAOs/UserDAO.java
index d1ab17988..58968ceb4 100644
--- a/src/main/java/eu/hbp/mip/models/DAOs/UserDAO.java
+++ b/src/main/java/hbp/mip/models/DAOs/UserDAO.java
@@ -2,7 +2,7 @@
  * Created by mirco on 04.12.15.
  */
 
-package eu.hbp.mip.models.DAOs;
+package hbp.mip.models.DAOs;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.gson.annotations.Expose;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java b/src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java
similarity index 99%
rename from src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java
rename to src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java
index db5095359..9c46445e2 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmDTO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java b/src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java
similarity index 98%
rename from src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java
rename to src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java
index 5562df139..1e6e21dc5 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/Exareme2AlgorithmRequestDTO.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
-import eu.hbp.mip.utils.JsonConverters;
+import hbp.mip.utils.JsonConverters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AttributesDTO.java b/src/main/java/hbp/mip/models/DTOs/Exareme2AttributesDTO.java
similarity index 92%
rename from src/main/java/eu/hbp/mip/models/DTOs/Exareme2AttributesDTO.java
rename to src/main/java/hbp/mip/models/DTOs/Exareme2AttributesDTO.java
index aaaa627db..3755dcdc2 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2AttributesDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/Exareme2AttributesDTO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2CommonDataElement.java b/src/main/java/hbp/mip/models/DTOs/Exareme2CommonDataElement.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/models/DTOs/Exareme2CommonDataElement.java
rename to src/main/java/hbp/mip/models/DTOs/Exareme2CommonDataElement.java
index 786bf7630..5e23144a1 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/Exareme2CommonDataElement.java
+++ b/src/main/java/hbp/mip/models/DTOs/Exareme2CommonDataElement.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 
 import com.google.gson.annotations.SerializedName;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java
rename to src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java
index be3e1f56c..20f4e5fcd 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmDTO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java
similarity index 97%
rename from src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java
rename to src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java
index ab80e2852..2e0954b58 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmRequestParamDTO.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
-import eu.hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.utils.Exceptions.InternalServerError;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java
similarity index 86%
rename from src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java
rename to src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java
index 88b5fb627..4d1f97585 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/ExaremeAlgorithmResultDTO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java b/src/main/java/hbp/mip/models/DTOs/ExperimentDTO.java
similarity index 93%
rename from src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
rename to src/main/java/hbp/mip/models/DTOs/ExperimentDTO.java
index 461df9822..a94d87ef8 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/ExperimentDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/ExperimentDTO.java
@@ -1,8 +1,8 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import eu.hbp.mip.models.DAOs.ExperimentDAO;
-import eu.hbp.mip.utils.JsonConverters;
+import hbp.mip.models.DAOs.ExperimentDAO;
+import hbp.mip.utils.JsonConverters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/MetadataHierarchyDTO.java b/src/main/java/hbp/mip/models/DTOs/MetadataHierarchyDTO.java
similarity index 98%
rename from src/main/java/eu/hbp/mip/models/DTOs/MetadataHierarchyDTO.java
rename to src/main/java/hbp/mip/models/DTOs/MetadataHierarchyDTO.java
index ff73005c4..0c9100809 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/MetadataHierarchyDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/MetadataHierarchyDTO.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/PathologyDTO.java b/src/main/java/hbp/mip/models/DTOs/PathologyDTO.java
similarity index 91%
rename from src/main/java/eu/hbp/mip/models/DTOs/PathologyDTO.java
rename to src/main/java/hbp/mip/models/DTOs/PathologyDTO.java
index 127f1eb2d..794a5ee7a 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/PathologyDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/PathologyDTO.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.google.gson.annotations.SerializedName;
-import eu.hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.utils.Exceptions.InternalServerError;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java b/src/main/java/hbp/mip/models/DTOs/UserDTO.java
similarity index 77%
rename from src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java
rename to src/main/java/hbp/mip/models/DTOs/UserDTO.java
index 448b50f1a..eb9d47366 100644
--- a/src/main/java/eu/hbp/mip/models/DTOs/UserDTO.java
+++ b/src/main/java/hbp/mip/models/DTOs/UserDTO.java
@@ -1,10 +1,8 @@
-package eu.hbp.mip.models.DTOs;
+package hbp.mip.models.DTOs;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.gson.annotations.SerializedName;
-import eu.hbp.mip.models.DAOs.ExperimentDAO;
-import eu.hbp.mip.models.DAOs.UserDAO;
-import eu.hbp.mip.utils.JsonConverters;
+import hbp.mip.models.DAOs.UserDAO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
diff --git a/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java b/src/main/java/hbp/mip/repositories/ExperimentRepository.java
similarity index 88%
rename from src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
rename to src/main/java/hbp/mip/repositories/ExperimentRepository.java
index 733737cee..7b296584e 100644
--- a/src/main/java/eu/hbp/mip/repositories/ExperimentRepository.java
+++ b/src/main/java/hbp/mip/repositories/ExperimentRepository.java
@@ -1,13 +1,13 @@
-package eu.hbp.mip.repositories;
+package hbp.mip.repositories;
 
-import eu.hbp.mip.models.DAOs.ExperimentDAO;
-import eu.hbp.mip.models.DAOs.UserDAO;
-import eu.hbp.mip.models.DTOs.ExperimentDTO;
-import eu.hbp.mip.utils.Exceptions.BadRequestException;
-import eu.hbp.mip.utils.Exceptions.ExperimentNotFoundException;
-import eu.hbp.mip.utils.Exceptions.InternalServerError;
-import eu.hbp.mip.utils.JsonConverters;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DAOs.ExperimentDAO;
+import hbp.mip.models.DAOs.UserDAO;
+import hbp.mip.models.DTOs.ExperimentDTO;
+import hbp.mip.utils.Exceptions.BadRequestException;
+import hbp.mip.utils.Exceptions.ExperimentNotFoundException;
+import hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.utils.JsonConverters;
+import hbp.mip.utils.Logger;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/src/main/java/eu/hbp/mip/repositories/ExperimentSpecifications.java b/src/main/java/hbp/mip/repositories/ExperimentSpecifications.java
similarity index 97%
rename from src/main/java/eu/hbp/mip/repositories/ExperimentSpecifications.java
rename to src/main/java/hbp/mip/repositories/ExperimentSpecifications.java
index ba1f7babc..5c5d86f19 100644
--- a/src/main/java/eu/hbp/mip/repositories/ExperimentSpecifications.java
+++ b/src/main/java/hbp/mip/repositories/ExperimentSpecifications.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.repositories;
+package hbp.mip.repositories;
 
-import eu.hbp.mip.models.DAOs.ExperimentDAO;
-import eu.hbp.mip.utils.Exceptions.BadRequestException;
+import hbp.mip.models.DAOs.ExperimentDAO;
+import hbp.mip.utils.Exceptions.BadRequestException;
 import jakarta.persistence.criteria.*;
 import lombok.NonNull;
 import org.springframework.data.jpa.domain.Specification;
diff --git a/src/main/java/eu/hbp/mip/repositories/UserRepository.java b/src/main/java/hbp/mip/repositories/UserRepository.java
similarity index 71%
rename from src/main/java/eu/hbp/mip/repositories/UserRepository.java
rename to src/main/java/hbp/mip/repositories/UserRepository.java
index cbfdc5b5b..11f5d3f6c 100644
--- a/src/main/java/eu/hbp/mip/repositories/UserRepository.java
+++ b/src/main/java/hbp/mip/repositories/UserRepository.java
@@ -1,6 +1,6 @@
-package eu.hbp.mip.repositories;
+package hbp.mip.repositories;
 
-import eu.hbp.mip.models.DAOs.UserDAO;
+import hbp.mip.models.DAOs.UserDAO;
 import org.springframework.data.repository.CrudRepository;
 
 public interface UserRepository extends CrudRepository<UserDAO, String> {
diff --git a/src/main/java/eu/hbp/mip/services/ActiveUserService.java b/src/main/java/hbp/mip/services/ActiveUserService.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/services/ActiveUserService.java
rename to src/main/java/hbp/mip/services/ActiveUserService.java
index 816a9a15b..30ab4d0a2 100644
--- a/src/main/java/eu/hbp/mip/services/ActiveUserService.java
+++ b/src/main/java/hbp/mip/services/ActiveUserService.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.services;
+package hbp.mip.services;
 
-import eu.hbp.mip.models.DAOs.UserDAO;
-import eu.hbp.mip.repositories.UserRepository;
+import hbp.mip.models.DAOs.UserDAO;
+import hbp.mip.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
diff --git a/src/main/java/eu/hbp/mip/services/AlgorithmService.java b/src/main/java/hbp/mip/services/AlgorithmService.java
similarity index 95%
rename from src/main/java/eu/hbp/mip/services/AlgorithmService.java
rename to src/main/java/hbp/mip/services/AlgorithmService.java
index 87aeca1cf..c0085ea13 100644
--- a/src/main/java/eu/hbp/mip/services/AlgorithmService.java
+++ b/src/main/java/hbp/mip/services/AlgorithmService.java
@@ -1,13 +1,13 @@
-package eu.hbp.mip.services;
+package hbp.mip.services;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import eu.hbp.mip.models.DTOs.Exareme2AlgorithmDTO;
-import eu.hbp.mip.models.DTOs.ExaremeAlgorithmDTO;
-import eu.hbp.mip.utils.CustomResourceLoader;
-import eu.hbp.mip.utils.Exceptions.BadRequestException;
-import eu.hbp.mip.utils.HTTPUtil;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DTOs.Exareme2AlgorithmDTO;
+import hbp.mip.models.DTOs.ExaremeAlgorithmDTO;
+import hbp.mip.utils.CustomResourceLoader;
+import hbp.mip.utils.Exceptions.BadRequestException;
+import hbp.mip.utils.HTTPUtil;
+import hbp.mip.utils.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Async;
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import static eu.hbp.mip.utils.InputStreamConverter.convertInputStreamToString;
+import static hbp.mip.utils.InputStreamConverter.convertInputStreamToString;
 
 @EnableScheduling
 @Service
diff --git a/src/main/java/eu/hbp/mip/services/ExperimentService.java b/src/main/java/hbp/mip/services/ExperimentService.java
similarity index 97%
rename from src/main/java/eu/hbp/mip/services/ExperimentService.java
rename to src/main/java/hbp/mip/services/ExperimentService.java
index 7715def24..b23402e5d 100644
--- a/src/main/java/eu/hbp/mip/services/ExperimentService.java
+++ b/src/main/java/hbp/mip/services/ExperimentService.java
@@ -1,22 +1,22 @@
-package eu.hbp.mip.services;
+package hbp.mip.services;
 
 import com.google.gson.Gson;
-import eu.hbp.mip.models.DAOs.ExperimentDAO;
-import eu.hbp.mip.models.DAOs.UserDAO;
-import eu.hbp.mip.models.DTOs.Exareme2AlgorithmRequestDTO;
-import eu.hbp.mip.models.DTOs.ExaremeAlgorithmRequestParamDTO;
-import eu.hbp.mip.models.DTOs.ExaremeAlgorithmResultDTO;
-import eu.hbp.mip.models.DTOs.ExperimentDTO;
-import eu.hbp.mip.repositories.ExperimentRepository;
-import eu.hbp.mip.repositories.ExperimentSpecifications;
-import eu.hbp.mip.utils.ClaimUtils;
-import eu.hbp.mip.utils.Exceptions.BadRequestException;
-import eu.hbp.mip.utils.Exceptions.InternalServerError;
-import eu.hbp.mip.utils.Exceptions.NoContent;
-import eu.hbp.mip.utils.Exceptions.UnauthorizedException;
-import eu.hbp.mip.utils.HTTPUtil;
-import eu.hbp.mip.utils.JsonConverters;
-import eu.hbp.mip.utils.Logger;
+import hbp.mip.models.DAOs.ExperimentDAO;
+import hbp.mip.models.DAOs.UserDAO;
+import hbp.mip.models.DTOs.Exareme2AlgorithmRequestDTO;
+import hbp.mip.models.DTOs.ExaremeAlgorithmRequestParamDTO;
+import hbp.mip.models.DTOs.ExaremeAlgorithmResultDTO;
+import hbp.mip.models.DTOs.ExperimentDTO;
+import hbp.mip.repositories.ExperimentRepository;
+import hbp.mip.repositories.ExperimentSpecifications;
+import hbp.mip.utils.ClaimUtils;
+import hbp.mip.utils.Exceptions.BadRequestException;
+import hbp.mip.utils.Exceptions.InternalServerError;
+import hbp.mip.utils.Exceptions.NoContent;
+import hbp.mip.utils.Exceptions.UnauthorizedException;
+import hbp.mip.utils.HTTPUtil;
+import hbp.mip.utils.JsonConverters;
+import hbp.mip.utils.Logger;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
diff --git a/src/main/java/eu/hbp/mip/utils/ClaimUtils.java b/src/main/java/hbp/mip/utils/ClaimUtils.java
similarity index 94%
rename from src/main/java/eu/hbp/mip/utils/ClaimUtils.java
rename to src/main/java/hbp/mip/utils/ClaimUtils.java
index 27b79af9f..51537a9fb 100644
--- a/src/main/java/eu/hbp/mip/utils/ClaimUtils.java
+++ b/src/main/java/hbp/mip/utils/ClaimUtils.java
@@ -1,7 +1,7 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
-import eu.hbp.mip.models.DTOs.PathologyDTO;
-import eu.hbp.mip.utils.Exceptions.UnauthorizedException;
+import hbp.mip.models.DTOs.PathologyDTO;
+import hbp.mip.utils.Exceptions.UnauthorizedException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -66,7 +66,7 @@ public class ClaimUtils {
     }
 
     public List<PathologyDTO> getAuthorizedPathologies(Logger logger, Authentication authentication,
-                                                              List<PathologyDTO> allPathologies) {
+                                                       List<PathologyDTO> allPathologies) {
 
         ArrayList<String> authorities = getAuthorityRoles(authentication);
 
diff --git a/src/main/java/eu/hbp/mip/utils/ControllerExceptionHandler.java b/src/main/java/hbp/mip/utils/ControllerExceptionHandler.java
similarity index 97%
rename from src/main/java/eu/hbp/mip/utils/ControllerExceptionHandler.java
rename to src/main/java/hbp/mip/utils/ControllerExceptionHandler.java
index bd4fd42ae..0cd1efa81 100644
--- a/src/main/java/eu/hbp/mip/utils/ControllerExceptionHandler.java
+++ b/src/main/java/hbp/mip/utils/ControllerExceptionHandler.java
@@ -1,6 +1,6 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
-import eu.hbp.mip.utils.Exceptions.*;
+import hbp.mip.utils.Exceptions.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/src/main/java/eu/hbp/mip/utils/CustomResourceLoader.java b/src/main/java/hbp/mip/utils/CustomResourceLoader.java
similarity index 92%
rename from src/main/java/eu/hbp/mip/utils/CustomResourceLoader.java
rename to src/main/java/hbp/mip/utils/CustomResourceLoader.java
index d4d5d407f..89552146c 100644
--- a/src/main/java/eu/hbp/mip/utils/CustomResourceLoader.java
+++ b/src/main/java/hbp/mip/utils/CustomResourceLoader.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
 import lombok.NonNull;
 import org.springframework.context.ResourceLoaderAware;
diff --git a/src/main/java/eu/hbp/mip/utils/Exceptions/BadRequestException.java b/src/main/java/hbp/mip/utils/Exceptions/BadRequestException.java
similarity index 78%
rename from src/main/java/eu/hbp/mip/utils/Exceptions/BadRequestException.java
rename to src/main/java/hbp/mip/utils/Exceptions/BadRequestException.java
index 6684cae28..a83830665 100644
--- a/src/main/java/eu/hbp/mip/utils/Exceptions/BadRequestException.java
+++ b/src/main/java/hbp/mip/utils/Exceptions/BadRequestException.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils.Exceptions;
+package hbp.mip.utils.Exceptions;
 
 public class BadRequestException extends RuntimeException {
 
diff --git a/src/main/java/eu/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java b/src/main/java/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java
similarity index 80%
rename from src/main/java/eu/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java
rename to src/main/java/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java
index b8e05d7e6..303735509 100644
--- a/src/main/java/eu/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java
+++ b/src/main/java/hbp/mip/utils/Exceptions/ExperimentNotFoundException.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils.Exceptions;
+package hbp.mip.utils.Exceptions;
 
 public class ExperimentNotFoundException extends RuntimeException {
 
diff --git a/src/main/java/eu/hbp/mip/utils/Exceptions/InternalServerError.java b/src/main/java/hbp/mip/utils/Exceptions/InternalServerError.java
similarity index 78%
rename from src/main/java/eu/hbp/mip/utils/Exceptions/InternalServerError.java
rename to src/main/java/hbp/mip/utils/Exceptions/InternalServerError.java
index 19bc88eed..31357164f 100644
--- a/src/main/java/eu/hbp/mip/utils/Exceptions/InternalServerError.java
+++ b/src/main/java/hbp/mip/utils/Exceptions/InternalServerError.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils.Exceptions;
+package hbp.mip.utils.Exceptions;
 
 public class InternalServerError extends RuntimeException {
 
diff --git a/src/main/java/eu/hbp/mip/utils/Exceptions/NoContent.java b/src/main/java/hbp/mip/utils/Exceptions/NoContent.java
similarity index 75%
rename from src/main/java/eu/hbp/mip/utils/Exceptions/NoContent.java
rename to src/main/java/hbp/mip/utils/Exceptions/NoContent.java
index 9bb67d811..6ac31b899 100644
--- a/src/main/java/eu/hbp/mip/utils/Exceptions/NoContent.java
+++ b/src/main/java/hbp/mip/utils/Exceptions/NoContent.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils.Exceptions;
+package hbp.mip.utils.Exceptions;
 
 public class NoContent extends RuntimeException {
 
diff --git a/src/main/java/eu/hbp/mip/utils/Exceptions/UnauthorizedException.java b/src/main/java/hbp/mip/utils/Exceptions/UnauthorizedException.java
similarity index 78%
rename from src/main/java/eu/hbp/mip/utils/Exceptions/UnauthorizedException.java
rename to src/main/java/hbp/mip/utils/Exceptions/UnauthorizedException.java
index 379911dae..1cbe3cf20 100644
--- a/src/main/java/eu/hbp/mip/utils/Exceptions/UnauthorizedException.java
+++ b/src/main/java/hbp/mip/utils/Exceptions/UnauthorizedException.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils.Exceptions;
+package hbp.mip.utils.Exceptions;
 
 public class UnauthorizedException extends RuntimeException {
 
diff --git a/src/main/java/eu/hbp/mip/utils/HTTPUtil.java b/src/main/java/hbp/mip/utils/HTTPUtil.java
similarity index 98%
rename from src/main/java/eu/hbp/mip/utils/HTTPUtil.java
rename to src/main/java/hbp/mip/utils/HTTPUtil.java
index 2ef8e5880..c5e6b08ec 100644
--- a/src/main/java/eu/hbp/mip/utils/HTTPUtil.java
+++ b/src/main/java/hbp/mip/utils/HTTPUtil.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/src/main/java/eu/hbp/mip/utils/InputStreamConverter.java b/src/main/java/hbp/mip/utils/InputStreamConverter.java
similarity index 93%
rename from src/main/java/eu/hbp/mip/utils/InputStreamConverter.java
rename to src/main/java/hbp/mip/utils/InputStreamConverter.java
index 050ba7460..0926d6fa6 100644
--- a/src/main/java/eu/hbp/mip/utils/InputStreamConverter.java
+++ b/src/main/java/hbp/mip/utils/InputStreamConverter.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/eu/hbp/mip/utils/JsonConverters.java b/src/main/java/hbp/mip/utils/JsonConverters.java
similarity index 96%
rename from src/main/java/eu/hbp/mip/utils/JsonConverters.java
rename to src/main/java/hbp/mip/utils/JsonConverters.java
index 74d01b851..fb8eaf5ff 100644
--- a/src/main/java/eu/hbp/mip/utils/JsonConverters.java
+++ b/src/main/java/hbp/mip/utils/JsonConverters.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/eu/hbp/mip/utils/Logger.java b/src/main/java/hbp/mip/utils/Logger.java
similarity index 92%
rename from src/main/java/eu/hbp/mip/utils/Logger.java
rename to src/main/java/hbp/mip/utils/Logger.java
index 60e67c7aa..faeed30ec 100644
--- a/src/main/java/eu/hbp/mip/utils/Logger.java
+++ b/src/main/java/hbp/mip/utils/Logger.java
@@ -1,4 +1,4 @@
-package eu.hbp.mip.utils;
+package hbp.mip.utils;
 
 import org.slf4j.LoggerFactory;
 
-- 
GitLab