refactor: change package name

92 files changed, 194 insertions, 194 deletions

diff --git a/src/main/java/dev/dnpm/VerweisVon.java b/src/main/java/dev/dnpm/oshelper/VerweisVon.java
index 3266a80..76b65ba 100644
--- a/src/main/java/dev/dnpm/VerweisVon.java
+++ b/src/main/java/dev/dnpm/oshelper/VerweisVon.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm;
+package dev.dnpm.oshelper;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/src/main/java/dev/dnpm/analyzer/Analyzer.java b/src/main/java/dev/dnpm/oshelper/analyzer/Analyzer.java
index fb71226..62d1369 100644
--- a/src/main/java/dev/dnpm/analyzer/Analyzer.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/Analyzer.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.analysis.OnkostarPluginType;
 
diff --git a/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java b/src/main/java/dev/dnpm/oshelper/analyzer/AnalyzerUtils.java
index 7a97a94..59a3f56 100644
--- a/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/AnalyzerUtils.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/dev/dnpm/analyzer/BackendService.java b/src/main/java/dev/dnpm/oshelper/analyzer/BackendService.java
index eaef474..3781eae 100644
--- a/src/main/java/dev/dnpm/analyzer/BackendService.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/BackendService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/analyzer/ConsentManager.java b/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java
index e349475..1fa47a1 100644
--- a/src/main/java/dev/dnpm/analyzer/ConsentManager.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/ConsentManager.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
-import dev.dnpm.services.consent.ConsentManagerServiceFactory;
+import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/analyzer/DNPMHelper.java b/src/main/java/dev/dnpm/oshelper/analyzer/DNPMHelper.java
index 890a725..e779691 100644
--- a/src/main/java/dev/dnpm/analyzer/DNPMHelper.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/DNPMHelper.java
@@ -22,14 +22,14 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
-
-import dev.dnpm.dto.EcogStatusWithDate;
-import dev.dnpm.VerweisVon;
-import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator;
-import dev.dnpm.security.IllegalSecuredObjectAccessException;
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.services.systemtherapie.SystemtherapieService;
+package dev.dnpm.oshelper.analyzer;
+
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.VerweisVon;
+import dev.dnpm.oshelper.security.DelegatingDataBasedPermissionEvaluator;
+import dev.dnpm.oshelper.security.IllegalSecuredObjectAccessException;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.services.systemtherapie.SystemtherapieService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.itc.onkostar.api.Disease;
diff --git a/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java b/src/main/java/dev/dnpm/oshelper/analyzer/EinzelempfehlungAnalyzer.java
index 876c7a0..49997ed 100644
--- a/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/EinzelempfehlungAnalyzer.java
@@ -22,14 +22,14 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
-
-import dev.dnpm.dto.Studie;
-import dev.dnpm.dto.Variant;
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.security.PersonPoolBasedPermissionEvaluator;
-import dev.dnpm.services.StudienService;
-import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService;
+package dev.dnpm.oshelper.analyzer;
+
+import dev.dnpm.oshelper.dto.Studie;
+import dev.dnpm.oshelper.dto.Variant;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.security.PersonPoolBasedPermissionEvaluator;
+import dev.dnpm.oshelper.services.StudienService;
+import dev.dnpm.oshelper.services.molekulargenetik.MolekulargenetikFormService;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java b/src/main/java/dev/dnpm/oshelper/analyzer/FollowUpAnalyzer.java
index 26d70e3..4a3aeb9 100644
--- a/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/FollowUpAnalyzer.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/main/java/dev/dnpm/analyzer/IPluginPart.java b/src/main/java/dev/dnpm/oshelper/analyzer/IPluginPart.java
index 43fee31..21cbf53 100644
--- a/src/main/java/dev/dnpm/analyzer/IPluginPart.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/IPluginPart.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.analysis.IProcedureAnalyzer;
 
diff --git a/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java b/src/main/java/dev/dnpm/oshelper/analyzer/Merkmalskatalog.java
index 313af31..3a9ea43 100644
--- a/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/Merkmalskatalog.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java b/src/main/java/dev/dnpm/oshelper/analyzer/TherapieMitEcogAnalyzer.java
index eb08173..d8ba0eb 100644
--- a/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/TherapieMitEcogAnalyzer.java
@@ -22,11 +22,11 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
-import dev.dnpm.dto.EcogStatusWithDate;
-import dev.dnpm.services.strahlentherapie.StrahlentherapieService;
-import dev.dnpm.services.systemtherapie.SystemtherapieService;
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.services.strahlentherapie.StrahlentherapieService;
+import dev.dnpm.oshelper.services.systemtherapie.SystemtherapieService;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java b/src/main/java/dev/dnpm/oshelper/analyzer/TherapieplanAnalyzer.java
index 8241f58..4d546f9 100644
--- a/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java
+++ b/src/main/java/dev/dnpm/oshelper/analyzer/TherapieplanAnalyzer.java
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
-import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator;
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.services.mtb.MtbService;
-import dev.dnpm.services.therapieplan.TherapieplanServiceFactory;
+import dev.dnpm.oshelper.security.DelegatingDataBasedPermissionEvaluator;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.services.mtb.MtbService;
+import dev.dnpm.oshelper.services.therapieplan.TherapieplanServiceFactory;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.analysis.AnalyseTriggerEvent;
diff --git a/src/main/java/dev/dnpm/config/PluginConfiguration.java b/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java
index 4787528..ebf11c3 100644
--- a/src/main/java/dev/dnpm/config/PluginConfiguration.java
+++ b/src/main/java/dev/dnpm/oshelper/config/PluginConfiguration.java
@@ -22,20 +22,20 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.config;
+package dev.dnpm.oshelper.config;
 
