refactor: use package name following Java guidelines

62 files changed, 130 insertions, 130 deletions

diff --git a/src/main/java/DNPM/VerweisVon.java b/src/main/java/dev/dnpm/VerweisVon.java
index afb6824..77fd14a 100644
--- a/src/main/java/DNPM/VerweisVon.java
+++ b/src/main/java/dev/dnpm/VerweisVon.java
@@ -1,4 +1,4 @@
-package DNPM;
+package dev.dnpm;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/src/main/java/DNPM/analyzer/Analyzer.java b/src/main/java/dev/dnpm/analyzer/Analyzer.java
index fd2fdec..7868f32 100644
--- a/src/main/java/DNPM/analyzer/Analyzer.java
+++ b/src/main/java/dev/dnpm/analyzer/Analyzer.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import de.itc.onkostar.api.analysis.OnkostarPluginType;
 
diff --git a/src/main/java/DNPM/analyzer/AnalyzerUtils.java b/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java
index dfa4c0d..937cc74 100644
--- a/src/main/java/DNPM/analyzer/AnalyzerUtils.java
+++ b/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/main/java/DNPM/analyzer/BackendService.java b/src/main/java/dev/dnpm/analyzer/BackendService.java
index 84895dd..c5fca5c 100644
--- a/src/main/java/DNPM/analyzer/BackendService.java
+++ b/src/main/java/dev/dnpm/analyzer/BackendService.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/DNPM/analyzer/ConsentManager.java b/src/main/java/dev/dnpm/analyzer/ConsentManager.java
index 6051bc0..601399d 100644
--- a/src/main/java/DNPM/analyzer/ConsentManager.java
+++ b/src/main/java/dev/dnpm/analyzer/ConsentManager.java
@@ -1,6 +1,6 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
-import DNPM.services.consent.ConsentManagerServiceFactory;
+import dev.dnpm.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/DNPM/analyzer/DNPMHelper.java b/src/main/java/dev/dnpm/analyzer/DNPMHelper.java
index bb21fa0..211b3bd 100644
--- a/src/main/java/DNPM/analyzer/DNPMHelper.java
+++ b/src/main/java/dev/dnpm/analyzer/DNPMHelper.java
@@ -1,11 +1,11 @@
-package DNPM.analyzer;
-
-import DNPM.dto.EcogStatusWithDate;
-import DNPM.VerweisVon;
-import DNPM.security.DelegatingDataBasedPermissionEvaluator;
-import DNPM.security.IllegalSecuredObjectAccessException;
-import DNPM.security.PermissionType;
-import DNPM.services.systemtherapie.SystemtherapieService;
+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;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.itc.onkostar.api.Disease;
diff --git a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java b/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java
index 1724272..4a6bfdf 100644
--- a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java
+++ b/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java
@@ -1,11 +1,11 @@
-package DNPM.analyzer;
-
-import DNPM.dto.Studie;
-import DNPM.dto.Variant;
-import DNPM.security.PermissionType;
-import DNPM.security.PersonPoolBasedPermissionEvaluator;
-import DNPM.services.StudienService;
-import DNPM.services.molekulargenetik.MolekulargenetikFormService;
+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;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java b/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java
index 07b5fa0..1e1bbb9 100644
--- a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java
+++ b/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/main/java/DNPM/analyzer/IPluginPart.java b/src/main/java/dev/dnpm/analyzer/IPluginPart.java
index 31e9fff..23940fa 100644
--- a/src/main/java/DNPM/analyzer/IPluginPart.java
+++ b/src/main/java/dev/dnpm/analyzer/IPluginPart.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import de.itc.onkostar.api.analysis.IProcedureAnalyzer;
 
diff --git a/src/main/java/DNPM/analyzer/Merkmalskatalog.java b/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java
index 275fccd..76892f3 100644
--- a/src/main/java/DNPM/analyzer/Merkmalskatalog.java
+++ b/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java
@@ -1,4 +1,4 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java b/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java
index 46841e1..8afa7d8 100644
--- a/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java
+++ b/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java
@@ -1,8 +1,8 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
-import DNPM.dto.EcogStatusWithDate;
-import DNPM.services.strahlentherapie.StrahlentherapieService;
-import DNPM.services.systemtherapie.SystemtherapieService;
+import dev.dnpm.dto.EcogStatusWithDate;
+import dev.dnpm.services.strahlentherapie.StrahlentherapieService;
+import dev.dnpm.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/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java
index 932cafb..a623a99 100644
--- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
+++ b/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java
@@ -1,9 +1,9 @@
-package DNPM.analyzer;
+package dev.dnpm.analyzer;
 
