diff --git a/firka/lib/helpers/settings/setting.dart b/firka/lib/helpers/settings.dart
similarity index 99%
rename from firka/lib/helpers/settings/setting.dart
rename to firka/lib/helpers/settings.dart
index 0107a7df..6ef82d74 100644
--- a/firka/lib/helpers/settings/setting.dart
+++ b/firka/lib/helpers/settings.dart
@@ -10,7 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:isar/isar.dart';
 import 'package:majesticons_flutter/majesticons_flutter.dart';
 
-import '../../main.dart';
+import '../main.dart';
 
 const bellRing = 1001;
 const rounding1 = 1002;
diff --git a/firka/lib/helpers/ui/common_bottom_sheets.dart b/firka/lib/helpers/ui/common_bottom_sheets.dart
index 935da570..937ddd4f 100644
--- a/firka/lib/helpers/ui/common_bottom_sheets.dart
+++ b/firka/lib/helpers/ui/common_bottom_sheets.dart
@@ -2,7 +2,7 @@ import 'package:firka/helpers/api/model/generic.dart';
 import 'package:firka/helpers/api/model/grade.dart';
 import 'package:firka/helpers/debug_helper.dart';
 import 'package:firka/helpers/extensions.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
@@ -260,25 +260,24 @@ Future<void> showGradeBottomSheet(
                           ),
                           FirkaCard(left: [
                             Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
-                              children: [
-                                Text(
-                                "${data.l10n.tt_added}${grade.creationDate}",
-                                style: appStyle.fonts.B_14R
-                                  .apply(color: appStyle.colors.textPrimary),
-                                 ),
-                                Text(
-                                "${data.l10n.grade_teacherName}${grade.teacher}",
-                                style: appStyle.fonts.B_14R
-                                .apply(color: appStyle.colors.textPrimary),
-                              ),
-                                Text(
-                                "${data.l10n.grade_strValue}${grade.strValue}",
-                                style: appStyle.fonts.B_14R
-                                .apply(color: appStyle.colors.textPrimary),
-                              )
-                              ]
-                            )
+                                crossAxisAlignment: CrossAxisAlignment.start,
+                                children: [
+                                  Text(
+                                    "${data.l10n.tt_added}${grade.creationDate}",
+                                    style: appStyle.fonts.B_14R.apply(
+                                        color: appStyle.colors.textPrimary),
+                                  ),
+                                  Text(
+                                    "${data.l10n.grade_teacherName}${grade.teacher}",
+                                    style: appStyle.fonts.B_14R.apply(
+                                        color: appStyle.colors.textPrimary),
+                                  ),
+                                  Text(
+                                    "${data.l10n.grade_strValue}${grade.strValue}",
+                                    style: appStyle.fonts.B_14R.apply(
+                                        color: appStyle.colors.textPrimary),
+                                  )
+                                ])
                           ])
                         ],
                       ),
diff --git a/firka/lib/helpers/ui/grade_helpers.dart b/firka/lib/helpers/ui/grade_helpers.dart
index 5a243e87..be85f565 100644
--- a/firka/lib/helpers/ui/grade_helpers.dart
+++ b/firka/lib/helpers/ui/grade_helpers.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/main.dart';
 
 import '../../ui/model/style.dart';
diff --git a/firka/lib/main.dart b/firka/lib/main.dart
index 0ad2027a..5b1514c2 100644
--- a/firka/lib/main.dart
+++ b/firka/lib/main.dart
@@ -11,7 +11,7 @@ import 'package:firka/helpers/db/models/token_model.dart';
 import 'package:firka/helpers/db/widget.dart';
 import 'package:firka/helpers/extensions.dart';
 import 'package:firka/helpers/firka_bundle.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/l10n/app_localizations_hu.dart';
 import 'package:firka/ui/model/style.dart';
 import 'package:firka/ui/phone/pages/error/error_page.dart';
diff --git a/firka/lib/ui/phone/pages/extras/extras.dart b/firka/lib/ui/phone/pages/extras/extras.dart
index 68a24352..471341cb 100644
--- a/firka/lib/ui/phone/pages/extras/extras.dart
+++ b/firka/lib/ui/phone/pages/extras/extras.dart
@@ -1,5 +1,5 @@
 import 'package:firka/helpers/db/models/app_settings_model.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/helpers/ui/firka_card.dart';
 import 'package:firka/main.dart';
 import 'package:firka/ui/model/style.dart';
