diff --git a/lib/components/stats/common/album_item.dart b/lib/modules/stats/common/album_item.dart
similarity index 100%
rename from lib/components/stats/common/album_item.dart
rename to lib/modules/stats/common/album_item.dart
diff --git a/lib/components/stats/common/artist_item.dart b/lib/modules/stats/common/artist_item.dart
similarity index 100%
rename from lib/components/stats/common/artist_item.dart
rename to lib/modules/stats/common/artist_item.dart
diff --git a/lib/components/stats/common/playlist_item.dart b/lib/modules/stats/common/playlist_item.dart
similarity index 100%
rename from lib/components/stats/common/playlist_item.dart
rename to lib/modules/stats/common/playlist_item.dart
diff --git a/lib/components/stats/common/track_item.dart b/lib/modules/stats/common/track_item.dart
similarity index 100%
rename from lib/components/stats/common/track_item.dart
rename to lib/modules/stats/common/track_item.dart
diff --git a/lib/components/stats/summary/summary.dart b/lib/modules/stats/summary/summary.dart
similarity index 98%
rename from lib/components/stats/summary/summary.dart
rename to lib/modules/stats/summary/summary.dart
index 61f3bd6c..0b6c6040 100644
--- a/lib/components/stats/summary/summary.dart
+++ b/lib/modules/stats/summary/summary.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/stats/summary/summary_card.dart';
+import 'package:spotube/modules/stats/summary/summary_card.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/pages/stats/albums/albums.dart';
 import 'package:spotube/pages/stats/artists/artists.dart';
diff --git a/lib/components/stats/summary/summary_card.dart b/lib/modules/stats/summary/summary_card.dart
similarity index 100%
rename from lib/components/stats/summary/summary_card.dart
rename to lib/modules/stats/summary/summary_card.dart
diff --git a/lib/components/stats/top/albums.dart b/lib/modules/stats/top/albums.dart
similarity index 92%
rename from lib/components/stats/top/albums.dart
rename to lib/modules/stats/top/albums.dart
index 51bcf5b0..808a58a4 100644
--- a/lib/components/stats/top/albums.dart
+++ b/lib/modules/stats/top/albums.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/stats/common/album_item.dart';
+import 'package:spotube/modules/stats/common/album_item.dart';
 import 'package:spotube/provider/history/top.dart';
 
 class TopAlbums extends HookConsumerWidget {
diff --git a/lib/components/stats/top/artists.dart b/lib/modules/stats/top/artists.dart
similarity index 92%
rename from lib/components/stats/top/artists.dart
rename to lib/modules/stats/top/artists.dart
index d6d0c98d..24e97601 100644
--- a/lib/components/stats/top/artists.dart
+++ b/lib/modules/stats/top/artists.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/stats/common/artist_item.dart';
+import 'package:spotube/modules/stats/common/artist_item.dart';
 import 'package:spotube/provider/history/top.dart';
 
 class TopArtists extends HookConsumerWidget {
diff --git a/lib/components/stats/top/top.dart b/lib/modules/stats/top/top.dart
similarity index 95%
rename from lib/components/stats/top/top.dart
rename to lib/modules/stats/top/top.dart
index df1275e8..7c384921 100644
--- a/lib/components/stats/top/top.dart
+++ b/lib/modules/stats/top/top.dart
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/components/shared/themed_button_tab_bar.dart';
-import 'package:spotube/components/stats/top/albums.dart';
-import 'package:spotube/components/stats/top/artists.dart';
-import 'package:spotube/components/stats/top/tracks.dart';
+import 'package:spotube/modules/stats/top/albums.dart';
+import 'package:spotube/modules/stats/top/artists.dart';
+import 'package:spotube/modules/stats/top/tracks.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/components/stats/top/tracks.dart b/lib/modules/stats/top/tracks.dart
similarity index 92%
rename from lib/components/stats/top/tracks.dart
rename to lib/modules/stats/top/tracks.dart
index bffa4ecd..ee37af3b 100644
--- a/lib/components/stats/top/tracks.dart
+++ b/lib/modules/stats/top/tracks.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
-import 'package:spotube/components/stats/common/track_item.dart';
+import 'package:spotube/modules/stats/common/track_item.dart';
 import 'package:spotube/provider/history/top.dart';
 
 class TopTracks extends HookConsumerWidget {
diff --git a/lib/pages/stats/albums/albums.dart b/lib/pages/stats/albums/albums.dart
index 83867f93..ecec91b9 100644
--- a/lib/pages/stats/albums/albums.dart
+++ b/lib/pages/stats/albums/albums.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/album_item.dart';
+import 'package:spotube/modules/stats/common/album_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/pages/stats/artists/artists.dart b/lib/pages/stats/artists/artists.dart
index 755475ae..b25399c1 100644
--- a/lib/pages/stats/artists/artists.dart
+++ b/lib/pages/stats/artists/artists.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/artist_item.dart';
+import 'package:spotube/modules/stats/common/artist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/pages/stats/fees/fees.dart b/lib/pages/stats/fees/fees.dart
index 228d3243..4993d270 100644
--- a/lib/pages/stats/fees/fees.dart
+++ b/lib/pages/stats/fees/fees.dart
@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:sliver_tools/sliver_tools.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/artist_item.dart';
+import 'package:spotube/modules/stats/common/artist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/pages/stats/minutes/minutes.dart b/lib/pages/stats/minutes/minutes.dart
index b22f9a4f..0212704a 100644
--- a/lib/pages/stats/minutes/minutes.dart
+++ b/lib/pages/stats/minutes/minutes.dart
@@ -3,7 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/track_item.dart';
+import 'package:spotube/modules/stats/common/track_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/pages/stats/playlists/playlists.dart b/lib/pages/stats/playlists/playlists.dart
index cca7febb..0b4b6cd7 100644
--- a/lib/pages/stats/playlists/playlists.dart
+++ b/lib/pages/stats/playlists/playlists.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/playlist_item.dart';
+import 'package:spotube/modules/stats/common/playlist_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';
 
diff --git a/lib/pages/stats/stats.dart b/lib/pages/stats/stats.dart
index 95493591..3efd212f 100644
--- a/lib/pages/stats/stats.dart
+++ b/lib/pages/stats/stats.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/summary/summary.dart';
-import 'package:spotube/components/stats/top/top.dart';
+import 'package:spotube/modules/stats/summary/summary.dart';
+import 'package:spotube/modules/stats/top/top.dart';
 import 'package:spotube/utils/platform.dart';
 
 class StatsPage extends HookConsumerWidget {
diff --git a/lib/pages/stats/streams/streams.dart b/lib/pages/stats/streams/streams.dart
index 33480709..20482929 100644
--- a/lib/pages/stats/streams/streams.dart
+++ b/lib/pages/stats/streams/streams.dart
@@ -3,7 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/formatters.dart';
 import 'package:spotube/components/shared/page_window_title_bar.dart';
-import 'package:spotube/components/stats/common/track_item.dart';
+import 'package:spotube/modules/stats/common/track_item.dart';
 import 'package:spotube/provider/history/state.dart';
 import 'package:spotube/provider/history/top.dart';