-import DNPM.security.DelegatingDataBasedPermissionEvaluator;
-import DNPM.security.PermissionType;
-import DNPM.services.mtb.MtbService;
-import DNPM.services.therapieplan.TherapieplanServiceFactory;
+import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator;
+import dev.dnpm.security.PermissionType;
+import dev.dnpm.services.mtb.MtbService;
+import dev.dnpm.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/DNPM/config/PluginConfiguration.java b/src/main/java/dev/dnpm/config/PluginConfiguration.java
index 5fcf309..6b20009 100644
--- a/src/main/java/DNPM/config/PluginConfiguration.java
+++ b/src/main/java/dev/dnpm/config/PluginConfiguration.java
@@ -1,17 +1,17 @@
-package DNPM.config;
+package dev.dnpm.config;
 
-import DNPM.database.SettingsRepository;
-import DNPM.services.*;
-import DNPM.services.consent.ConsentManagerServiceFactory;
-import DNPM.services.molekulargenetik.MolekulargenetikFormService;
-import DNPM.services.molekulargenetik.OsMolekulargenetikFormService;
-import DNPM.services.mtb.DefaultMtbService;
-import DNPM.services.mtb.MtbService;
-import DNPM.services.strahlentherapie.DefaultStrahlentherapieService;
-import DNPM.services.strahlentherapie.StrahlentherapieService;
-import DNPM.services.systemtherapie.DefaultSystemtherapieService;
-import DNPM.services.systemtherapie.SystemtherapieService;
-import DNPM.services.therapieplan.TherapieplanServiceFactory;
+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 de.itc.onkostar.api.IOnkostarApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -26,8 +26,8 @@ import javax.sql.DataSource;
  * @since 0.0.2
  */
 @Configuration
