diff --git a/rescueapp/lib/main.dart b/rescueapp/lib/main.dart
index b7676ca13c91aa201631d141b79ad936f1d59400..76fb1b70424bc122c1c20c09b97da9ccdd1b60e2 100644
--- a/rescueapp/lib/main.dart
+++ b/rescueapp/lib/main.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:rescueapp/Ambulatory.dart';
+import 'triage_step1/ambulatory.dart';
 
 void main() {
   runApp(MyApp());
diff --git a/rescueapp/lib/Ambulatory.dart b/rescueapp/lib/triage_step1/ambulatory.dart
similarity index 96%
rename from rescueapp/lib/Ambulatory.dart
rename to rescueapp/lib/triage_step1/ambulatory.dart
index 6dba58d7e25f8a86f51db450d37a68b3ab7d9b8a..ee7c7c71a25275d2ab1358c0bee3c36edf0fe0cd 100644
--- a/rescueapp/lib/Ambulatory.dart
+++ b/rescueapp/lib/triage_step1/ambulatory.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:rescueapp/SpontaneousBreathingPresent.dart';
+import 'package:rescueapp/triage_step2/triage_step2_1/spontaneous_breathing_present.dart';
 
 class Ambulatory extends StatefulWidget {
   Ambulatory({Key key, this.title}) : super(key: key);
@@ -43,7 +43,7 @@ class _AmbulatoryState extends State<Ambulatory> {
                           backgroundColor: Colors.white)),
                 )),
             SizedBox(
-              height: 100,
+              height: 120,
             ),
             SizedBox(
                 width: 200,
diff --git a/rescueapp/lib/SpontaneousBreathingPresent.dart b/rescueapp/lib/triage_step2/triage_step2_1/spontaneous_breathing_present.dart
similarity index 98%
rename from rescueapp/lib/SpontaneousBreathingPresent.dart
rename to rescueapp/lib/triage_step2/triage_step2_1/spontaneous_breathing_present.dart
index 9122f27bee018fd1ad1eeba8e9d66e2a19c9a4b1..1177dce4f7e3fb5046e42a47d689426ce82980e4 100644
--- a/rescueapp/lib/SpontaneousBreathingPresent.dart
+++ b/rescueapp/lib/triage_step2/triage_step2_1/spontaneous_breathing_present.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:rescueapp/AfterOpeningAirways.dart';
+import 'package:rescueapp/triage_step2/triage_step2_2/after_opening_airways.dart';
 
 class SpontaneousBreathingPresent extends StatefulWidget {
   SpontaneousBreathingPresent({Key key, this.title}) : super(key: key);
diff --git a/rescueapp/lib/AfterOpeningAirways.dart b/rescueapp/lib/triage_step2/triage_step2_2/after_opening_airways.dart
similarity index 98%
rename from rescueapp/lib/AfterOpeningAirways.dart
rename to rescueapp/lib/triage_step2/triage_step2_2/after_opening_airways.dart
index e76207a092b711c1738c079e3ffac82f3412026a..e3035fa1479dc8431c8d4e095492a6be62e9b54d 100644
--- a/rescueapp/lib/AfterOpeningAirways.dart
+++ b/rescueapp/lib/triage_step2/triage_step2_2/after_opening_airways.dart
@@ -25,7 +25,7 @@ class _AfterOpeningAirwaysState extends State<AfterOpeningAirways> {
                   decoration: BoxDecoration(color: Colors.grey[500]),
                   alignment: Alignment.center,
                   child: Text('Ist der Patient gehfähig?',
-                      style: TextStyle(fontSize: 22, color: Colors.blue[900])),
+                      style: TextStyle(fontSize: 20, color: Colors.blue[900])),
                 )),
             SizedBox(
                 height: 40,
@@ -61,7 +61,7 @@ class _AfterOpeningAirwaysState extends State<AfterOpeningAirways> {
                           backgroundColor: Colors.grey[500])),
                 )),
             SizedBox(
-              height: 100,
+              height: 110,
             ),
             SizedBox(
                 height: 50,
diff --git a/rescueapp/pubspec.lock b/rescueapp/pubspec.lock
index a5a1eda679fc848da805ee2159ee585694d069ca..f628010e7cbba68d8b587162fa392226c6fceb39 100644
--- a/rescueapp/pubspec.lock
+++ b/rescueapp/pubspec.lock
@@ -80,7 +80,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.4"
+    version: "1.3.0-nullsafety.3"
   path:
     dependency: transitive
     description:
@@ -106,7 +106,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
@@ -150,4 +150,4 @@ packages:
     source: hosted
     version: "2.1.0-nullsafety.3"
 sdks:
-  dart: ">=2.10.0-110 <=2.11.0-213.1.beta"
+  dart: ">=2.10.0-110 <2.11.0"