diff --git a/lib/analytics.dart b/lib/analytics/analytics.dart
similarity index 100%
rename from lib/analytics.dart
rename to lib/analytics/analytics.dart
diff --git a/lib/analytics_exp.dart b/lib/analytics/experiment.dart
similarity index 100%
rename from lib/analytics_exp.dart
rename to lib/analytics/experiment.dart
diff --git a/lib/app.dart b/lib/app.dart
index 4626e8c5..79c50936 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -18,7 +18,7 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_router.dart';
 import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/core/notes_folder_fs.dart';
diff --git a/lib/repository.dart b/lib/repository.dart
index 58fb724a..0203991b 100644
--- a/lib/repository.dart
+++ b/lib/repository.dart
@@ -14,7 +14,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synchronized/synchronized.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/core/git_repo.dart';
 import 'package:gitjournal/core/note.dart';
 import 'package:gitjournal/core/notes_cache.dart';
diff --git a/lib/screens/feature_timeline_screen.dart b/lib/screens/feature_timeline_screen.dart
index ffc031c7..71e3795a 100644
--- a/lib/screens/feature_timeline_screen.dart
+++ b/lib/screens/feature_timeline_screen.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/features.dart';
 
 class FeatureTimelineScreen extends StatelessWidget {
diff --git a/lib/screens/onboarding_screens.dart b/lib/screens/onboarding_screens.dart
index 1c83c307..88ec1cbb 100644
--- a/lib/screens/onboarding_screens.dart
+++ b/lib/screens/onboarding_screens.dart
@@ -10,7 +10,7 @@ import 'package:package_info/package_info.dart';
 import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_settings.dart';
 
 class OnBoardingScreen extends StatefulWidget {
diff --git a/lib/screens/purchase_screen.dart b/lib/screens/purchase_screen.dart
index 4180e393..4feca6ab 100644
--- a/lib/screens/purchase_screen.dart
+++ b/lib/screens/purchase_screen.dart
@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 
 import 'package:easy_localization/easy_localization.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/purchase_manager.dart';
 import 'package:gitjournal/screens/feature_timeline_screen.dart';
 import 'package:gitjournal/utils/logger.dart';
diff --git a/lib/setup/autoconfigure.dart b/lib/setup/autoconfigure.dart
index ce8fefc8..0cbc1cba 100644
--- a/lib/setup/autoconfigure.dart
+++ b/lib/setup/autoconfigure.dart
@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:function_types/function_types.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/settings.dart';
diff --git a/lib/setup/button.dart b/lib/setup/button.dart
index f90d41cc..1c088fa1 100644
--- a/lib/setup/button.dart
+++ b/lib/setup/button.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 
 import 'package:function_types/function_types.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/utils/logger.dart';
 
 class GitHostSetupButton extends StatelessWidget {
diff --git a/lib/setup/repo_selector.dart b/lib/setup/repo_selector.dart
index 7b5d78de..4e0a40a8 100644
--- a/lib/setup/repo_selector.dart
+++ b/lib/setup/repo_selector.dart
@@ -9,7 +9,7 @@ import 'package:path/path.dart' as p;
 import 'package:time/time.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/setup/button.dart';
diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart
index 1c1626c8..2c49f8cd 100644
--- a/lib/setup/screens.dart
+++ b/lib/setup/screens.dart
@@ -14,7 +14,7 @@ import 'package:provider/provider.dart';
 import 'package:time/time.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/apis/githost_factory.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/repository.dart';
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 75e4b676..4068c097 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -13,7 +13,7 @@ import 'package:share/share.dart';
 import 'package:time/time.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
 import 'package:gitjournal/repository.dart';
diff --git a/lib/widgets/pro_overlay.dart b/lib/widgets/pro_overlay.dart
index e5041a29..3c19d812 100644
--- a/lib/widgets/pro_overlay.dart
+++ b/lib/widgets/pro_overlay.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:provider/provider.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/features.dart';
 
diff --git a/lib/widgets/purchase_widget.dart b/lib/widgets/purchase_widget.dart
index e232b69e..8945acd6 100644
--- a/lib/widgets/purchase_widget.dart
+++ b/lib/widgets/purchase_widget.dart
@@ -8,7 +8,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:function_types/function_types.dart';
 import 'package:in_app_purchase/in_app_purchase.dart';
 
-import 'package:gitjournal/analytics.dart';
+import 'package:gitjournal/analytics/analytics.dart';
 import 'package:gitjournal/app_settings.dart';
 import 'package:gitjournal/error_reporting.dart';
 import 'package:gitjournal/iap.dart';