diff --git a/lib/core/constants.dart b/lib/core/constants.dart
index 4a79399..ce8c30a 100644
--- a/lib/core/constants.dart
+++ b/lib/core/constants.dart
@@ -1,5 +1,8 @@
+import 'package:rate_my_app/rate_my_app.dart';
+
 class Constants {
   static String appDevPhase = 'Beta';
+
   static const String INSTAGRAM_LINK = 'https://instagram.felixkirchner.de';
   static const String GITHUB_LINK = 'https://github1.felixkirchner.de';
   static const String GITHUB_ISSUES_LINK =
@@ -8,4 +11,11 @@ class Constants {
   static const String EMAIL = 'cabocounter@felixkirchner.de';
   static const String PRIVACY_POLICY_LINK =
       'https://www.privacypolicies.com/live/1b3759d4-b2f1-4511-8e3b-21bb1626be68';
+
+  static RateMyApp rateMyApp = RateMyApp(
+      appStoreIdentifier: '6747105718',
+      minDays: 15,
+      remindDays: 45,
+      minLaunches: 15,
+      remindLaunches: 40);
 }
diff --git a/lib/core/globals.dart b/lib/core/globals.dart
deleted file mode 100644
index 6bfd077..0000000
--- a/lib/core/globals.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:rate_my_app/rate_my_app.dart';
-
-class Globals {
-  static String appDevPhase = 'Beta';
-  static RateMyApp rateMyApp = RateMyApp(
-      appStoreIdentifier: '6747105718',
-      minDays: 15,
-      remindDays: 45,
-      minLaunches: 15,
-      remindLaunches: 40);
-}
diff --git a/lib/main.dart b/lib/main.dart
index 4002dda..9279426 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,5 +1,4 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/tab_view.dart';
 import 'package:cabo_counter/services/config_service.dart';
diff --git a/lib/presentation/views/information_view.dart b/lib/presentation/views/information_view.dart
index d31d7f6..712d709 100644
--- a/lib/presentation/views/information_view.dart
+++ b/lib/presentation/views/information_view.dart
@@ -1,5 +1,5 @@
+import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
-import 'package:cabo_counter/utility/constants.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
diff --git a/lib/presentation/views/main_menu_view.dart b/lib/presentation/views/main_menu_view.dart
index 925b9ed..fee5c72 100644
--- a/lib/presentation/views/main_menu_view.dart
+++ b/lib/presentation/views/main_menu_view.dart
@@ -1,5 +1,5 @@
+import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/core/globals.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/active_game_view.dart';
@@ -36,9 +36,9 @@ class _MainMenuViewState extends State<MainMenuView> {
     gameManager.addListener(_updateView);
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await Globals.rateMyApp.init();
+      await Constants.rateMyApp.init();
 
-      if (Globals.rateMyApp.shouldOpenDialog) {
+      if (Constants.rateMyApp.shouldOpenDialog) {
         await Future.delayed(const Duration(milliseconds: 600));
         if (!mounted) return;
         _handleFeedbackDialog(context);
@@ -304,7 +304,7 @@ class _MainMenuViewState extends State<MainMenuView> {
 
     switch (decision) {
       case RATING_DIALOG_YES:
-        if (context.mounted) Globals.rateMyApp.showStarRateDialog(context);
+        if (context.mounted) Constants.rateMyApp.showStarRateDialog(context);
         break;
       case RATING_DIALOG_NO:
         launchUrl(emailUri, mode: LaunchMode.externalApplication);
diff --git a/lib/presentation/views/mode_selection_view.dart b/lib/presentation/views/mode_selection_view.dart
index 67ab5fb..a7d3ce7 100644
--- a/lib/presentation/views/mode_selection_view.dart
+++ b/lib/presentation/views/mode_selection_view.dart
@@ -1,7 +1,5 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 
 class ModeSelectionMenu extends StatelessWidget {
diff --git a/lib/presentation/views/settings_view.dart b/lib/presentation/views/settings_view.dart
index 2f55ba3..c9a409d 100644
--- a/lib/presentation/views/settings_view.dart
+++ b/lib/presentation/views/settings_view.dart
@@ -1,13 +1,11 @@
+import 'package:cabo_counter/core/constants.dart';
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/widgets/custom_form_row.dart';
 import 'package:cabo_counter/presentation/widgets/stepper.dart';
 import 'package:cabo_counter/services/config_service.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:cabo_counter/services/version_service.dart';
-import 'package:cabo_counter/utility/constants.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/presentation/views/tab_view.dart b/lib/presentation/views/tab_view.dart
index 1fd84d2..15d4637 100644
--- a/lib/presentation/views/tab_view.dart
+++ b/lib/presentation/views/tab_view.dart
@@ -1,5 +1,4 @@
 import 'package:cabo_counter/core/custom_theme.dart';
-import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/l10n/generated/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/information_view.dart';
 import 'package:cabo_counter/presentation/views/main_menu_view.dart';
diff --git a/lib/services/version_service.dart b/lib/services/version_service.dart
index ade934d..6511c69 100644
--- a/lib/services/version_service.dart
+++ b/lib/services/version_service.dart
@@ -1,5 +1,4 @@
-import 'package:cabo_counter/core/globals.dart';
-import 'package:cabo_counter/utility/constants.dart';
+import 'package:cabo_counter/core/constants.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class VersionService {