diff --git a/lib/ui/components/album_horizontal_list_widget.dart b/lib/ui/collections/album/horizontal_list.dart
similarity index 91%
rename from lib/ui/components/album_horizontal_list_widget.dart
rename to lib/ui/collections/album/horizontal_list.dart
index d89d3ef43..ca9b7bbc7 100644
--- a/lib/ui/components/album_horizontal_list_widget.dart
+++ b/lib/ui/collections/album/horizontal_list.dart
@@ -10,20 +10,19 @@ import "package:photos/theme/ente_theme.dart";
 import "package:photos/ui/collections/collection_item_widget.dart";
 import "package:photos/ui/common/loading_widget.dart";
 
-class AlbumHorizontalListWidget extends StatefulWidget {
+class AlbumHorizontalList extends StatefulWidget {
   final Future<List<CollectionWithThumbnail>> Function() collectionsFuture;
 
-  const AlbumHorizontalListWidget(
+  const AlbumHorizontalList(
     this.collectionsFuture, {
     Key? key,
   }) : super(key: key);
 
   @override
-  State<AlbumHorizontalListWidget> createState() =>
-      _AlbumHorizontalListWidgetState();
+  State<AlbumHorizontalList> createState() => _AlbumHorizontalListState();
 }
 
-class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
+class _AlbumHorizontalListState extends State<AlbumHorizontalList> {
   late StreamSubscription<CollectionUpdatedEvent>
       _collectionUpdatesSubscription;
   late Logger _logger;
@@ -34,7 +33,7 @@ class _AlbumHorizontalListWidgetState extends State<AlbumHorizontalListWidget> {
         Bus.instance.on<CollectionUpdatedEvent>().listen((event) {
       setState(() {});
     });
-    _logger = Logger((_AlbumHorizontalListWidgetState).toString());
+    _logger = Logger((_AlbumHorizontalListState).toString());
     super.initState();
   }
 
diff --git a/lib/ui/components/album_list_item_widget.dart b/lib/ui/collections/album/list_item.dart
similarity index 100%
rename from lib/ui/components/album_list_item_widget.dart
rename to lib/ui/collections/album/list_item.dart
diff --git a/lib/ui/collections/collections_list_widget.dart b/lib/ui/collections/collections_list_widget.dart
index e0632770a..b514e5321 100644
--- a/lib/ui/collections/collections_list_widget.dart
+++ b/lib/ui/collections/collections_list_widget.dart
@@ -16,8 +16,8 @@ import 'package:photos/services/collections_service.dart';
 import 'package:photos/services/ignored_files_service.dart';
 import 'package:photos/services/remote_sync_service.dart';
 import "package:photos/ui/actions/collection/collection_sharing_actions.dart";
+import "package:photos/ui/collections/album/list_item.dart";
 import 'package:photos/ui/collections/collection_action_sheet.dart';
-import 'package:photos/ui/components/album_list_item_widget.dart';
 import 'package:photos/ui/components/new_album_list_widget.dart';
 import "package:photos/ui/sharing/share_collection_page.dart";
 import 'package:photos/ui/viewer/gallery/collection_page.dart';
diff --git a/lib/ui/viewer/gallery/archive_page.dart b/lib/ui/viewer/gallery/archive_page.dart
index 1264860c4..5977771d7 100644
--- a/lib/ui/viewer/gallery/archive_page.dart
+++ b/lib/ui/viewer/gallery/archive_page.dart
@@ -9,7 +9,7 @@ import 'package:photos/models/gallery_type.dart';
 import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/models/selected_files.dart';
 import 'package:photos/services/collections_service.dart';
-import "package:photos/ui/components/album_horizontal_list_widget.dart";
+import "package:photos/ui/collections/album/horizontal_list.dart";
 import 'package:photos/ui/viewer/actions/file_selection_overlay_bar.dart';
 import "package:photos/ui/viewer/gallery/empty_state.dart";
 import 'package:photos/ui/viewer/gallery/gallery.dart';
@@ -68,7 +68,7 @@ class ArchivePage extends StatelessWidget {
       emptyState: EmptyState(
         text: S.of(context).youDontHaveAnyArchivedItems,
       ),
-      header: AlbumHorizontalListWidget(
+      header: AlbumHorizontalList(
         CollectionsService.instance.getArchivedCollectionWithThumb,
       ),
     );