diff --git a/firka/lib/ui/phone/pages/home/home_timetable.dart b/firka/lib/ui/phone/pages/home/home_timetable.dart
index 56e398dc..30373451 100644
--- a/firka/lib/ui/phone/pages/home/home_timetable.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable.dart
@@ -5,7 +5,7 @@ import 'package:firka/helpers/api/model/test.dart';
 import 'package:firka/helpers/api/model/timetable.dart';
 import 'package:firka/helpers/debug_helper.dart';
 import 'package:firka/helpers/extensions.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/ui/model/style.dart';
 import 'package:firka/ui/phone/screens/settings/settings_screen.dart';
 import 'package:firka/ui/phone/widgets/bubble_test.dart';
diff --git a/firka/lib/ui/phone/pages/home/home_timetable_mo.dart b/firka/lib/ui/phone/pages/home/home_timetable_mo.dart
index 4ca85b59..8fd5a0e4 100644
--- a/firka/lib/ui/phone/pages/home/home_timetable_mo.dart
+++ b/firka/lib/ui/phone/pages/home/home_timetable_mo.dart
@@ -3,7 +3,7 @@ import 'package:firka/helpers/api/model/omission.dart';
 import 'package:firka/helpers/api/model/timetable.dart';
 import 'package:firka/helpers/debug_helper.dart';
 import 'package:firka/helpers/extensions.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/ui/model/style.dart';
 import 'package:firka/ui/widget/delayed_spinner.dart';
 import 'package:flutter/material.dart';
diff --git a/firka/lib/ui/phone/screens/home/beta_screen.dart b/firka/lib/ui/phone/screens/home/beta_screen.dart
index df791137..9ee3d140 100644
--- a/firka/lib/ui/phone/screens/home/beta_screen.dart
+++ b/firka/lib/ui/phone/screens/home/beta_screen.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:firka/helpers/db/models/app_settings_model.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/helpers/ui/firka_button.dart';
 import 'package:firka/ui/model/style.dart';
 import 'package:firka/ui/phone/screens/home/home_screen.dart';
diff --git a/firka/lib/ui/phone/screens/home/home_screen.dart b/firka/lib/ui/phone/screens/home/home_screen.dart
index e7fb19cc..20db710b 100644
--- a/firka/lib/ui/phone/screens/home/home_screen.dart
+++ b/firka/lib/ui/phone/screens/home/home_screen.dart
@@ -4,7 +4,7 @@ import 'dart:math';
 
 import 'package:firka/helpers/api/client/kreta_client.dart';
 import 'package:firka/helpers/api/exceptions/token.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/helpers/update_notifier.dart';
 import 'package:firka/main.dart';
 import 'package:firka/ui/model/style.dart';
diff --git a/firka/lib/ui/phone/screens/settings/settings_screen.dart b/firka/lib/ui/phone/screens/settings/settings_screen.dart
index 5ce81b3d..0351987f 100644
--- a/firka/lib/ui/phone/screens/settings/settings_screen.dart
+++ b/firka/lib/ui/phone/screens/settings/settings_screen.dart
@@ -17,7 +17,7 @@ import 'package:share_plus/share_plus.dart';
 
 import '../../../../helpers/firka_bundle.dart';
 import '../../../../helpers/firka_state.dart';
-import '../../../../helpers/settings/setting.dart';
+import '../../../../helpers/settings.dart';
 import '../../widgets/login_webview.dart';
 
 class SettingsScreen extends StatefulWidget {
diff --git a/firka/lib/ui/phone/widgets/lesson.dart b/firka/lib/ui/phone/widgets/lesson.dart
index 5295efbc..ab7695e5 100644
--- a/firka/lib/ui/phone/widgets/lesson.dart
+++ b/firka/lib/ui/phone/widgets/lesson.dart
@@ -1,5 +1,5 @@
 import 'package:firka/helpers/extensions.dart';
-import 'package:firka/helpers/settings/setting.dart';
+import 'package:firka/helpers/settings.dart';
 import 'package:firka/helpers/ui/firka_card.dart';
 import 'package:firka/main.dart';
 import 'package:firka/ui/model/style.dart';
diff --git a/firka/lib/ui/phone/widgets/login_webview.dart b/firka/lib/ui/phone/widgets/login_webview.dart
index 685f374a..eb7f9977 100644
--- a/firka/lib/ui/phone/widgets/login_webview.dart
+++ b/firka/lib/ui/phone/widgets/login_webview.dart
@@ -9,7 +9,7 @@ import '../../../helpers/api/token_grant.dart';
 import '../../../helpers/db/models/token_model.dart';
 import '../../../helpers/firka_bundle.dart';
 import '../../../helpers/firka_state.dart';
-import '../../../helpers/settings/setting.dart';
+import '../../../helpers/settings.dart';
 import '../pages/error/error_page.dart';
 
 class LoginWebviewWidget extends StatefulWidget {