-@ComponentScan(basePackages = { "DNPM.analyzer", "DNPM.security" })
-@EnableJpaRepositories(basePackages = "DNPM.database")
+@ComponentScan(basePackages = { "dev.dnpm.analyzer", "dev.dnpm.security" })
+@EnableJpaRepositories(basePackages = "dev.dnpm.database")
 public class PluginConfiguration {
 
     @Bean
diff --git a/src/main/java/DNPM/database/ReadOnlyRepository.java b/src/main/java/dev/dnpm/database/ReadOnlyRepository.java
index 3f8509d..8f20f6b 100644
--- a/src/main/java/DNPM/database/ReadOnlyRepository.java
+++ b/src/main/java/dev/dnpm/database/ReadOnlyRepository.java
@@ -1,4 +1,4 @@
-package DNPM.database;
+package dev.dnpm.database;
 
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.Repository;
diff --git a/src/main/java/DNPM/database/SettingsRepository.java b/src/main/java/dev/dnpm/database/SettingsRepository.java
index 9a6e331..e802b1a 100644
--- a/src/main/java/DNPM/database/SettingsRepository.java
+++ b/src/main/java/dev/dnpm/database/SettingsRepository.java
@@ -1,4 +1,4 @@
-package DNPM.database;
+package dev.dnpm.database;
 
 import de.itc.db.dnpm.Setting;
 import org.springframework.stereotype.Repository;
diff --git a/src/main/java/DNPM/dto/EcogStatusWithDate.java b/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java
index a1ec575..8b3140d 100644
--- a/src/main/java/DNPM/dto/EcogStatusWithDate.java
+++ b/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java
@@ -1,4 +1,4 @@
-package DNPM.dto;
+package dev.dnpm.dto;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/DNPM/dto/Studie.java b/src/main/java/dev/dnpm/dto/Studie.java
index 59d3cfe..2461788 100644
--- a/src/main/java/DNPM/dto/Studie.java
+++ b/src/main/java/dev/dnpm/dto/Studie.java
@@ -1,4 +1,4 @@
-package DNPM.dto;
+package dev.dnpm.dto;
 
 public class Studie {
     private final String kategorieName;
diff --git a/src/main/java/DNPM/dto/Variant.java b/src/main/java/dev/dnpm/dto/Variant.java
index d3fab9e..a7f75cd 100644
--- a/src/main/java/DNPM/dto/Variant.java
+++ b/src/main/java/dev/dnpm/dto/Variant.java
@@ -1,4 +1,4 @@
-package DNPM.dto;
+package dev.dnpm.dto;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/exceptions/FormException.java b/src/main/java/dev/dnpm/exceptions/FormException.java
index 4d0d6dd..9ce0176 100644
--- a/src/main/java/DNPM/exceptions/FormException.java
+++ b/src/main/java/dev/dnpm/exceptions/FormException.java
@@ -1,4 +1,4 @@
-package DNPM.exceptions;
+package dev.dnpm.exceptions;
 
 public class FormException extends RuntimeException {
 
diff --git a/src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java
index 60e7ad2..11bdcb6 100644
--- a/src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/main/java/DNPM/security/DelegatingDataBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java
index d8ca92e..09c212b 100644
--- a/src/main/java/DNPM/security/DelegatingDataBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java
index 912a19c..64f6833 100644
--- a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/DNPM/security/FormBasedSecurityAspects.java b/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java
index 306c062..eb80d47 100644
--- a/src/main/java/DNPM/security/FormBasedSecurityAspects.java
+++ b/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import de.itc.onkostar.api.Procedure;
 import org.aspectj.lang.JoinPoint;
@@ -26,7 +26,7 @@ public class FormBasedSecurityAspects {
         this.permissionEvaluator = permissionEvaluator;
     }
 
-    @AfterReturning(value = "@annotation(FormSecuredResult)", returning = "procedure")
+    @AfterReturning(value = "@annotation(dev.dnpm.security.FormSecuredResult)", returning = "procedure")
     public void afterProcedureFormBased(Procedure procedure) {
         if (
                 null != procedure
@@ -37,7 +37,7 @@ public class FormBasedSecurityAspects {
         }
     }
 
-    @Before(value = "@annotation(FormSecured)")
+    @Before(value = "@annotation(dev.dnpm.security.FormSecured)")
     public void beforeProcedureFormBased(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Procedure)
diff --git a/src/main/java/DNPM/security/FormSecured.java b/src/main/java/dev/dnpm/security/FormSecured.java
index 2e12667..0ea277e 100644
--- a/src/main/java/DNPM/security/FormSecured.java
+++ b/src/main/java/dev/dnpm/security/FormSecured.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/DNPM/security/FormSecuredResult.java b/src/main/java/dev/dnpm/security/FormSecuredResult.java
index ccfbd24..64f9bce 100644
--- a/src/main/java/DNPM/security/FormSecuredResult.java
+++ b/src/main/java/dev/dnpm/security/FormSecuredResult.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/DNPM/security/IllegalSecuredObjectAccessException.java b/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java
index 542b604..69cd456 100644
--- a/src/main/java/DNPM/security/IllegalSecuredObjectAccessException.java
+++ b/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 public class IllegalSecuredObjectAccessException extends RuntimeException {
 
diff --git a/src/main/java/DNPM/security/PermissionType.java b/src/main/java/dev/dnpm/security/PermissionType.java
index 1539aea..da3c471 100644
--- a/src/main/java/DNPM/security/PermissionType.java
+++ b/src/main/java/dev/dnpm/security/PermissionType.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 public enum PermissionType {
     READ,
diff --git a/src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java
index e3ba16e..293614b 100644
--- a/src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java
+++ b/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Patient;
diff --git a/src/main/java/DNPM/security/PersonPoolBasedSecurityAspects.java b/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java
index 37c313f..66179f7 100644
--- a/src/main/java/DNPM/security/PersonPoolBasedSecurityAspects.java
+++ b/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
@@ -25,7 +25,7 @@ public class PersonPoolBasedSecurityAspects {
         this.permissionEvaluator = permissionEvaluator;
     }
 
-    @AfterReturning(value = "@annotation(PersonPoolSecuredResult) ", returning = "patient")
+    @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult) ", returning = "patient")
     public void afterPatient(Patient patient) {
         if (
                 null != patient
@@ -36,7 +36,7 @@ public class PersonPoolBasedSecurityAspects {
         }
     }
 
-    @AfterReturning(value = "@annotation(PersonPoolSecuredResult)", returning = "procedure")
+    @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult)", returning = "procedure")
     public void afterProcedure(Procedure procedure) {
         if (
                 null != procedure
@@ -47,7 +47,7 @@ public class PersonPoolBasedSecurityAspects {
         }
     }
 
-    @Before(value = "@annotation(PersonPoolSecured)")
+    @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)")
     public void beforePatient(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Patient)
@@ -59,7 +59,7 @@ public class PersonPoolBasedSecurityAspects {
                 });
     }
 
-    @Before(value = "@annotation(PersonPoolSecured)")
+    @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)")
     public void beforeProcedure(JoinPoint jp) {
         Arrays.stream(jp.getArgs())
                 .filter(arg -> arg instanceof Procedure)
diff --git a/src/main/java/DNPM/security/PersonPoolSecured.java b/src/main/java/dev/dnpm/security/PersonPoolSecured.java
index cac0f78..8a5709c 100644
--- a/src/main/java/DNPM/security/PersonPoolSecured.java
+++ b/src/main/java/dev/dnpm/security/PersonPoolSecured.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/DNPM/security/PersonPoolSecuredResult.java b/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java
index 0ca8edf..36e19da 100644
--- a/src/main/java/DNPM/security/PersonPoolSecuredResult.java
+++ b/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/DNPM/security/SecurityService.java b/src/main/java/dev/dnpm/security/SecurityService.java
index 479701f..ba80a9d 100644
--- a/src/main/java/DNPM/security/SecurityService.java
+++ b/src/main/java/dev/dnpm/security/SecurityService.java
@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.core.Authentication;
diff --git a/src/main/java/DNPM/services/DefaultFormService.java b/src/main/java/dev/dnpm/services/DefaultFormService.java
index 9feaeb2..4240809 100644
--- a/src/main/java/DNPM/services/DefaultFormService.java
+++ b/src/main/java/dev/dnpm/services/DefaultFormService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.exceptions.FormException;
+import dev.dnpm.exceptions.FormException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/dev/dnpm/services/DefaultStudienService.java
index e172cc8..5c65842 100644
--- a/src/main/java/DNPM/services/DefaultStudienService.java
+++ b/src/main/java/dev/dnpm/services/DefaultStudienService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.dto.Studie;
+import dev.dnpm.dto.Studie;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import javax.sql.DataSource;
diff --git a/src/main/java/DNPM/services/FormService.java b/src/main/java/dev/dnpm/services/FormService.java
index f10d6c3..e400516 100644
--- a/src/main/java/DNPM/services/FormService.java
+++ b/src/main/java/dev/dnpm/services/FormService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.exceptions.FormException;
+import dev.dnpm.exceptions.FormException;
 import de.itc.onkostar.api.Procedure;
 import de.itc.onkostar.api.constants.JaNeinUnbekannt;
 
diff --git a/src/main/java/DNPM/services/SettingsService.java b/src/main/java/dev/dnpm/services/SettingsService.java
index 7459d4e..8aa5f6b 100644
--- a/src/main/java/DNPM/services/SettingsService.java
+++ b/src/main/java/dev/dnpm/services/SettingsService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.database.SettingsRepository;
+import dev.dnpm.database.SettingsRepository;
 
 import java.util.Optional;
 
diff --git a/src/main/java/DNPM/services/StudienService.java b/src/main/java/dev/dnpm/services/StudienService.java
index c82947d..c07b1c7 100644
--- a/src/main/java/DNPM/services/StudienService.java
+++ b/src/main/java/dev/dnpm/services/StudienService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.dto.Studie;
+import dev.dnpm.dto.Studie;
 
 import java.util.List;
 
diff --git a/src/main/java/DNPM/services/TherapieMitEcogService.java b/src/main/java/dev/dnpm/services/TherapieMitEcogService.java
index e8cbae4..865d11a 100644
--- a/src/main/java/DNPM/services/TherapieMitEcogService.java
+++ b/src/main/java/dev/dnpm/services/TherapieMitEcogService.java
@@ -1,6 +1,6 @@
-package DNPM.services;
+package dev.dnpm.services;
 
-import DNPM.dto.EcogStatusWithDate;
+import dev.dnpm.dto.EcogStatusWithDate;
 import de.itc.onkostar.api.Patient;
 
 import java.util.List;
diff --git a/src/main/java/DNPM/services/consent/ConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java
index c05ad6b..abbc702 100644
--- a/src/main/java/DNPM/services/consent/ConsentManagerService.java
+++ b/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java
@@ -1,4 +1,4 @@
-package DNPM.services.consent;
+package dev.dnpm.services.consent;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/consent/ConsentManagerServiceFactory.java b/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java
index 0ec7a15..b3f9497 100644
--- a/src/main/java/DNPM/services/consent/ConsentManagerServiceFactory.java
+++ b/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java
@@ -1,4 +1,4 @@
-package DNPM.services.consent;
+package dev.dnpm.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 
diff --git a/src/main/java/DNPM/services/consent/MrConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java
index 20ee4db..e4d88e2 100644
--- a/src/main/java/DNPM/services/consent/MrConsentManagerService.java
+++ b/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java
@@ -1,6 +1,6 @@
-package DNPM.services.consent;
+package dev.dnpm.services.consent;
 
-import DNPM.VerweisVon;
+import dev.dnpm.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/DNPM/services/consent/UkwConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java
index c539e5a..d6697d6 100644
--- a/src/main/java/DNPM/services/consent/UkwConsentManagerService.java
+++ b/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java
@@ -1,4 +1,4 @@
-package DNPM.services.consent;
+package dev.dnpm.services.consent;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
diff --git a/src/main/java/DNPM/services/molekulargenetik/MolekulargenetikFormService.java b/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java
index 60cfaf2..127c24a 100644
--- a/src/main/java/DNPM/services/molekulargenetik/MolekulargenetikFormService.java
+++ b/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java
@@ -1,6 +1,6 @@
-package DNPM.services.molekulargenetik;
+package dev.dnpm.services.molekulargenetik;
 
-import DNPM.dto.Variant;
+import dev.dnpm.dto.Variant;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java b/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java
index 3bc6000..1a9ed11 100644
--- a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java
+++ b/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java
@@ -1,6 +1,6 @@
-package DNPM.services.molekulargenetik;
+package dev.dnpm.services.molekulargenetik;
 
-import DNPM.dto.Variant;
+import dev.dnpm.dto.Variant;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/DNPM/services/mtb/DefaultMtbService.java b/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java
index e14e1d7..d5433b8 100644
--- a/src/main/java/DNPM/services/mtb/DefaultMtbService.java
+++ b/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java
index bf22f47..d705606 100644
--- a/src/main/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
diff --git a/src/main/java/DNPM/services/mtb/MtbService.java b/src/main/java/dev/dnpm/services/mtb/MtbService.java
index 19a6c3a..bc79b37 100644
--- a/src/main/java/DNPM/services/mtb/MtbService.java
+++ b/src/main/java/dev/dnpm/services/mtb/MtbService.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java
index dc3d326..1473431 100644
--- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
index e2edd2e..5d1d178 100644
--- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java
index d4e0e4c..bf3197a 100644
--- a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java
+++ b/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.mtb;
+package dev.dnpm.services.mtb;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieService.java b/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java
index a318a81..96a70dd 100644
--- a/src/main/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieService.java
+++ b/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java
@@ -1,7 +1,7 @@
-package DNPM.services.strahlentherapie;
+package dev.dnpm.services.strahlentherapie;
 
-import DNPM.dto.EcogStatusWithDate;
-import DNPM.services.SettingsService;
+import dev.dnpm.dto.EcogStatusWithDate;
+import dev.dnpm.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/DNPM/services/strahlentherapie/StrahlentherapieService.java b/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java
index a8de923..80e2db2 100644
--- a/src/main/java/DNPM/services/strahlentherapie/StrahlentherapieService.java
+++ b/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java
@@ -1,6 +1,6 @@
-package DNPM.services.strahlentherapie;
+package dev.dnpm.services.strahlentherapie;
 
-import DNPM.services.TherapieMitEcogService;
+import dev.dnpm.services.TherapieMitEcogService;
 
 /**
  * Service für Systemtherapieformulare
diff --git a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java
index 578613f..143195e 100644
--- a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
+++ b/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java
@@ -1,7 +1,7 @@
-package DNPM.services.systemtherapie;
+package dev.dnpm.services.systemtherapie;
 
-import DNPM.dto.EcogStatusWithDate;
-import DNPM.services.SettingsService;
+import dev.dnpm.dto.EcogStatusWithDate;
+import dev.dnpm.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/DNPM/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java b/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
index f78dde9..162b887 100644
--- a/src/main/java/DNPM/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
+++ b/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.systemtherapie;
+package dev.dnpm.services.systemtherapie;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapper.java b/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java
index f205554..2e182c0 100644
--- a/src/main/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapper.java
+++ b/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java
@@ -1,4 +1,4 @@
-package DNPM.services.systemtherapie;
+package dev.dnpm.services.systemtherapie;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java b/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java
index a7ac1bd..8069da6 100644
--- a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
+++ b/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java
@@ -1,6 +1,6 @@
-package DNPM.services.systemtherapie;
+package dev.dnpm.services.systemtherapie;
 
-import DNPM.services.TherapieMitEcogService;
+import dev.dnpm.services.TherapieMitEcogService;
 import de.itc.onkostar.api.Procedure;
 
 import java.util.List;
diff --git a/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java
index 1cdba18..c59cd42 100644
--- a/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java
+++ b/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java
@@ -1,6 +1,6 @@
-package DNPM.services.therapieplan;
+package dev.dnpm.services.therapieplan;
 
-import DNPM.services.FormService;
+import dev.dnpm.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java
index 5338baa..fc30d07 100644
--- a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java
+++ b/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java
@@ -1,6 +1,6 @@
-package DNPM.services.therapieplan;
+package dev.dnpm.services.therapieplan;
 
-import DNPM.services.FormService;
+import dev.dnpm.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Item;
 import de.itc.onkostar.api.Procedure;
@@ -11,8 +11,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import static DNPM.services.FormService.hasValue;
-import static DNPM.services.FormService.isYes;
+import static dev.dnpm.services.FormService.hasValue;
+import static dev.dnpm.services.FormService.isYes;
 
 public class DefaultTherapieplanService extends AbstractTherapieplanService {
 
diff --git a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java
index 1627cb4..50bf84f 100644
--- a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java
+++ b/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java
@@ -1,6 +1,6 @@
-package DNPM.services.therapieplan;
+package dev.dnpm.services.therapieplan;
 
-import DNPM.services.FormService;
+import dev.dnpm.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
 
@@ -10,8 +10,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static DNPM.services.FormService.hasValue;
-import static DNPM.services.FormService.isYes;
+import static dev.dnpm.services.FormService.hasValue;
+import static dev.dnpm.services.FormService.isYes;
 
 public class MultipleMtbTherapieplanService extends AbstractTherapieplanService {
 
diff --git a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java
index 957d15c..cf74253 100644
--- a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java
+++ b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java
@@ -1,4 +1,4 @@
-package DNPM.services.therapieplan;
+package dev.dnpm.services.therapieplan;
 
 import de.itc.onkostar.api.Procedure;
 
diff --git a/src/main/java/DNPM/services/therapieplan/TherapieplanServiceFactory.java b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java
index c109198..59d956c 100644
--- a/src/main/java/DNPM/services/therapieplan/TherapieplanServiceFactory.java
+++ b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java
@@ -1,7 +1,7 @@
-package DNPM.services.therapieplan;
+package dev.dnpm.services.therapieplan;
 
-import DNPM.services.FormService;
-import DNPM.services.SettingsService;
+import dev.dnpm.services.FormService;
+import dev.dnpm.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 e806b99..27035ed 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="DNPM.analyzer.DNPMHelper">
+    <bean id="DNPMHelper" class="dev.dnpm.analyzer.DNPMHelper">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="systemtherapieService" />
     </bean>
-    <bean id="Merkmalskatalog" class="DNPM.analyzer.Merkmalskatalog">
+    <bean id="Merkmalskatalog" class="dev.dnpm.analyzer.Merkmalskatalog">
         <constructor-arg ref="localOnkostarApi" />
     </bean>
-    <bean id="ConsentManager" class="DNPM.analyzer.ConsentManager">
+    <bean id="ConsentManager" class="dev.dnpm.analyzer.ConsentManager">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="consentManagerServiceFactory" />
     </bean>