diff --git a/lib/common/ui/rate_in_store.dart b/lib/common/ui/rate_in_store.dart
index bd6d1a1c..9ab6d61d 100644
--- a/lib/common/ui/rate_in_store.dart
+++ b/lib/common/ui/rate_in_store.dart
@@ -2,7 +2,6 @@ import 'package:dhbwstudentapp/common/application_constants.dart';
 import 'package:dhbwstudentapp/common/data/preferences/preferences_provider.dart';
 import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:launch_review/launch_review.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class RateInStore {
diff --git a/lib/common/ui/widgets/title_list_tile.dart b/lib/common/ui/widgets/title_list_tile.dart
index 0a2dff14..c3576a63 100644
--- a/lib/common/ui/widgets/title_list_tile.dart
+++ b/lib/common/ui/widgets/title_list_tile.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class TitleListTile extends StatelessWidget {
diff --git a/lib/dualis/ui/exam_results_page/exam_results_page.dart b/lib/dualis/ui/exam_results_page/exam_results_page.dart
index 7b84c570..f2e10c86 100644
--- a/lib/dualis/ui/exam_results_page/exam_results_page.dart
+++ b/lib/dualis/ui/exam_results_page/exam_results_page.dart
@@ -2,7 +2,6 @@ import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:dhbwstudentapp/common/ui/viewmodels/base_view_model.dart';
 import 'package:dhbwstudentapp/dualis/ui/login/dualis_login_page.dart';
 import 'package:dhbwstudentapp/dualis/ui/viewmodels/study_grades_view_model.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:property_change_notifier/property_change_notifier.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/dualis/ui/login/dualis_login_page.dart b/lib/dualis/ui/login/dualis_login_page.dart
index 586d58c8..3ee760e8 100644
--- a/lib/dualis/ui/login/dualis_login_page.dart
+++ b/lib/dualis/ui/login/dualis_login_page.dart
@@ -2,7 +2,6 @@ import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:dhbwstudentapp/common/ui/viewmodels/base_view_model.dart';
 import 'package:dhbwstudentapp/dualis/ui/viewmodels/study_grades_view_model.dart';
 import 'package:dhbwstudentapp/dualis/ui/widgets/login_form_widget.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
diff --git a/lib/dualis/ui/widgets/grade_state_icon.dart b/lib/dualis/ui/widgets/grade_state_icon.dart
index 9dc7b8d6..4cee7f66 100644
--- a/lib/dualis/ui/widgets/grade_state_icon.dart
+++ b/lib/dualis/ui/widgets/grade_state_icon.dart
@@ -1,5 +1,4 @@
 import 'package:dhbwstudentapp/dualis/model/exam.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class GradeStateIcon extends StatelessWidget {
diff --git a/lib/dualis/ui/widgets/login_form_widget.dart b/lib/dualis/ui/widgets/login_form_widget.dart
index 6ea33e84..802841b8 100644
--- a/lib/dualis/ui/widgets/login_form_widget.dart
+++ b/lib/dualis/ui/widgets/login_form_widget.dart
@@ -1,8 +1,5 @@
-import 'dart:math';
-
 import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:dhbwstudentapp/dualis/model/credentials.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 typedef OnLogin = Future<bool> Function(Credentials credentials);
diff --git a/lib/information/ui/usefulinformation/useful_information_page.dart b/lib/information/ui/usefulinformation/useful_information_page.dart
index 9f6a64c6..c2c24b88 100644
--- a/lib/information/ui/usefulinformation/useful_information_page.dart
+++ b/lib/information/ui/usefulinformation/useful_information_page.dart
@@ -1,5 +1,4 @@
 import 'package:dhbwstudentapp/common/i18n/localizations.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
diff --git a/lib/main.dart b/lib/main.dart
index aa742e5e..cddc5192 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,16 +1,15 @@
 import 'dart:io';
 
+import 'package:dhbwstudentapp/ui/main_page.dart';
+import 'package:dhbwstudentapp/ui/onboarding/onboarding_page.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:dhbwstudentapp/common/appstart/app_initializer.dart';
 import 'package:dhbwstudentapp/common/data/preferences/preferences_provider.dart';
 import 'package:dhbwstudentapp/common/i18n/localizations.dart';
-import 'package:dhbwstudentapp/schedule/ui/onboarding/onboarding_page.dart';
 import 'package:dhbwstudentapp/common/ui/colors.dart';
 import 'package:dhbwstudentapp/common/ui/viewmodels/root_view_model.dart';
-import 'package:dhbwstudentapp/schedule/ui/main_page.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:kiwi/kiwi.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:property_change_notifier/property_change_notifier.dart';
 
diff --git a/lib/schedule/ui/dailyschedule/daily_schedule_page.dart b/lib/schedule/ui/dailyschedule/daily_schedule_page.dart
index 3e05875d..6df8fce8 100644
--- a/lib/schedule/ui/dailyschedule/daily_schedule_page.dart
+++ b/lib/schedule/ui/dailyschedule/daily_schedule_page.dart
@@ -4,7 +4,6 @@ import 'package:dhbwstudentapp/common/ui/text_styles.dart';
 import 'package:dhbwstudentapp/schedule/ui/dailyschedule/viewmodels/daily_schedule_view_model.dart';
 import 'package:dhbwstudentapp/schedule/ui/dailyschedule/widgets/current_time_indicator_widget.dart';
 import 'package:dhbwstudentapp/schedule/ui/dailyschedule/widgets/daily_schedule_entry_widget.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
diff --git a/lib/schedule/ui/dailyschedule/widgets/current_time_indicator_widget.dart b/lib/schedule/ui/dailyschedule/widgets/current_time_indicator_widget.dart
index ecf25e75..902507bd 100644
--- a/lib/schedule/ui/dailyschedule/widgets/current_time_indicator_widget.dart
+++ b/lib/schedule/ui/dailyschedule/widgets/current_time_indicator_widget.dart
@@ -1,5 +1,4 @@
 import 'package:dhbwstudentapp/common/ui/colors.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 class CurrentTimeIndicatorWidget extends StatelessWidget {
diff --git a/lib/schedule/ui/dailyschedule/widgets/daily_schedule_entry_widget.dart b/lib/schedule/ui/dailyschedule/widgets/daily_schedule_entry_widget.dart
index 3526a057..45c5db3d 100644
--- a/lib/schedule/ui/dailyschedule/widgets/daily_schedule_entry_widget.dart
+++ b/lib/schedule/ui/dailyschedule/widgets/daily_schedule_entry_widget.dart
@@ -3,7 +3,6 @@ import 'package:dhbwstudentapp/common/ui/colors.dart';
 import 'package:dhbwstudentapp/common/ui/schedule_entry_type_mappings.dart';
 import 'package:dhbwstudentapp/common/ui/text_styles.dart';
 import 'package:dhbwstudentapp/schedule/model/schedule_entry.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 
diff --git a/lib/schedule/ui/weeklyschedule/weekly_schedule_page.dart b/lib/schedule/ui/weeklyschedule/weekly_schedule_page.dart
index 3770d6e6..bfae3e36 100644
--- a/lib/schedule/ui/weeklyschedule/weekly_schedule_page.dart
+++ b/lib/schedule/ui/weeklyschedule/weekly_schedule_page.dart
@@ -8,7 +8,6 @@ import 'package:dhbwstudentapp/schedule/model/schedule_entry.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/schedule_entry_detail_bottom_sheet.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/viewmodels/weekly_schedule_view_model.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/widgets/schedule_widget.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:property_change_notifier/property_change_notifier.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/schedule/ui/weeklyschedule/widgets/schedule_entry_widget.dart b/lib/schedule/ui/weeklyschedule/widgets/schedule_entry_widget.dart
index 58302032..2e1a9d59 100644
--- a/lib/schedule/ui/weeklyschedule/widgets/schedule_entry_widget.dart
+++ b/lib/schedule/ui/weeklyschedule/widgets/schedule_entry_widget.dart
@@ -1,7 +1,6 @@
 import 'package:dhbwstudentapp/common/ui/schedule_entry_type_mappings.dart';
 import 'package:dhbwstudentapp/common/ui/text_styles.dart';
 import 'package:dhbwstudentapp/schedule/model/schedule_entry.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
diff --git a/lib/schedule/ui/weeklyschedule/widgets/schedule_widget.dart b/lib/schedule/ui/weeklyschedule/widgets/schedule_widget.dart
index c84be4e0..66b62a15 100644
--- a/lib/schedule/ui/weeklyschedule/widgets/schedule_widget.dart
+++ b/lib/schedule/ui/weeklyschedule/widgets/schedule_widget.dart
@@ -8,7 +8,6 @@ import 'package:dhbwstudentapp/schedule/model/schedule_entry.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/widgets/schedule_entry_widget.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/widgets/schedule_grid.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/widgets/schedule_past_overlay.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:intl/intl.dart';
diff --git a/lib/schedule/ui/main_page.dart b/lib/ui/main_page.dart
similarity index 98%
rename from lib/schedule/ui/main_page.dart
rename to lib/ui/main_page.dart
index 45839db3..bdf0aa5e 100644
--- a/lib/schedule/ui/main_page.dart
+++ b/lib/ui/main_page.dart
@@ -8,10 +8,10 @@ import 'package:dhbwstudentapp/information/ui/usefulinformation/useful_informati
 import 'package:dhbwstudentapp/schedule/business/schedule_source_setup.dart';
 import 'package:dhbwstudentapp/schedule/ui/dailyschedule/daily_schedule_page.dart';
 import 'package:dhbwstudentapp/schedule/ui/dailyschedule/viewmodels/daily_schedule_view_model.dart';
-import 'package:dhbwstudentapp/schedule/ui/navigation_drawer.dart';
-import 'package:dhbwstudentapp/schedule/ui/settings/settings_page.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/viewmodels/weekly_schedule_view_model.dart';
 import 'package:dhbwstudentapp/schedule/ui/weeklyschedule/weekly_schedule_page.dart';
+import 'package:dhbwstudentapp/ui/navigation_drawer.dart';
+import 'package:dhbwstudentapp/ui/settings/settings_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
diff --git a/lib/schedule/ui/navigation_drawer.dart b/lib/ui/navigation_drawer.dart
similarity index 98%
rename from lib/schedule/ui/navigation_drawer.dart
rename to lib/ui/navigation_drawer.dart
index 057b1ced..76971478 100644
--- a/lib/schedule/ui/navigation_drawer.dart
+++ b/lib/ui/navigation_drawer.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 typedef NavigationItemOnTap = Function(int index);
diff --git a/lib/schedule/ui/onboarding/onboarding_page.dart b/lib/ui/onboarding/onboarding_page.dart
similarity index 96%
rename from lib/schedule/ui/onboarding/onboarding_page.dart
rename to lib/ui/onboarding/onboarding_page.dart
index 2aa5e863..a480f6fb 100644
--- a/lib/schedule/ui/onboarding/onboarding_page.dart
+++ b/lib/ui/onboarding/onboarding_page.dart
@@ -1,8 +1,7 @@
 import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:dhbwstudentapp/common/math/math.dart';
-import 'package:dhbwstudentapp/schedule/ui/main_page.dart';
-import 'package:dhbwstudentapp/schedule/ui/onboarding/viewmodels/onboarding_view_model.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:dhbwstudentapp/ui/main_page.dart';
+import 'package:dhbwstudentapp/ui/onboarding/viewmodels/onboarding_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:property_change_notifier/property_change_notifier.dart';
diff --git a/lib/schedule/ui/onboarding/viewmodels/onboarding_view_model.dart b/lib/ui/onboarding/viewmodels/onboarding_view_model.dart
similarity index 100%
rename from lib/schedule/ui/onboarding/viewmodels/onboarding_view_model.dart
rename to lib/ui/onboarding/viewmodels/onboarding_view_model.dart
diff --git a/lib/schedule/ui/settings/settings_page.dart b/lib/ui/settings/settings_page.dart
similarity index 95%
rename from lib/schedule/ui/settings/settings_page.dart
rename to lib/ui/settings/settings_page.dart
index 13ae1dae..8059fe3d 100644
--- a/lib/schedule/ui/settings/settings_page.dart
+++ b/lib/ui/settings/settings_page.dart
@@ -4,9 +4,8 @@ import 'package:dhbwstudentapp/common/i18n/localizations.dart';
 import 'package:dhbwstudentapp/common/ui/viewmodels/root_view_model.dart';
 import 'package:dhbwstudentapp/common/ui/widgets/title_list_tile.dart';
 import 'package:dhbwstudentapp/schedule/ui/notification/next_day_information_notification.dart';
-import 'package:dhbwstudentapp/schedule/ui/onboarding/onboarding_page.dart';
-import 'package:dhbwstudentapp/schedule/ui/settings/viewmodels/settings_view_model.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:dhbwstudentapp/ui/onboarding/onboarding_page.dart';
+import 'package:dhbwstudentapp/ui/settings/viewmodels/settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:property_change_notifier/property_change_notifier.dart';
 import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/schedule/ui/settings/viewmodels/settings_view_model.dart b/lib/ui/settings/viewmodels/settings_view_model.dart
similarity index 100%
rename from lib/schedule/ui/settings/viewmodels/settings_view_model.dart
rename to lib/ui/settings/viewmodels/settings_view_model.dart