-import dev.dnpm.database.SettingsRepository;
-import dev.dnpm.services.*;
-import dev.dnpm.services.consent.ConsentManagerServiceFactory;
-import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService;
-import dev.dnpm.services.molekulargenetik.OsMolekulargenetikFormService;
-import dev.dnpm.services.mtb.DefaultMtbService;
-import dev.dnpm.services.mtb.MtbService;
-import dev.dnpm.services.strahlentherapie.DefaultStrahlentherapieService;
-import dev.dnpm.services.strahlentherapie.StrahlentherapieService;
-import dev.dnpm.services.systemtherapie.DefaultSystemtherapieService;
-import dev.dnpm.services.systemtherapie.SystemtherapieService;
-import dev.dnpm.services.therapieplan.TherapieplanServiceFactory;
+import dev.dnpm.oshelper.database.SettingsRepository;
+import dev.dnpm.oshelper.services.*;
+import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory;
+import dev.dnpm.oshelper.services.molekulargenetik.MolekulargenetikFormService;
+import dev.dnpm.oshelper.services.molekulargenetik.OsMolekulargenetikFormService;
+import dev.dnpm.oshelper.services.mtb.DefaultMtbService;
+import dev.dnpm.oshelper.services.mtb.MtbService;
+import dev.dnpm.oshelper.services.strahlentherapie.DefaultStrahlentherapieService;
+import dev.dnpm.oshelper.services.strahlentherapie.StrahlentherapieService;
+import dev.dnpm.oshelper.services.systemtherapie.DefaultSystemtherapieService;
+import dev.dnpm.oshelper.services.systemtherapie.SystemtherapieService;
+import dev.dnpm.oshelper.services.therapieplan.TherapieplanServiceFactory;
 import de.itc.onkostar.api.IOnkostarApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -50,7 +50,7 @@ import javax.sql.DataSource;
  * @since 0.0.2
  */
 @Configuration
