diff --git a/Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml b/Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml
index 2612e39508725c63da6d9b213cc75a3b3f6c3d47..ab141166063708ffd82c9de17d5ba4de7532c1f2 100644
--- a/Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml
+++ b/Corona-Warn-App/src/deviceForTesters/res/navigation/nav_graph.xml
@@ -190,7 +190,7 @@
 
     <fragment
         android:id="@+id/submissionDispatcherFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionDispatcherFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionDispatcherFragment"
         android:label="fragment_submission_dispatcher"
         tools:layout="@layout/fragment_submission_dispatcher">
         <action
@@ -205,7 +205,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionResultPositiveOtherWarningFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionResultPositiveOtherWarningFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionResultPositiveOtherWarningFragment"
         android:label="fragment_submission_result_positive_other_warning"
         tools:layout="@layout/fragment_submission_positive_other_warning">
         <action
@@ -221,7 +221,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionResultFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionTestResultFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionTestResultFragment"
         android:label="fragment_submission_result"
         tools:layout="@layout/fragment_submission_test_result">
         <argument
@@ -240,7 +240,7 @@
 
     <fragment
         android:id="@+id/submissionTanFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionTanFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionTanFragment"
         android:label="fragment_submission_tan"
         tools:layout="@layout/fragment_submission_tan">
         <action
@@ -257,7 +257,7 @@
 
     <fragment
         android:id="@+id/submissionIntroFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionIntroFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionIntroFragment"
         android:label="SubmissionIntroFragment">
         <action
             android:id="@+id/action_submissionIntroFragment_to_mainFragment"
@@ -278,7 +278,7 @@
     </activity>
     <fragment
         android:id="@+id/submissionQRCodeScanFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionQRCodeScanFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionQRCodeScanFragment"
         android:label="SubmissionQRCodeScanFragment">
         <action
             android:id="@+id/action_submissionQRCodeScanFragment_to_submissionDispatcherFragment"
@@ -297,7 +297,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionDoneFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionDoneFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionDoneFragment"
         android:label="SubmissionDoneFragment">
         <action
             android:id="@+id/action_submissionDoneFragment_to_mainFragment"
@@ -307,7 +307,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionContactFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionContactFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionContactFragment"
         android:label="SubmissionContactFragment">
         <action
             android:id="@+id/action_submissionContactFragment_to_submissionTanFragment"
diff --git a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
index decb93bee6edd861128975c7b75e858266eedfbc..9ea4a32384297b94438da73382a5d6b0dd40464e 100644
--- a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
@@ -181,7 +181,7 @@
 
     <fragment
         android:id="@+id/submissionDispatcherFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionDispatcherFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionDispatcherFragment"
         android:label="fragment_submission_dispatcher"
         tools:layout="@layout/fragment_submission_dispatcher">
         <action
@@ -196,7 +196,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionResultPositiveOtherWarningFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionResultPositiveOtherWarningFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionResultPositiveOtherWarningFragment"
         android:label="fragment_submission_result_positive_other_warning"
         tools:layout="@layout/fragment_submission_positive_other_warning">
         <action
@@ -212,7 +212,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionResultFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionTestResultFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionTestResultFragment"
         android:label="fragment_submission_result"
         tools:layout="@layout/fragment_submission_test_result">
         <argument
@@ -231,7 +231,7 @@
 
     <fragment
         android:id="@+id/submissionTanFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionTanFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionTanFragment"
         android:label="fragment_submission_tan"
         tools:layout="@layout/fragment_submission_tan">
         <action
@@ -248,7 +248,7 @@
 
     <fragment
         android:id="@+id/submissionIntroFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionIntroFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionIntroFragment"
         android:label="SubmissionIntroFragment">
         <action
             android:id="@+id/action_submissionIntroFragment_to_mainFragment"
@@ -269,7 +269,7 @@
     </activity>
     <fragment
         android:id="@+id/submissionQRCodeScanFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionQRCodeScanFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionQRCodeScanFragment"
         android:label="SubmissionQRCodeScanFragment">
         <action
             android:id="@+id/action_submissionQRCodeScanFragment_to_submissionDispatcherFragment"
@@ -288,7 +288,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionDoneFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionDoneFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionDoneFragment"
         android:label="SubmissionDoneFragment">
         <action
             android:id="@+id/action_submissionDoneFragment_to_mainFragment"
@@ -298,7 +298,7 @@
     </fragment>
     <fragment
         android:id="@+id/submissionContactFragment"
-        android:name="de.rki.coronawarnapp.ui.submission.SubmissionContactFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.fragment.SubmissionContactFragment"
         android:label="SubmissionContactFragment">
         <action
             android:id="@+id/action_submissionContactFragment_to_submissionTanFragment"