diff --git a/lib/src/pages/downloader.dart b/lib/src/pages/downloader.dart
index d40d814..f1f332f 100644
--- a/lib/src/pages/downloader.dart
+++ b/lib/src/pages/downloader.dart
@@ -7,9 +7,9 @@ import 'package:quickgui/src/globals.dart';
 import 'package:quickgui/src/model/operating_system.dart';
 import 'package:quickgui/src/model/option.dart';
 import 'package:quickgui/src/model/version.dart';
-import 'package:quickgui/src/widgets/cancel_dismiss_button.dart';
-import 'package:quickgui/src/widgets/download_label.dart';
-import 'package:quickgui/src/widgets/download_progress_bar.dart';
+import 'package:quickgui/src/widgets/downloader/cancel_dismiss_button.dart';
+import 'package:quickgui/src/widgets/downloader/download_label.dart';
+import 'package:quickgui/src/widgets/downloader/download_progress_bar.dart';
 
 class Downloader extends StatefulWidget {
   const Downloader({
diff --git a/lib/src/pages/main_page.dart b/lib/src/pages/main_page.dart
index f082224..4862666 100644
--- a/lib/src/pages/main_page.dart
+++ b/lib/src/pages/main_page.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:quickgui/src/globals.dart';
-import 'package:quickgui/src/widgets/home_page_buttons.dart';
+import 'package:quickgui/src/widgets/home_page/home_page_button_group.dart';
 
 class MainPage extends StatefulWidget {
   const MainPage({Key? key, required this.title}) : super(key: key);
@@ -50,7 +50,7 @@ class _MainPageState extends State<MainPage> {
                           children: const [
                             Padding(
                               padding: EdgeInsets.symmetric(horizontal: 12),
-                              child: HomePageButtons(),
+                              child: HomePageButtonGroup(),
                             )
                           ],
                         ),
diff --git a/lib/src/widgets/cancel_dismiss_button.dart b/lib/src/widgets/downloader/cancel_dismiss_button.dart
similarity index 100%
rename from lib/src/widgets/cancel_dismiss_button.dart
rename to lib/src/widgets/downloader/cancel_dismiss_button.dart
diff --git a/lib/src/widgets/download_label.dart b/lib/src/widgets/downloader/download_label.dart
similarity index 100%
rename from lib/src/widgets/download_label.dart
rename to lib/src/widgets/downloader/download_label.dart
diff --git a/lib/src/widgets/download_progress_bar.dart b/lib/src/widgets/downloader/download_progress_bar.dart
similarity index 100%
rename from lib/src/widgets/download_progress_bar.dart
rename to lib/src/widgets/downloader/download_progress_bar.dart
diff --git a/lib/src/widgets/home_page_button.dart b/lib/src/widgets/home_page/home_page_button.dart
similarity index 100%
rename from lib/src/widgets/home_page_button.dart
rename to lib/src/widgets/home_page/home_page_button.dart
diff --git a/lib/src/widgets/home_page_buttons.dart b/lib/src/widgets/home_page/home_page_button_group.dart
similarity index 94%
rename from lib/src/widgets/home_page_buttons.dart
rename to lib/src/widgets/home_page/home_page_button_group.dart
index d6992c9..1c57cca 100644
--- a/lib/src/widgets/home_page_buttons.dart
+++ b/lib/src/widgets/home_page/home_page_button_group.dart
@@ -8,17 +8,17 @@ import 'package:quickgui/src/model/version.dart';
 import 'package:quickgui/src/pages/downloader.dart';
 import 'package:quickgui/src/pages/operating_system_selection.dart';
 import 'package:quickgui/src/pages/version_selection.dart';
-import 'package:quickgui/src/widgets/home_page_button.dart';
+import 'package:quickgui/src/widgets/home_page/home_page_button.dart';
 import 'package:tuple/tuple.dart';
 
-class HomePageButtons extends StatefulWidget {
-  const HomePageButtons({Key? key}) : super(key: key);
+class HomePageButtonGroup extends StatefulWidget {
+  const HomePageButtonGroup({Key? key}) : super(key: key);
 
   @override
-  State<HomePageButtons> createState() => _HomePageButtonsState();
+  State<HomePageButtonGroup> createState() => _HomePageButtonGroupState();
 }
 
-class _HomePageButtonsState extends State<HomePageButtons> {
+class _HomePageButtonGroupState extends State<HomePageButtonGroup> {
   OperatingSystem? _selectedOperatingSystem;
   Version? _selectedVersion;
   Option? _selectedOption;