diff --git a/src/setup/apps/gnome_baobab.py b/src/setup/apps/gnome/baobab.py
similarity index 100%
rename from src/setup/apps/gnome_baobab.py
rename to src/setup/apps/gnome/baobab.py
diff --git a/src/setup/apps/gnome_calculator.py b/src/setup/apps/gnome/calculator.py
similarity index 100%
rename from src/setup/apps/gnome_calculator.py
rename to src/setup/apps/gnome/calculator.py
diff --git a/src/setup/apps/gnome_calendar.py b/src/setup/apps/gnome/calendar.py
similarity index 100%
rename from src/setup/apps/gnome_calendar.py
rename to src/setup/apps/gnome/calendar.py
diff --git a/src/setup/apps/gnome_characters.py b/src/setup/apps/gnome/characters.py
similarity index 100%
rename from src/setup/apps/gnome_characters.py
rename to src/setup/apps/gnome/characters.py
diff --git a/src/setup/apps/gnome_cheese.py b/src/setup/apps/gnome/cheese.py
similarity index 100%
rename from src/setup/apps/gnome_cheese.py
rename to src/setup/apps/gnome/cheese.py
diff --git a/src/setup/apps/gnome_clock.py b/src/setup/apps/gnome/clock.py
similarity index 100%
rename from src/setup/apps/gnome_clock.py
rename to src/setup/apps/gnome/clock.py
diff --git a/src/setup/apps/gnome_disk_utility.py b/src/setup/apps/gnome/disk_utility.py
similarity index 100%
rename from src/setup/apps/gnome_disk_utility.py
rename to src/setup/apps/gnome/disk_utility.py
diff --git a/src/setup/apps/gnome_evince.py b/src/setup/apps/gnome/document_viewer.py
similarity index 100%
rename from src/setup/apps/gnome_evince.py
rename to src/setup/apps/gnome/document_viewer.py
diff --git a/src/setup/apps/gnome_file_roller.py b/src/setup/apps/gnome/file_roller.py
similarity index 100%
rename from src/setup/apps/gnome_file_roller.py
rename to src/setup/apps/gnome/file_roller.py
diff --git a/src/setup/apps/gnome_font_viewer.py b/src/setup/apps/gnome/font_viewer.py
similarity index 100%
rename from src/setup/apps/gnome_font_viewer.py
rename to src/setup/apps/gnome/font_viewer.py
diff --git a/src/setup/apps/gnome_extension_manager.py b/src/setup/apps/gnome/gnome_extension_manager.py
similarity index 100%
rename from src/setup/apps/gnome_extension_manager.py
rename to src/setup/apps/gnome/gnome_extension_manager.py
diff --git a/src/setup/apps/gnome_eog.py b/src/setup/apps/gnome/image_viewer.py
similarity index 100%
rename from src/setup/apps/gnome_eog.py
rename to src/setup/apps/gnome/image_viewer.py
diff --git a/src/setup/apps/gnome_logs.py b/src/setup/apps/gnome/logs_viewer.py
similarity index 100%
rename from src/setup/apps/gnome_logs.py
rename to src/setup/apps/gnome/logs_viewer.py
diff --git a/src/setup/apps/gnome_nautilus.py b/src/setup/apps/gnome/nautilue_file_manager.py
similarity index 100%
rename from src/setup/apps/gnome_nautilus.py
rename to src/setup/apps/gnome/nautilue_file_manager.py
diff --git a/src/setup/apps/gnome_control_center.py b/src/setup/apps/gnome/settings.py
similarity index 100%
rename from src/setup/apps/gnome_control_center.py
rename to src/setup/apps/gnome/settings.py
diff --git a/src/setup/apps/gnome_tweaks.py b/src/setup/apps/gnome/tweaks.py
similarity index 100%
rename from src/setup/apps/gnome_tweaks.py
rename to src/setup/apps/gnome/tweaks.py
diff --git a/src/setup/apps/gnome_totem.py b/src/setup/apps/gnome/video_player.py
similarity index 100%
rename from src/setup/apps/gnome_totem.py
rename to src/setup/apps/gnome/video_player.py