diff --git a/src/main/java/DNPM/forms/FollowUpAnalyzer.java b/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java
similarity index 99%
rename from src/main/java/DNPM/forms/FollowUpAnalyzer.java
rename to src/main/java/DNPM/analyzer/FollowUpAnalyzer.java
index f76cd64..109447a 100644
--- a/src/main/java/DNPM/forms/FollowUpAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java
@@ -1,4 +1,4 @@
-package DNPM.forms;
+package DNPM.analyzer;
 
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/main/java/DNPM/forms/TherapieplanAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
similarity index 99%
rename from src/main/java/DNPM/forms/TherapieplanAnalyzer.java
rename to src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
index 83bbc3a..1058137 100644
--- a/src/main/java/DNPM/forms/TherapieplanAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
@@ -1,4 +1,4 @@
-package DNPM.forms;
+package DNPM.analyzer;
 
 import DNPM.services.FormService;
 import de.itc.onkostar.api.Disease;
diff --git a/src/main/resources/de/itc/onkostar/library/moduleContext.xml b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
index 8bd2c82..0415560 100644
--- a/src/main/resources/de/itc/onkostar/library/moduleContext.xml
+++ b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
@@ -15,7 +15,7 @@
     <bean id="ConsentManager" class="DNPM.ConsentManager" />
 
 	<context:component-scan base-package="ATCCodes" />
-    <context:component-scan base-package="DNPM.forms" />
+    <context:component-scan base-package="DNPM.analyzer" />
     <context:component-scan base-package="DNPM.services" />
 
     <mvc:resources mapping="/app/lib/umr/**" location="classpath:/app/lib/umr/" />
diff --git a/src/test/java/DNPM/forms/TherapieplanAnalyzerTest.java b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
similarity index 99%
rename from src/test/java/DNPM/forms/TherapieplanAnalyzerTest.java
rename to src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
index 38bc76c..57cc5b8 100644
--- a/src/test/java/DNPM/forms/TherapieplanAnalyzerTest.java
+++ b/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java
@@ -1,4 +1,4 @@
-package DNPM.forms;
+package DNPM.analyzer;
 
 import DNPM.services.FormService;
 import de.itc.onkostar.api.IOnkostarApi;