-@ComponentScan(basePackages = { "dev.dnpm.analyzer", "dev.dnpm.security" })
+@ComponentScan(basePackages = {"dev.dnpm.oshelper.analyzer", "dev.dnpm.oshelper.security"})
 @EnableJpaRepositories(basePackages = "dev.dnpm.database")
 public class PluginConfiguration {
 
diff --git a/src/main/java/dev/dnpm/database/ReadOnlyRepository.java b/src/main/java/dev/dnpm/oshelper/database/ReadOnlyRepository.java
index aa7ce31..8c3586e 100644
--- a/src/main/java/dev/dnpm/database/ReadOnlyRepository.java
+++ b/src/main/java/dev/dnpm/oshelper/database/ReadOnlyRepository.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.database;
+package dev.dnpm.oshelper.database;
 
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.Repository;
diff --git a/src/main/java/dev/dnpm/database/SettingsRepository.java b/src/main/java/dev/dnpm/oshelper/database/SettingsRepository.java
index 90e33bd..009c722 100644
--- a/src/main/java/dev/dnpm/database/SettingsRepository.java
+++ b/src/main/java/dev/dnpm/oshelper/database/SettingsRepository.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.database;
+package dev.dnpm.oshelper.database;
 
 import de.itc.db.dnpm.Setting;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java b/src/main/java/dev/dnpm/oshelper/dto/EcogStatusWithDate.java
index a562940..b09d9bf 100644
--- a/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java
+++ b/src/main/java/dev/dnpm/oshelper/dto/EcogStatusWithDate.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.dto;
+package dev.dnpm.oshelper.dto;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/dev/dnpm/dto/Studie.java b/src/main/java/dev/dnpm/oshelper/dto/Studie.java
index 300dd22..98b6fa5 100644
--- a/src/main/java/dev/dnpm/dto/Studie.java
+++ b/src/main/java/dev/dnpm/oshelper/dto/Studie.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.dto;
+package dev.dnpm.oshelper.dto;
 
 public class Studie {
     private final String kategorieName;
diff --git a/src/main/java/dev/dnpm/dto/Variant.java b/src/main/java/dev/dnpm/oshelper/dto/Variant.java
index 6fd646b..6edee9b 100644
--- a/src/main/java/dev/dnpm/dto/Variant.java
+++ b/src/main/java/dev/dnpm/oshelper/dto/Variant.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.dto;
+package dev.dnpm.oshelper.dto;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/exceptions/FormException.java b/src/main/java/dev/dnpm/oshelper/exceptions/FormException.java
index 49adf4a..745cb5d 100644
--- a/src/main/java/dev/dnpm/exceptions/FormException.java
+++ b/src/main/java/dev/dnpm/oshelper/exceptions/FormException.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.exceptions;
+package dev.dnpm.oshelper.exceptions;
 
 public class FormException extends RuntimeException {
 
diff --git a/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java b/src/main/java/dev/dnpm/oshelper/security/AbstractDelegatedPermissionEvaluator.java
index 4be54ec..99c3267 100644
--- a/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/oshelper/security/AbstractDelegatedPermissionEvaluator.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/oshelper/security/DelegatingDataBasedPermissionEvaluator.java
index 8beca73..fcc5f05 100644
--- a/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/oshelper/security/DelegatingDataBasedPermissionEvaluator.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/oshelper/security/FormBasedPermissionEvaluator.java
index 57552d7..0de6ff5 100644
--- a/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/oshelper/security/FormBasedPermissionEvaluator.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java b/src/main/java/dev/dnpm/oshelper/security/FormBasedSecurityAspects.java
index 646ec35..36f63f8 100644
--- a/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java
+++ b/src/main/java/dev/dnpm/oshelper/security/FormBasedSecurityAspects.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.Procedure;
 import org.aspectj.lang.JoinPoint;
@@ -50,7 +50,7 @@ public class FormBasedSecurityAspects {
         this.permissionEvaluator = permissionEvaluator;
     }
 
-    @AfterReturning(value = "@annotation(dev.dnpm.security.FormSecuredResult)", returning = "procedure")
+    @AfterReturning(value = "@annotation(dev.dnpm.oshelper.security.FormSecuredResult)", returning = "procedure")
     public void afterProcedureFormBased(Procedure procedure) {
         if (
                 null != procedure
@@ -61,7 +61,7 @@ public class FormBasedSecurityAspects {
         }
     }
 
-    @Before(value = "@annotation(dev.dnpm.security.FormSecured)")
+    @Before(value = "@annotation(dev.dnpm.oshelper.security.FormSecured)")
     public void beforeProcedureFormBased(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Procedure)
diff --git a/src/main/java/dev/dnpm/security/FormSecured.java b/src/main/java/dev/dnpm/oshelper/security/FormSecured.java
index 3b0ec83..560e674 100644
--- a/src/main/java/dev/dnpm/security/FormSecured.java
+++ b/src/main/java/dev/dnpm/oshelper/security/FormSecured.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/dev/dnpm/security/FormSecuredResult.java b/src/main/java/dev/dnpm/oshelper/security/FormSecuredResult.java
index d0c351e..94680e8 100644
--- a/src/main/java/dev/dnpm/security/FormSecuredResult.java
+++ b/src/main/java/dev/dnpm/oshelper/security/FormSecuredResult.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java b/src/main/java/dev/dnpm/oshelper/security/IllegalSecuredObjectAccessException.java
index c6145e0..92caf46 100644
--- a/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java
+++ b/src/main/java/dev/dnpm/oshelper/security/IllegalSecuredObjectAccessException.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 public class IllegalSecuredObjectAccessException extends RuntimeException {
 
diff --git a/src/main/java/dev/dnpm/security/PermissionType.java b/src/main/java/dev/dnpm/oshelper/security/PermissionType.java
index 835ac95..a28dd45 100644
--- a/src/main/java/dev/dnpm/security/PermissionType.java
+++ b/src/main/java/dev/dnpm/oshelper/security/PermissionType.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 public enum PermissionType {
     READ,
diff --git a/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/oshelper/security/PersonPoolBasedPermissionEvaluator.java
index 9686a47..f715a36 100644
--- a/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/oshelper/security/PersonPoolBasedPermissionEvaluator.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java b/src/main/java/dev/dnpm/oshelper/security/PersonPoolBasedSecurityAspects.java
index ebe65d9..fdf5a92 100644
--- a/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java
+++ b/src/main/java/dev/dnpm/oshelper/security/PersonPoolBasedSecurityAspects.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
@@ -49,7 +49,7 @@ public class PersonPoolBasedSecurityAspects {
         this.permissionEvaluator = permissionEvaluator;
     }
 
-    @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult) ", returning = "patient")
+    @AfterReturning(value = "@annotation(dev.dnpm.oshelper.security.PersonPoolSecuredResult) ", returning = "patient")
     public void afterPatient(Patient patient) {
         if (
                 null != patient
@@ -60,7 +60,7 @@ public class PersonPoolBasedSecurityAspects {
         }
     }
 
-    @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult)", returning = "procedure")
+    @AfterReturning(value = "@annotation(dev.dnpm.oshelper.security.PersonPoolSecuredResult)", returning = "procedure")
     public void afterProcedure(Procedure procedure) {
         if (
                 null != procedure
@@ -71,7 +71,7 @@ public class PersonPoolBasedSecurityAspects {
         }
     }
 
-    @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)")
+    @Before(value = "@annotation(dev.dnpm.oshelper.security.PersonPoolSecured)")
     public void beforePatient(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Patient)
@@ -83,7 +83,7 @@ public class PersonPoolBasedSecurityAspects {
                 });
     }
 
-    @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)")
+    @Before(value = "@annotation(dev.dnpm.oshelper.security.PersonPoolSecured)")
     public void beforeProcedure(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Procedure)
diff --git a/src/main/java/dev/dnpm/security/PersonPoolSecured.java b/src/main/java/dev/dnpm/oshelper/security/PersonPoolSecured.java
index bb80926..c1dad0c 100644
--- a/src/main/java/dev/dnpm/security/PersonPoolSecured.java
+++ b/src/main/java/dev/dnpm/oshelper/security/PersonPoolSecured.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java b/src/main/java/dev/dnpm/oshelper/security/PersonPoolSecuredResult.java
index 5df40fe..5d4bdf7 100644
--- a/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java
+++ b/src/main/java/dev/dnpm/oshelper/security/PersonPoolSecuredResult.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/dev/dnpm/security/SecurityService.java b/src/main/java/dev/dnpm/oshelper/security/SecurityService.java
index 4f87511..8d952ea 100644
--- a/src/main/java/dev/dnpm/security/SecurityService.java
+++ b/src/main/java/dev/dnpm/oshelper/security/SecurityService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/dev/dnpm/services/DefaultFormService.java b/src/main/java/dev/dnpm/oshelper/services/DefaultFormService.java
index e3f0aca..eee5be8 100644
--- a/src/main/java/dev/dnpm/services/DefaultFormService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/DefaultFormService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.exceptions.FormException;
+import dev.dnpm.oshelper.exceptions.FormException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/dev/dnpm/services/DefaultStudienService.java b/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java
index 47b4637..b39c7b5 100644
--- a/src/main/java/dev/dnpm/services/DefaultStudienService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/DefaultStudienService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.dto.Studie;
+import dev.dnpm.oshelper.dto.Studie;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/dev/dnpm/services/FormService.java b/src/main/java/dev/dnpm/oshelper/services/FormService.java
index bc65110..272e7d0 100644
--- a/src/main/java/dev/dnpm/services/FormService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/FormService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.exceptions.FormException;
+import dev.dnpm.oshelper.exceptions.FormException;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.constants.JaNeinUnbekannt;
 
diff --git a/src/main/java/dev/dnpm/services/SettingsService.java b/src/main/java/dev/dnpm/oshelper/services/SettingsService.java
index cec0bdc..feae07f 100644
--- a/src/main/java/dev/dnpm/services/SettingsService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/SettingsService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.database.SettingsRepository;
+import dev.dnpm.oshelper.database.SettingsRepository;
 
 import java.util.Optional;
 
diff --git a/src/main/java/dev/dnpm/services/StudienService.java b/src/main/java/dev/dnpm/oshelper/services/StudienService.java
index 6b01699..ba3a2ac 100644
--- a/src/main/java/dev/dnpm/services/StudienService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/StudienService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.dto.Studie;
+import dev.dnpm.oshelper.dto.Studie;
 
 import java.util.List;
 
diff --git a/src/main/java/dev/dnpm/services/TherapieMitEcogService.java b/src/main/java/dev/dnpm/oshelper/services/TherapieMitEcogService.java
index 81b8436..fb07137 100644
--- a/src/main/java/dev/dnpm/services/TherapieMitEcogService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/TherapieMitEcogService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
 import de.itc.onkostar.api.Patient;
 
 import java.util.List;
diff --git a/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java
index 1879da7..10a265c 100644
--- a/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java
index a35ac1b..45207f8 100644
--- a/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java
+++ b/src/main/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactory.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 
diff --git a/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java
index e7f48ec..fcb3509 100644
--- a/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/consent/MrConsentManagerService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
-import dev.dnpm.VerweisVon;
+import dev.dnpm.oshelper.VerweisVon;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java b/src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java
index cb35b2f..1aede17 100644
--- a/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java b/src/main/java/dev/dnpm/oshelper/services/molekulargenetik/MolekulargenetikFormService.java
index 6a2603a..df34dff 100644
--- a/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/molekulargenetik/MolekulargenetikFormService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.molekulargenetik;
+package dev.dnpm.oshelper.services.molekulargenetik;
 
-import dev.dnpm.dto.Variant;
+import dev.dnpm.oshelper.dto.Variant;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java b/src/main/java/dev/dnpm/oshelper/services/molekulargenetik/OsMolekulargenetikFormService.java
index 4c9c804..c567146 100644
--- a/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/molekulargenetik/OsMolekulargenetikFormService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.molekulargenetik;
+package dev.dnpm.oshelper.services.molekulargenetik;
 
-import dev.dnpm.dto.Variant;
+import dev.dnpm.oshelper.dto.Variant;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java b/src/main/java/dev/dnpm/oshelper/services/mtb/DefaultMtbService.java
index 5237d02..99ee033 100644
--- a/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/DefaultMtbService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java b/src/main/java/dev/dnpm/oshelper/services/mtb/MrMtbAnmeldungToProtocolMapper.java
index 203edd7..4224e45 100644
--- a/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/MrMtbAnmeldungToProtocolMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/services/mtb/MtbService.java b/src/main/java/dev/dnpm/oshelper/services/mtb/MtbService.java
index a8b8f9d..6886c53 100644
--- a/src/main/java/dev/dnpm/services/mtb/MtbService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/MtbService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzToProtocolMapper.java
index 21e056e..2c37431 100644
--- a/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzToProtocolMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
index a29b580..49a40aa 100644
--- a/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java b/src/main/java/dev/dnpm/oshelper/services/mtb/ProcedureToProtocolMapper.java
index ce9a514..2175ed6 100644
--- a/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/mtb/ProcedureToProtocolMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java b/src/main/java/dev/dnpm/oshelper/services/strahlentherapie/DefaultStrahlentherapieService.java
index 52bd1fb..65556b1 100644
--- a/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/strahlentherapie/DefaultStrahlentherapieService.java
@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.strahlentherapie;
+package dev.dnpm.oshelper.services.strahlentherapie;
 
-import dev.dnpm.dto.EcogStatusWithDate;
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.services.SettingsService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java b/src/main/java/dev/dnpm/oshelper/services/strahlentherapie/StrahlentherapieService.java
index 595d14d..7ed93d4 100644
--- a/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/strahlentherapie/StrahlentherapieService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.strahlentherapie;
+package dev.dnpm.oshelper.services.strahlentherapie;
 
-import dev.dnpm.services.TherapieMitEcogService;
+import dev.dnpm.oshelper.services.TherapieMitEcogService;
 
 /**
  * Service für Systemtherapieformulare
diff --git a/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/DefaultSystemtherapieService.java
index fdac25c..3eb7cdf 100644
--- a/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/DefaultSystemtherapieService.java
@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
-import dev.dnpm.dto.EcogStatusWithDate;
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.services.SettingsService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
index 8db1e93..f7791e7 100644
--- a/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/ProzedurToProzedurwerteMapper.java
index de5bdb8..397cd0d 100644
--- a/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java
+++ b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/ProzedurToProzedurwerteMapper.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/SystemtherapieService.java
index 0a1f1b8..0cbf614 100644
--- a/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/systemtherapie/SystemtherapieService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
-import dev.dnpm.services.TherapieMitEcogService;
+import dev.dnpm.oshelper.services.TherapieMitEcogService;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java b/src/main/java/dev/dnpm/oshelper/services/therapieplan/AbstractTherapieplanService.java
index 01c6861..5d7825e 100644
--- a/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/therapieplan/AbstractTherapieplanService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
-import dev.dnpm.services.FormService;
+import dev.dnpm.oshelper.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java b/src/main/java/dev/dnpm/oshelper/services/therapieplan/DefaultTherapieplanService.java
index 6b162c0..028b6c3 100644
--- a/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/therapieplan/DefaultTherapieplanService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
-import dev.dnpm.services.FormService;
+import dev.dnpm.oshelper.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
@@ -35,8 +35,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import static dev.dnpm.services.FormService.hasValue;
-import static dev.dnpm.services.FormService.isYes;
+import static dev.dnpm.oshelper.services.FormService.hasValue;
+import static dev.dnpm.oshelper.services.FormService.isYes;
 
 public class DefaultTherapieplanService extends AbstractTherapieplanService {
 
diff --git a/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java b/src/main/java/dev/dnpm/oshelper/services/therapieplan/MultipleMtbTherapieplanService.java
index 3df8b98..78612de 100644
--- a/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/therapieplan/MultipleMtbTherapieplanService.java
@@ -22,9 +22,9 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
-import dev.dnpm.services.FormService;
+import dev.dnpm.oshelper.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 
@@ -34,8 +34,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static dev.dnpm.services.FormService.hasValue;
-import static dev.dnpm.services.FormService.isYes;
+import static dev.dnpm.oshelper.services.FormService.hasValue;
+import static dev.dnpm.oshelper.services.FormService.isYes;
 
 public class MultipleMtbTherapieplanService extends AbstractTherapieplanService {
 
diff --git a/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java b/src/main/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanService.java
index 13a6352..fecdd1d 100644
--- a/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java
+++ b/src/main/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanService.java
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java b/src/main/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanServiceFactory.java
index 28e2621..2edf3fb 100644
--- a/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java
+++ b/src/main/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanServiceFactory.java
@@ -22,10 +22,10 @@
  * SOFTWARE.
  */
 
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
-import dev.dnpm.services.FormService;
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.services.FormService;
+import dev.dnpm.oshelper.services.SettingsService;
 import de.itc.onkostar.api.IOnkostarApi;
 
 public class TherapieplanServiceFactory {
diff --git a/src/main/resources/de/itc/onkostar/library/moduleContext.xml b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
index 27035ed..3fc2a1d 100644
--- a/src/main/resources/de/itc/onkostar/library/moduleContext.xml
+++ b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
@@ -10,14 +10,14 @@
         http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
         http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
  
-    <bean id="DNPMHelper" class="dev.dnpm.analyzer.DNPMHelper">
+    <bean id="DNPMHelper" class="dev.dnpm.oshelper.analyzer.DNPMHelper">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="systemtherapieService" />
     </bean>
-    <bean id="Merkmalskatalog" class="dev.dnpm.analyzer.Merkmalskatalog">
+    <bean id="Merkmalskatalog" class="dev.dnpm.oshelper.analyzer.Merkmalskatalog">
         <constructor-arg ref="localOnkostarApi" />
     </bean>
-    <bean id="ConsentManager" class="dev.dnpm.analyzer.ConsentManager">
+    <bean id="ConsentManager" class="dev.dnpm.oshelper.analyzer.ConsentManager">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="consentManagerServiceFactory" />
     </bean>
diff --git a/src/test/java/dev/dnpm/ConsentManagerTest.java b/src/test/java/dev/dnpm/oshelper/ConsentManagerTest.java
index 96d21e5..028bcce 100644
--- a/src/test/java/dev/dnpm/ConsentManagerTest.java
+++ b/src/test/java/dev/dnpm/oshelper/ConsentManagerTest.java
@@ -1,8 +1,8 @@
-package dev.dnpm;
+package dev.dnpm.oshelper;
 
-import dev.dnpm.analyzer.ConsentManager;
-import dev.dnpm.services.consent.ConsentManagerServiceFactory;
-import dev.dnpm.services.consent.MrConsentManagerService;
+import dev.dnpm.oshelper.analyzer.ConsentManager;
+import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory;
+import dev.dnpm.oshelper.services.consent.MrConsentManagerService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/dev/dnpm/DNPMHelperTest.java b/src/test/java/dev/dnpm/oshelper/DNPMHelperTest.java
index 9aa08dd..858c5b4 100644
--- a/src/test/java/dev/dnpm/DNPMHelperTest.java
+++ b/src/test/java/dev/dnpm/oshelper/DNPMHelperTest.java
@@ -1,10 +1,10 @@
-package dev.dnpm;
+package dev.dnpm.oshelper;
 
-import dev.dnpm.analyzer.DNPMHelper;
-import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator;
-import dev.dnpm.security.IllegalSecuredObjectAccessException;
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.services.systemtherapie.SystemtherapieService;
+import dev.dnpm.oshelper.analyzer.DNPMHelper;
+import dev.dnpm.oshelper.security.DelegatingDataBasedPermissionEvaluator;
+import dev.dnpm.oshelper.security.IllegalSecuredObjectAccessException;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.services.systemtherapie.SystemtherapieService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/MerkmalskatalogTest.java b/src/test/java/dev/dnpm/oshelper/MerkmalskatalogTest.java
index bd877f0..b688b5d 100644
--- a/src/test/java/dev/dnpm/MerkmalskatalogTest.java
+++ b/src/test/java/dev/dnpm/oshelper/MerkmalskatalogTest.java
@@ -1,6 +1,6 @@
-package dev.dnpm;
+package dev.dnpm.oshelper;
 
-import dev.dnpm.analyzer.Merkmalskatalog;
+import dev.dnpm.oshelper.analyzer.Merkmalskatalog;
 import de.itc.onkostar.api.IOnkostarApi;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
diff --git a/src/test/java/dev/dnpm/analyzer/AnalyzerUtilsTest.java b/src/test/java/dev/dnpm/oshelper/analyzer/AnalyzerUtilsTest.java
index 2d51bbc..4d96f3c 100644
--- a/src/test/java/dev/dnpm/analyzer/AnalyzerUtilsTest.java
+++ b/src/test/java/dev/dnpm/oshelper/analyzer/AnalyzerUtilsTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzerTest.java b/src/test/java/dev/dnpm/oshelper/analyzer/EinzelempfehlungAnalyzerTest.java
index fbc1d92..fab47b5 100644
--- a/src/test/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzerTest.java
+++ b/src/test/java/dev/dnpm/oshelper/analyzer/EinzelempfehlungAnalyzerTest.java
@@ -1,9 +1,9 @@
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.security.PersonPoolBasedPermissionEvaluator;
-import dev.dnpm.services.StudienService;
-import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.security.PersonPoolBasedPermissionEvaluator;
+import dev.dnpm.oshelper.services.StudienService;
+import dev.dnpm.oshelper.services.molekulargenetik.MolekulargenetikFormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/dev/dnpm/analyzer/FollowUpAnalyzerTest.java b/src/test/java/dev/dnpm/oshelper/analyzer/FollowUpAnalyzerTest.java
index cfe5427..18db7e8 100644
--- a/src/test/java/dev/dnpm/analyzer/FollowUpAnalyzerTest.java
+++ b/src/test/java/dev/dnpm/oshelper/analyzer/FollowUpAnalyzerTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzerTest.java b/src/test/java/dev/dnpm/oshelper/analyzer/TherapieMitEcogAnalyzerTest.java
index a37ac06..5a516eb 100644
--- a/src/test/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzerTest.java
+++ b/src/test/java/dev/dnpm/oshelper/analyzer/TherapieMitEcogAnalyzerTest.java
@@ -1,8 +1,8 @@
-package dev.dnpm.analyzer;
+package dev.dnpm.oshelper.analyzer;
 
-import dev.dnpm.dto.EcogStatusWithDate;
-import dev.dnpm.services.strahlentherapie.StrahlentherapieService;
-import dev.dnpm.services.systemtherapie.SystemtherapieService;
+import dev.dnpm.oshelper.dto.EcogStatusWithDate;
+import dev.dnpm.oshelper.services.strahlentherapie.StrahlentherapieService;
+import dev.dnpm.oshelper.services.systemtherapie.SystemtherapieService;
 import de.itc.onkostar.api.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/dev/dnpm/analyzer/TherapieplanAnalyzerTest.java b/src/test/java/dev/dnpm/oshelper/analyzer/TherapieplanAnalyzerTest.java
index 2f22e37..8d18563 100644
--- a/src/test/java/dev/dnpm/analyzer/TherapieplanAnalyzerTest.java
+++ b/src/test/java/dev/dnpm/oshelper/analyzer/TherapieplanAnalyzerTest.java
@@ -1,12 +1,12 @@
-package dev.dnpm.analyzer;
-
-import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator;
-import dev.dnpm.security.PermissionType;
-import dev.dnpm.services.FormService;
-import dev.dnpm.services.mtb.MtbService;
-import dev.dnpm.services.therapieplan.MultipleMtbTherapieplanService;
-import dev.dnpm.services.therapieplan.TherapieplanService;
-import dev.dnpm.services.therapieplan.TherapieplanServiceFactory;
+package dev.dnpm.oshelper.analyzer;
+
+import dev.dnpm.oshelper.security.DelegatingDataBasedPermissionEvaluator;
+import dev.dnpm.oshelper.security.PermissionType;
+import dev.dnpm.oshelper.services.FormService;
+import dev.dnpm.oshelper.services.mtb.MtbService;
+import dev.dnpm.oshelper.services.therapieplan.MultipleMtbTherapieplanService;
+import dev.dnpm.oshelper.services.therapieplan.TherapieplanService;
+import dev.dnpm.oshelper.services.therapieplan.TherapieplanServiceFactory;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/test/java/dev/dnpm/config/PluginConfigurationTest.java b/src/test/java/dev/dnpm/oshelper/config/PluginConfigurationTest.java
index a71630f..bed0e17 100644
--- a/src/test/java/dev/dnpm/config/PluginConfigurationTest.java
+++ b/src/test/java/dev/dnpm/oshelper/config/PluginConfigurationTest.java
@@ -1,9 +1,9 @@
-package dev.dnpm.config;
+package dev.dnpm.oshelper.config;
 
-import dev.dnpm.services.FormService;
-import dev.dnpm.services.SettingsService;
-import dev.dnpm.services.therapieplan.TherapieplanServiceFactory;
-import dev.dnpm.services.consent.ConsentManagerServiceFactory;
+import dev.dnpm.oshelper.services.FormService;
+import dev.dnpm.oshelper.services.SettingsService;
+import dev.dnpm.oshelper.services.therapieplan.TherapieplanServiceFactory;
+import dev.dnpm.oshelper.services.consent.ConsentManagerServiceFactory;
 import de.itc.onkostar.api.IOnkostarApi;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/dev/dnpm/dto/VariantTest.java b/src/test/java/dev/dnpm/oshelper/dto/VariantTest.java
index f699f0c..3028217 100644
--- a/src/test/java/dev/dnpm/dto/VariantTest.java
+++ b/src/test/java/dev/dnpm/oshelper/dto/VariantTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.dto;
+package dev.dnpm.oshelper.dto;
 
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/test/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/oshelper/security/DelegatingDataBasedPermissionEvaluatorTest.java
index c1e71db..aebd563 100644
--- a/src/test/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluatorTest.java
+++ b/src/test/java/dev/dnpm/oshelper/security/DelegatingDataBasedPermissionEvaluatorTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/security/FormBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/oshelper/security/FormBasedPermissionEvaluatorTest.java
index 2ce938f..c099e19 100644
--- a/src/test/java/dev/dnpm/security/FormBasedPermissionEvaluatorTest.java
+++ b/src/test/java/dev/dnpm/oshelper/security/FormBasedPermissionEvaluatorTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/security/FormBasedSecurityAspectsTest.java b/src/test/java/dev/dnpm/oshelper/security/FormBasedSecurityAspectsTest.java
index ee57688..4f1aa17 100644
--- a/src/test/java/dev/dnpm/security/FormBasedSecurityAspectsTest.java
+++ b/src/test/java/dev/dnpm/oshelper/security/FormBasedSecurityAspectsTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/oshelper/security/PersonPoolBasedPermissionEvaluatorTest.java
index a5f39e3..adc8c7b 100644
--- a/src/test/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluatorTest.java
+++ b/src/test/java/dev/dnpm/oshelper/security/PersonPoolBasedPermissionEvaluatorTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/security/PersonPoolBasedSecurityAspectsTest.java b/src/test/java/dev/dnpm/oshelper/security/PersonPoolBasedSecurityAspectsTest.java
index 333a8f3..9ba519c 100644
--- a/src/test/java/dev/dnpm/security/PersonPoolBasedSecurityAspectsTest.java
+++ b/src/test/java/dev/dnpm/oshelper/security/PersonPoolBasedSecurityAspectsTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.security;
+package dev.dnpm.oshelper.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/test/java/dev/dnpm/services/SettingsServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/SettingsServiceTest.java
index 4a5e10e..b8fb3ed 100644
--- a/src/test/java/dev/dnpm/services/SettingsServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/SettingsServiceTest.java
@@ -1,7 +1,7 @@
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
 import de.itc.db.dnpm.Setting;
-import dev.dnpm.database.SettingsRepository;
+import dev.dnpm.oshelper.database.SettingsRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/dev/dnpm/services/StudieTest.java b/src/test/java/dev/dnpm/oshelper/services/StudieTest.java
index debf6b9..e60483e 100644
--- a/src/test/java/dev/dnpm/services/StudieTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/StudieTest.java
@@ -1,6 +1,6 @@
-package dev.dnpm.services;
+package dev.dnpm.oshelper.services;
 
-import dev.dnpm.dto.Studie;
+import dev.dnpm.oshelper.dto.Studie;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/src/test/java/dev/dnpm/services/consent/ConsentManagerServiceFactoryTest.java b/src/test/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactoryTest.java
index b0d76e3..50c6f9b 100644
--- a/src/test/java/dev/dnpm/services/consent/ConsentManagerServiceFactoryTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/consent/ConsentManagerServiceFactoryTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/consent/MrConsentManagerServiceTest.java
index bcecbf6..4143dff 100644
--- a/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/consent/MrConsentManagerServiceTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerServiceTest.java
index e0485db..985524f 100644
--- a/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/consent/UkwConsentManagerServiceTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.consent;
+package dev.dnpm.oshelper.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
index 23c1e8e..f17d964 100644
--- a/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.molekulargenetik;
+package dev.dnpm.oshelper.services.molekulargenetik;
 
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/test/java/dev/dnpm/services/mtb/DefaultMtbServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/mtb/DefaultMtbServiceTest.java
index 0919d89..723e997 100644
--- a/src/test/java/dev/dnpm/services/mtb/DefaultMtbServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/mtb/DefaultMtbServiceTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java b/src/test/java/dev/dnpm/oshelper/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
index 5253cfc..86ac5d5 100644
--- a/src/test/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapperTest.java b/src/test/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
index 863ed55..c7fdfca 100644
--- a/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzToProtocolMapperTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java b/src/test/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
index 0768a2f..316a012 100644
--- a/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.mtb;
+package dev.dnpm.oshelper.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java
index 9aaa68b..b490060 100644
--- a/src/test/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java
@@ -1,6 +1,6 @@
-package dev.dnpm.services.strahlentherapie;
+package dev.dnpm.oshelper.services.strahlentherapie;
 
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.services.SettingsService;
 import de.itc.onkostar.api.*;
 import org.assertj.core.util.Lists;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/systemtherapie/DefaultSystemtherapieServiceTest.java
index 2744c52..b60a678 100644
--- a/src/test/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/systemtherapie/DefaultSystemtherapieServiceTest.java
@@ -1,6 +1,6 @@
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.services.SettingsService;
 import de.itc.onkostar.api.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java b/src/test/java/dev/dnpm/oshelper/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
index 6dbdada..edb876b 100644
--- a/src/test/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java
@@ -1,4 +1,4 @@
-package dev.dnpm.services.systemtherapie;
+package dev.dnpm.oshelper.services.systemtherapie;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java b/src/test/java/dev/dnpm/oshelper/services/therapieplan/DefaultTherapieplanServiceTest.java
index 4554c0a..79869e2 100644
--- a/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/therapieplan/DefaultTherapieplanServiceTest.java
@@ -1,10 +1,10 @@
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.constants.JaNeinUnbekannt;
-import dev.dnpm.services.FormService;
+import dev.dnpm.oshelper.services.FormService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java b/src/test/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanServiceFactoryTest.java
index 0a341a3..9b526e2 100644
--- a/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java
+++ b/src/test/java/dev/dnpm/oshelper/services/therapieplan/TherapieplanServiceFactoryTest.java
@@ -1,8 +1,8 @@
-package dev.dnpm.services.therapieplan;
+package dev.dnpm.oshelper.services.therapieplan;
 
 import de.itc.onkostar.api.IOnkostarApi;
-import dev.dnpm.services.FormService;
-import dev.dnpm.services.SettingsService;
+import dev.dnpm.oshelper.services.FormService;
+import dev.dnpm.oshelper.services.SettingsService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;