diff --git a/lib/ui/collections/album/list_item.dart b/lib/ui/collections/album/column_item.dart
similarity index 100%
rename from lib/ui/collections/album/list_item.dart
rename to lib/ui/collections/album/column_item.dart
diff --git a/lib/ui/components/new_album_list_widget.dart b/lib/ui/collections/album/new_list_item.dart
similarity index 100%
rename from lib/ui/components/new_album_list_widget.dart
rename to lib/ui/collections/album/new_list_item.dart
diff --git a/lib/ui/collections/collection_item_widget.dart b/lib/ui/collections/album/row_item.dart
similarity index 100%
rename from lib/ui/collections/collection_item_widget.dart
rename to lib/ui/collections/album/row_item.dart
diff --git a/lib/ui/collections/collections_list_widget.dart b/lib/ui/collections/album/vertical_list.dart
similarity index 100%
rename from lib/ui/collections/collections_list_widget.dart
rename to lib/ui/collections/album/vertical_list.dart
diff --git a/lib/ui/collections/archived_collections_button_widget.dart b/lib/ui/collections/button/archived_button.dart
similarity index 100%
rename from lib/ui/collections/archived_collections_button_widget.dart
rename to lib/ui/collections/button/archived_button.dart
diff --git a/lib/ui/collections/hidden_collections_button_widget.dart b/lib/ui/collections/button/hidden_button.dart
similarity index 100%
rename from lib/ui/collections/hidden_collections_button_widget.dart
rename to lib/ui/collections/button/hidden_button.dart
diff --git a/lib/ui/collections/trash_button_widget.dart b/lib/ui/collections/button/trash_button.dart
similarity index 100%
rename from lib/ui/collections/trash_button_widget.dart
rename to lib/ui/collections/button/trash_button.dart
diff --git a/lib/ui/collections/uncat_collections_button_widget.dart b/lib/ui/collections/button/uncategorized_button.dart
similarity index 100%
rename from lib/ui/collections/uncat_collections_button_widget.dart
rename to lib/ui/collections/button/uncategorized_button.dart
diff --git a/lib/ui/collections/section_title.dart b/lib/ui/tabs/section_title.dart
similarity index 100%
rename from lib/ui/collections/section_title.dart
rename to lib/ui/tabs/section_title.dart