diff --git a/picard/coverart/providers/caa.py b/picard/coverart/providers/caa.py
index f3f59280ee..4333445a79 100644
--- a/picard/coverart/providers/caa.py
+++ b/picard/coverart/providers/caa.py
@@ -66,7 +66,7 @@
 from picard.webservice import ratecontrol
 
 from picard.ui.caa_types_selector import display_caa_types_selector
-from picard.ui.ui_provider_options_caa import Ui_CaaOptions
+from picard.ui.forms.ui_provider_options_caa import Ui_CaaOptions
 
 
 CaaSizeItem = namedtuple('CaaSizeItem', ['thumbnail', 'label'])
diff --git a/picard/coverart/providers/local.py b/picard/coverart/providers/local.py
index e8bb91d78f..df0d24260f 100644
--- a/picard/coverart/providers/local.py
+++ b/picard/coverart/providers/local.py
@@ -35,7 +35,7 @@
 from picard.coverart.utils import CAA_TYPES
 from picard.i18n import N_
 
-from picard.ui.ui_provider_options_local import Ui_LocalOptions
+from picard.ui.forms.ui_provider_options_local import Ui_LocalOptions
 
 
 class ProviderOptionsLocal(ProviderOptions):
diff --git a/picard/ui/aboutdialog.py b/picard/ui/aboutdialog.py
index 444d796297..a207c84df5 100644
--- a/picard/ui/aboutdialog.py
+++ b/picard/ui/aboutdialog.py
@@ -38,7 +38,7 @@
     PicardDialog,
     SingletonDialog,
 )
-from picard.ui.ui_aboutdialog import Ui_AboutDialog
+from picard.ui.forms.ui_aboutdialog import Ui_AboutDialog
 
 
 class AboutDialog(PicardDialog, SingletonDialog):
diff --git a/picard/ui/cdlookup.py b/picard/ui/cdlookup.py
index 0be368f58c..c1d5298c46 100644
--- a/picard/ui/cdlookup.py
+++ b/picard/ui/cdlookup.py
@@ -46,7 +46,7 @@
 )
 
 from picard.ui import PicardDialog
-from picard.ui.ui_cdlookup import Ui_Dialog
+from picard.ui.forms.ui_cdlookup import Ui_Dialog
 
 
 class CDLookupDialog(PicardDialog):
diff --git a/picard/ui/edittagdialog.py b/picard/ui/edittagdialog.py
index 767d79f955..9d59862ff4 100644
--- a/picard/ui/edittagdialog.py
+++ b/picard/ui/edittagdialog.py
@@ -43,7 +43,7 @@
 from picard.util.tags import TAG_NAMES
 
 from picard.ui import PicardDialog
-from picard.ui.ui_edittagdialog import Ui_EditTagDialog
+from picard.ui.forms.ui_edittagdialog import Ui_EditTagDialog
 
 
 AUTOCOMPLETE_RELEASE_TYPES = [s.lower() for s
diff --git a/picard/ui/ui_aboutdialog.py b/picard/ui/forms/ui_aboutdialog.py
similarity index 100%
rename from picard/ui/ui_aboutdialog.py
rename to picard/ui/forms/ui_aboutdialog.py
diff --git a/picard/ui/ui_cdlookup.py b/picard/ui/forms/ui_cdlookup.py
similarity index 100%
rename from picard/ui/ui_cdlookup.py
rename to picard/ui/forms/ui_cdlookup.py
diff --git a/picard/ui/ui_edittagdialog.py b/picard/ui/forms/ui_edittagdialog.py
similarity index 100%
rename from picard/ui/ui_edittagdialog.py
rename to picard/ui/forms/ui_edittagdialog.py
diff --git a/picard/ui/ui_exception_script_selector.py b/picard/ui/forms/ui_exception_script_selector.py
similarity index 100%
rename from picard/ui/ui_exception_script_selector.py
rename to picard/ui/forms/ui_exception_script_selector.py
diff --git a/picard/ui/ui_infodialog.py b/picard/ui/forms/ui_infodialog.py
similarity index 100%
rename from picard/ui/ui_infodialog.py
rename to picard/ui/forms/ui_infodialog.py
diff --git a/picard/ui/ui_infostatus.py b/picard/ui/forms/ui_infostatus.py
similarity index 100%
rename from picard/ui/ui_infostatus.py
rename to picard/ui/forms/ui_infostatus.py
diff --git a/picard/ui/ui_multi_locale_selector.py b/picard/ui/forms/ui_multi_locale_selector.py
similarity index 100%
rename from picard/ui/ui_multi_locale_selector.py
rename to picard/ui/forms/ui_multi_locale_selector.py
diff --git a/picard/ui/ui_options.py b/picard/ui/forms/ui_options.py
similarity index 100%
rename from picard/ui/ui_options.py
rename to picard/ui/forms/ui_options.py
diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/forms/ui_options_advanced.py
similarity index 100%
rename from picard/ui/ui_options_advanced.py
rename to picard/ui/forms/ui_options_advanced.py
diff --git a/picard/ui/ui_options_attached_profiles.py b/picard/ui/forms/ui_options_attached_profiles.py
similarity index 100%
rename from picard/ui/ui_options_attached_profiles.py
rename to picard/ui/forms/ui_options_attached_profiles.py
diff --git a/picard/ui/ui_options_cdlookup.py b/picard/ui/forms/ui_options_cdlookup.py
similarity index 100%
rename from picard/ui/ui_options_cdlookup.py
rename to picard/ui/forms/ui_options_cdlookup.py
diff --git a/picard/ui/ui_options_cdlookup_select.py b/picard/ui/forms/ui_options_cdlookup_select.py
similarity index 100%
rename from picard/ui/ui_options_cdlookup_select.py
rename to picard/ui/forms/ui_options_cdlookup_select.py
diff --git a/picard/ui/ui_options_cover.py b/picard/ui/forms/ui_options_cover.py
similarity index 100%
rename from picard/ui/ui_options_cover.py
rename to picard/ui/forms/ui_options_cover.py
diff --git a/picard/ui/ui_options_fingerprinting.py b/picard/ui/forms/ui_options_fingerprinting.py
similarity index 100%
rename from picard/ui/ui_options_fingerprinting.py
rename to picard/ui/forms/ui_options_fingerprinting.py
diff --git a/picard/ui/ui_options_general.py b/picard/ui/forms/ui_options_general.py
similarity index 100%
rename from picard/ui/ui_options_general.py
rename to picard/ui/forms/ui_options_general.py
diff --git a/picard/ui/ui_options_genres.py b/picard/ui/forms/ui_options_genres.py
similarity index 100%
rename from picard/ui/ui_options_genres.py
rename to picard/ui/forms/ui_options_genres.py
diff --git a/picard/ui/ui_options_interface.py b/picard/ui/forms/ui_options_interface.py
similarity index 100%
rename from picard/ui/ui_options_interface.py
rename to picard/ui/forms/ui_options_interface.py
diff --git a/picard/ui/ui_options_interface_colors.py b/picard/ui/forms/ui_options_interface_colors.py
similarity index 100%
rename from picard/ui/ui_options_interface_colors.py
rename to picard/ui/forms/ui_options_interface_colors.py
diff --git a/picard/ui/ui_options_interface_toolbar.py b/picard/ui/forms/ui_options_interface_toolbar.py
similarity index 100%
rename from picard/ui/ui_options_interface_toolbar.py
rename to picard/ui/forms/ui_options_interface_toolbar.py
diff --git a/picard/ui/ui_options_interface_top_tags.py b/picard/ui/forms/ui_options_interface_top_tags.py
similarity index 100%
rename from picard/ui/ui_options_interface_top_tags.py
rename to picard/ui/forms/ui_options_interface_top_tags.py
diff --git a/picard/ui/ui_options_maintenance.py b/picard/ui/forms/ui_options_maintenance.py
similarity index 100%
rename from picard/ui/ui_options_maintenance.py
rename to picard/ui/forms/ui_options_maintenance.py
diff --git a/picard/ui/ui_options_matching.py b/picard/ui/forms/ui_options_matching.py
similarity index 100%
rename from picard/ui/ui_options_matching.py
rename to picard/ui/forms/ui_options_matching.py
diff --git a/picard/ui/ui_options_metadata.py b/picard/ui/forms/ui_options_metadata.py
similarity index 100%
rename from picard/ui/ui_options_metadata.py
rename to picard/ui/forms/ui_options_metadata.py
diff --git a/picard/ui/ui_options_network.py b/picard/ui/forms/ui_options_network.py
similarity index 100%
rename from picard/ui/ui_options_network.py
rename to picard/ui/forms/ui_options_network.py
diff --git a/picard/ui/ui_options_plugins.py b/picard/ui/forms/ui_options_plugins.py
similarity index 100%
rename from picard/ui/ui_options_plugins.py
rename to picard/ui/forms/ui_options_plugins.py
diff --git a/picard/ui/ui_options_profiles.py b/picard/ui/forms/ui_options_profiles.py
similarity index 100%
rename from picard/ui/ui_options_profiles.py
rename to picard/ui/forms/ui_options_profiles.py
diff --git a/picard/ui/ui_options_ratings.py b/picard/ui/forms/ui_options_ratings.py
similarity index 100%
rename from picard/ui/ui_options_ratings.py
rename to picard/ui/forms/ui_options_ratings.py
diff --git a/picard/ui/ui_options_releases.py b/picard/ui/forms/ui_options_releases.py
similarity index 100%
rename from picard/ui/ui_options_releases.py
rename to picard/ui/forms/ui_options_releases.py
diff --git a/picard/ui/ui_options_renaming.py b/picard/ui/forms/ui_options_renaming.py
similarity index 100%
rename from picard/ui/ui_options_renaming.py
rename to picard/ui/forms/ui_options_renaming.py
diff --git a/picard/ui/ui_options_renaming_compat.py b/picard/ui/forms/ui_options_renaming_compat.py
similarity index 100%
rename from picard/ui/ui_options_renaming_compat.py
rename to picard/ui/forms/ui_options_renaming_compat.py
diff --git a/picard/ui/ui_options_script.py b/picard/ui/forms/ui_options_script.py
similarity index 100%
rename from picard/ui/ui_options_script.py
rename to picard/ui/forms/ui_options_script.py
diff --git a/picard/ui/ui_options_tags.py b/picard/ui/forms/ui_options_tags.py
similarity index 100%
rename from picard/ui/ui_options_tags.py
rename to picard/ui/forms/ui_options_tags.py
diff --git a/picard/ui/ui_options_tags_compatibility_aac.py b/picard/ui/forms/ui_options_tags_compatibility_aac.py
similarity index 100%
rename from picard/ui/ui_options_tags_compatibility_aac.py
rename to picard/ui/forms/ui_options_tags_compatibility_aac.py
diff --git a/picard/ui/ui_options_tags_compatibility_ac3.py b/picard/ui/forms/ui_options_tags_compatibility_ac3.py
similarity index 100%
rename from picard/ui/ui_options_tags_compatibility_ac3.py
rename to picard/ui/forms/ui_options_tags_compatibility_ac3.py
diff --git a/picard/ui/ui_options_tags_compatibility_id3.py b/picard/ui/forms/ui_options_tags_compatibility_id3.py
similarity index 100%
rename from picard/ui/ui_options_tags_compatibility_id3.py
rename to picard/ui/forms/ui_options_tags_compatibility_id3.py
diff --git a/picard/ui/ui_options_tags_compatibility_wave.py b/picard/ui/forms/ui_options_tags_compatibility_wave.py
similarity index 100%
rename from picard/ui/ui_options_tags_compatibility_wave.py
rename to picard/ui/forms/ui_options_tags_compatibility_wave.py
diff --git a/picard/ui/ui_passworddialog.py b/picard/ui/forms/ui_passworddialog.py
similarity index 100%
rename from picard/ui/ui_passworddialog.py
rename to picard/ui/forms/ui_passworddialog.py
diff --git a/picard/ui/ui_provider_options_caa.py b/picard/ui/forms/ui_provider_options_caa.py
similarity index 100%
rename from picard/ui/ui_provider_options_caa.py
rename to picard/ui/forms/ui_provider_options_caa.py
diff --git a/picard/ui/ui_provider_options_local.py b/picard/ui/forms/ui_provider_options_local.py
similarity index 100%
rename from picard/ui/ui_provider_options_local.py
rename to picard/ui/forms/ui_provider_options_local.py
diff --git a/picard/ui/ui_scripteditor.py b/picard/ui/forms/ui_scripteditor.py
similarity index 100%
rename from picard/ui/ui_scripteditor.py
rename to picard/ui/forms/ui_scripteditor.py
diff --git a/picard/ui/ui_scripteditor_details.py b/picard/ui/forms/ui_scripteditor_details.py
similarity index 100%
rename from picard/ui/ui_scripteditor_details.py
rename to picard/ui/forms/ui_scripteditor_details.py
diff --git a/picard/ui/ui_scripting_documentation_dialog.py b/picard/ui/forms/ui_scripting_documentation_dialog.py
similarity index 100%
rename from picard/ui/ui_scripting_documentation_dialog.py
rename to picard/ui/forms/ui_scripting_documentation_dialog.py
diff --git a/picard/ui/ui_tagsfromfilenames.py b/picard/ui/forms/ui_tagsfromfilenames.py
similarity index 100%
rename from picard/ui/ui_tagsfromfilenames.py
rename to picard/ui/forms/ui_tagsfromfilenames.py
diff --git a/picard/ui/ui_widget_taglisteditor.py b/picard/ui/forms/ui_widget_taglisteditor.py
similarity index 100%
rename from picard/ui/ui_widget_taglisteditor.py
rename to picard/ui/forms/ui_widget_taglisteditor.py
diff --git a/picard/ui/ui_win_compat_dialog.py b/picard/ui/forms/ui_win_compat_dialog.py
similarity index 100%
rename from picard/ui/ui_win_compat_dialog.py
rename to picard/ui/forms/ui_win_compat_dialog.py
diff --git a/picard/ui/infodialog.py b/picard/ui/infodialog.py
index 67d1ca98d4..df1f9b9419 100644
--- a/picard/ui/infodialog.py
+++ b/picard/ui/infodialog.py
@@ -61,7 +61,7 @@
 
 from picard.ui import PicardDialog
 from picard.ui.colors import interface_colors
-from picard.ui.ui_infodialog import Ui_InfoDialog
+from picard.ui.forms.ui_infodialog import Ui_InfoDialog
 from picard.ui.util import StandardButton
 
 
diff --git a/picard/ui/infostatus.py b/picard/ui/infostatus.py
index ba8f3d6b8c..139690a15a 100644
--- a/picard/ui/infostatus.py
+++ b/picard/ui/infostatus.py
@@ -34,7 +34,7 @@
 from picard.util import icontheme
 from picard.util.time import get_timestamp
 
-from picard.ui.ui_infostatus import Ui_InfoStatus
+from picard.ui.forms.ui_infostatus import Ui_InfoStatus
 
 
 class InfoStatus(QtWidgets.QWidget, Ui_InfoStatus):
diff --git a/picard/ui/options/advanced.py b/picard/ui/options/advanced.py
index f7da15a176..4fe3233ac9 100644
--- a/picard/ui/options/advanced.py
+++ b/picard/ui/options/advanced.py
@@ -26,8 +26,8 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_advanced import Ui_AdvancedOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_advanced import Ui_AdvancedOptionsPage
 
 
 class AdvancedOptionsPage(OptionsPage):
diff --git a/picard/ui/options/cdlookup.py b/picard/ui/options/cdlookup.py
index aac7728387..b4b0a9bd01 100644
--- a/picard/ui/options/cdlookup.py
+++ b/picard/ui/options/cdlookup.py
@@ -36,9 +36,11 @@
 
 
 if AUTO_DETECT_DRIVES:
-    from picard.ui.ui_options_cdlookup_select import Ui_CDLookupOptionsPage
+    from picard.ui.forms.ui_options_cdlookup_select import (
+        Ui_CDLookupOptionsPage,
+    )
 else:
-    from picard.ui.ui_options_cdlookup import Ui_CDLookupOptionsPage
+    from picard.ui.forms.ui_options_cdlookup import Ui_CDLookupOptionsPage
 
 
 class CDLookupOptionsPage(OptionsPage):
diff --git a/picard/ui/options/cover.py b/picard/ui/options/cover.py
index d372cccfa2..64bdbc8c3a 100644
--- a/picard/ui/options/cover.py
+++ b/picard/ui/options/cover.py
@@ -39,9 +39,9 @@
 )
 
 from picard.ui.checkbox_list_item import CheckboxListItem
+from picard.ui.forms.ui_options_cover import Ui_CoverOptionsPage
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_cover import Ui_CoverOptionsPage
 from picard.ui.util import qlistwidget_items
 
 
diff --git a/picard/ui/options/dialog.py b/picard/ui/options/dialog.py
index 8bbb52b966..e468022726 100644
--- a/picard/ui/options/dialog.py
+++ b/picard/ui/options/dialog.py
@@ -61,6 +61,9 @@
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_options_attached_profiles import (
+    Ui_AttachedProfilesDialog,
+)
 from picard.ui.options import (  # noqa: F401 # pylint: disable=unused-import
     OptionsCheckError,
     OptionsPage,
@@ -91,7 +94,6 @@
     tags_compatibility_id3,
     tags_compatibility_wave,
 )
-from picard.ui.ui_options_attached_profiles import Ui_AttachedProfilesDialog
 from picard.ui.util import StandardButton
 
 
@@ -176,7 +178,7 @@ def __init__(self, default_page=None, parent=None):
         self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose)
 
-        from picard.ui.ui_options import Ui_Dialog
+        from picard.ui.forms.ui_options import Ui_Dialog
         self.ui = Ui_Dialog()
         self.ui.setupUi(self)
 
diff --git a/picard/ui/options/fingerprinting.py b/picard/ui/options/fingerprinting.py
index d076facbce..03ba4bfff9 100644
--- a/picard/ui/options/fingerprinting.py
+++ b/picard/ui/options/fingerprinting.py
@@ -41,11 +41,13 @@
 )
 from picard.util import webbrowser2
 
+from picard.ui.forms.ui_options_fingerprinting import (
+    Ui_FingerprintingOptionsPage,
+)
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
 )
-from picard.ui.ui_options_fingerprinting import Ui_FingerprintingOptionsPage
 
 
 class ApiKeyValidator(QtGui.QValidator):
diff --git a/picard/ui/options/general.py b/picard/ui/options/general.py
index 5648bf1c6b..0be872f214 100644
--- a/picard/ui/options/general.py
+++ b/picard/ui/options/general.py
@@ -47,8 +47,8 @@
 )
 from picard.util.mbserver import is_official_server
 
+from picard.ui.forms.ui_options_general import Ui_GeneralOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_general import Ui_GeneralOptionsPage
 
 
 class GeneralOptionsPage(OptionsPage):
diff --git a/picard/ui/options/genres.py b/picard/ui/options/genres.py
index c144c71cf4..34c32b0aae 100644
--- a/picard/ui/options/genres.py
+++ b/picard/ui/options/genres.py
@@ -36,8 +36,8 @@
 )
 from picard.track import TagGenreFilter
 
+from picard.ui.forms.ui_options_genres import Ui_GenresOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_genres import Ui_GenresOptionsPage
 
 
 TOOLTIP_GENRES_FILTER = N_("""<html><head/><body>
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 14ccfe1d4d..19d9280302 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -46,13 +46,13 @@
 )
 from picard.util import strxfrm
 
+from picard.ui.forms.ui_options_interface import Ui_InterfaceOptionsPage
 from picard.ui.options import OptionsPage
 from picard.ui.theme import (
     AVAILABLE_UI_THEMES,
     OS_SUPPORTS_THEMES,
     UiTheme,
 )
-from picard.ui.ui_options_interface import Ui_InterfaceOptionsPage
 from picard.ui.util import changes_require_restart_warning
 
 
diff --git a/picard/ui/options/interface_colors.py b/picard/ui/options/interface_colors.py
index 6ce0ee09d7..2f1e7ef920 100644
--- a/picard/ui/options/interface_colors.py
+++ b/picard/ui/options/interface_colors.py
@@ -36,8 +36,10 @@
 )
 
 from picard.ui.colors import interface_colors
+from picard.ui.forms.ui_options_interface_colors import (
+    Ui_InterfaceColorsOptionsPage,
+)
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_interface_colors import Ui_InterfaceColorsOptionsPage
 from picard.ui.util import changes_require_restart_warning
 
 
diff --git a/picard/ui/options/interface_toolbar.py b/picard/ui/options/interface_toolbar.py
index 558f05c61c..4a20600306 100644
--- a/picard/ui/options/interface_toolbar.py
+++ b/picard/ui/options/interface_toolbar.py
@@ -48,11 +48,11 @@
 
 from picard.ui import PicardDialog
 from picard.ui.enums import MainAction
-from picard.ui.moveable_list_view import MoveableListView
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_interface_toolbar import (
+from picard.ui.forms.ui_options_interface_toolbar import (
     Ui_InterfaceToolbarOptionsPage,
 )
+from picard.ui.moveable_list_view import MoveableListView
+from picard.ui.options import OptionsPage
 from picard.ui.util import qlistwidget_items
 
 
diff --git a/picard/ui/options/interface_top_tags.py b/picard/ui/options/interface_top_tags.py
index ef5e29a15b..70287a2f71 100644
--- a/picard/ui/options/interface_top_tags.py
+++ b/picard/ui/options/interface_top_tags.py
@@ -24,10 +24,10 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_interface_top_tags import (
+from picard.ui.forms.ui_options_interface_top_tags import (
     Ui_InterfaceTopTagsOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class InterfaceTopTagsOptionsPage(OptionsPage):
diff --git a/picard/ui/options/maintenance.py b/picard/ui/options/maintenance.py
index da1f80a96f..8f71986e12 100644
--- a/picard/ui/options/maintenance.py
+++ b/picard/ui/options/maintenance.py
@@ -45,8 +45,8 @@
 )
 from picard.util import open_local_path
 
+from picard.ui.forms.ui_options_maintenance import Ui_MaintenanceOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_maintenance import Ui_MaintenanceOptionsPage
 
 
 OPTIONS_NOT_IN_PAGES = {
diff --git a/picard/ui/options/matching.py b/picard/ui/options/matching.py
index b73dfc1ba8..eaad4e4ad1 100644
--- a/picard/ui/options/matching.py
+++ b/picard/ui/options/matching.py
@@ -26,8 +26,8 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_matching import Ui_MatchingOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_matching import Ui_MatchingOptionsPage
 
 
 class MatchingOptionsPage(OptionsPage):
diff --git a/picard/ui/options/metadata.py b/picard/ui/options/metadata.py
index 0a0e3fab1d..e4d3116aa1 100644
--- a/picard/ui/options/metadata.py
+++ b/picard/ui/options/metadata.py
@@ -49,11 +49,13 @@
 )
 
 from picard.ui import PicardDialog
+from picard.ui.forms.ui_exception_script_selector import (
+    Ui_ExceptionScriptSelector,
+)
+from picard.ui.forms.ui_multi_locale_selector import Ui_MultiLocaleSelector
+from picard.ui.forms.ui_options_metadata import Ui_MetadataOptionsPage
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_exception_script_selector import Ui_ExceptionScriptSelector
-from picard.ui.ui_multi_locale_selector import Ui_MultiLocaleSelector
-from picard.ui.ui_options_metadata import Ui_MetadataOptionsPage
 from picard.ui.util import qlistwidget_items
 
 
diff --git a/picard/ui/options/network.py b/picard/ui/options/network.py
index 482c613a71..ae575326c3 100644
--- a/picard/ui/options/network.py
+++ b/picard/ui/options/network.py
@@ -27,8 +27,8 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_network import Ui_NetworkOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_network import Ui_NetworkOptionsPage
 
 
 class NetworkOptionsPage(OptionsPage):
diff --git a/picard/ui/options/plugins.py b/picard/ui/options/plugins.py
index 7f3466c56b..8b0c7d3866 100644
--- a/picard/ui/options/plugins.py
+++ b/picard/ui/options/plugins.py
@@ -62,9 +62,9 @@
 )
 
 from picard.ui import HashableTreeWidgetItem
+from picard.ui.forms.ui_options_plugins import Ui_PluginsOptionsPage
 from picard.ui.options import OptionsPage
 from picard.ui.theme import theme
-from picard.ui.ui_options_plugins import Ui_PluginsOptionsPage
 
 
 COLUMN_NAME, COLUMN_VERSION, COLUMN_ACTIONS = range(3)
diff --git a/picard/ui/options/profiles.py b/picard/ui/options/profiles.py
index e5c933c544..221349e469 100644
--- a/picard/ui/options/profiles.py
+++ b/picard/ui/options/profiles.py
@@ -47,9 +47,9 @@
 from picard.script import get_file_naming_script_presets
 from picard.util import get_base_title
 
+from picard.ui.forms.ui_options_profiles import Ui_ProfileEditorDialog
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_profiles import Ui_ProfileEditorDialog
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets.profilelistwidget import ProfileListWidgetItem
 
diff --git a/picard/ui/options/ratings.py b/picard/ui/options/ratings.py
index c1f3f97960..6c5cb8f1b1 100644
--- a/picard/ui/options/ratings.py
+++ b/picard/ui/options/ratings.py
@@ -25,8 +25,8 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_ratings import Ui_RatingsOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_ratings import Ui_RatingsOptionsPage
 
 
 class RatingsOptionsPage(OptionsPage):
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
index 8c27cc5945..ec2ada6c30 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -50,8 +50,8 @@
 )
 from picard.util import strxfrm
 
+from picard.ui.forms.ui_options_releases import Ui_ReleasesOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_releases import Ui_ReleasesOptionsPage
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets import ClickableSlider
 
diff --git a/picard/ui/options/renaming.py b/picard/ui/options/renaming.py
index ff58f152b8..b9c6bbd8a7 100644
--- a/picard/ui/options/renaming.py
+++ b/picard/ui/options/renaming.py
@@ -47,6 +47,7 @@
 from picard.script import ScriptParser
 
 from picard.ui.enums import MainAction
+from picard.ui.forms.ui_options_renaming import Ui_RenamingOptionsPage
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
@@ -61,7 +62,6 @@
     populate_script_selection_combo_box,
     synchronize_vertical_scrollbars,
 )
-from picard.ui.ui_options_renaming import Ui_RenamingOptionsPage
 
 
 class RenamingOptionsPage(OptionsPage):
diff --git a/picard/ui/options/renaming_compat.py b/picard/ui/options/renaming_compat.py
index 8e48ab8ca2..77f9341771 100644
--- a/picard/ui/options/renaming_compat.py
+++ b/picard/ui/options/renaming_compat.py
@@ -52,9 +52,11 @@
 from picard.util import system_supports_long_paths
 
 from picard.ui import PicardDialog
+from picard.ui.forms.ui_options_renaming_compat import (
+    Ui_RenamingCompatOptionsPage,
+)
+from picard.ui.forms.ui_win_compat_dialog import Ui_WinCompatDialog
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_renaming_compat import Ui_RenamingCompatOptionsPage
-from picard.ui.ui_win_compat_dialog import Ui_WinCompatDialog
 
 
 class RenamingCompatOptionsPage(OptionsPage):
diff --git a/picard/ui/options/scripting.py b/picard/ui/options/scripting.py
index 9bf30aee56..b751581125 100644
--- a/picard/ui/options/scripting.py
+++ b/picard/ui/options/scripting.py
@@ -50,15 +50,15 @@
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_options_script import Ui_ScriptingOptionsPage
+from picard.ui.forms.ui_scripting_documentation_dialog import (
+    Ui_ScriptingDocumentationDialog,
+)
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
 )
-from picard.ui.ui_options_script import Ui_ScriptingOptionsPage
-from picard.ui.ui_scripting_documentation_dialog import (
-    Ui_ScriptingDocumentationDialog,
-)
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets.scriptdocumentation import ScriptingDocumentationWidget
 from picard.ui.widgets.scriptlistwidget import ScriptListWidgetItem
diff --git a/picard/ui/options/tags.py b/picard/ui/options/tags.py
index b9b9fba28c..aa5e7c0d8d 100644
--- a/picard/ui/options/tags.py
+++ b/picard/ui/options/tags.py
@@ -33,8 +33,8 @@
 from picard.i18n import N_
 
 from picard.ui.enums import MainAction
+from picard.ui.forms.ui_options_tags import Ui_TagsOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags import Ui_TagsOptionsPage
 
 
 class TagsOptionsPage(OptionsPage):
diff --git a/picard/ui/options/tags_compatibility_aac.py b/picard/ui/options/tags_compatibility_aac.py
index 68c0e3ca9a..10c120bcb5 100644
--- a/picard/ui/options/tags_compatibility_aac.py
+++ b/picard/ui/options/tags_compatibility_aac.py
@@ -25,10 +25,10 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags_compatibility_aac import (
+from picard.ui.forms.ui_options_tags_compatibility_aac import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityAACOptionsPage(OptionsPage):
diff --git a/picard/ui/options/tags_compatibility_ac3.py b/picard/ui/options/tags_compatibility_ac3.py
index 65f1504e8a..8748733418 100644
--- a/picard/ui/options/tags_compatibility_ac3.py
+++ b/picard/ui/options/tags_compatibility_ac3.py
@@ -25,10 +25,10 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags_compatibility_ac3 import (
+from picard.ui.forms.ui_options_tags_compatibility_ac3 import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityAC3OptionsPage(OptionsPage):
diff --git a/picard/ui/options/tags_compatibility_id3.py b/picard/ui/options/tags_compatibility_id3.py
index 0958f2be9b..81d2a693ef 100644
--- a/picard/ui/options/tags_compatibility_id3.py
+++ b/picard/ui/options/tags_compatibility_id3.py
@@ -27,10 +27,10 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags_compatibility_id3 import (
+from picard.ui.forms.ui_options_tags_compatibility_id3 import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityID3OptionsPage(OptionsPage):
diff --git a/picard/ui/options/tags_compatibility_wave.py b/picard/ui/options/tags_compatibility_wave.py
index 2f28ee8f12..951d5ee207 100644
--- a/picard/ui/options/tags_compatibility_wave.py
+++ b/picard/ui/options/tags_compatibility_wave.py
@@ -26,10 +26,10 @@
 from picard.formats.wav import WAVFile
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags_compatibility_wave import (
+from picard.ui.forms.ui_options_tags_compatibility_wave import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityWaveOptionsPage(OptionsPage):
diff --git a/picard/ui/passworddialog.py b/picard/ui/passworddialog.py
index 9f019fa040..b61b6c03ae 100644
--- a/picard/ui/passworddialog.py
+++ b/picard/ui/passworddialog.py
@@ -30,7 +30,7 @@
 from picard.i18n import gettext as _
 
 from picard.ui import PicardDialog
-from picard.ui.ui_passworddialog import Ui_PasswordDialog
+from picard.ui.forms.ui_passworddialog import Ui_PasswordDialog
 
 
 class PasswordDialog(PicardDialog):
diff --git a/picard/ui/scripteditor.py b/picard/ui/scripteditor.py
index 1ec2085050..867ccc4bdc 100644
--- a/picard/ui/scripteditor.py
+++ b/picard/ui/scripteditor.py
@@ -76,13 +76,13 @@
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_scripteditor import Ui_ScriptEditor
+from picard.ui.forms.ui_scripteditor_details import Ui_ScriptDetails
 from picard.ui.options import OptionsPage
 from picard.ui.options.scripting import (
     OptionsCheckError,
     ScriptCheckError,
 )
-from picard.ui.ui_scripteditor import Ui_ScriptEditor
-from picard.ui.ui_scripteditor_details import Ui_ScriptDetails
 from picard.ui.widgets.scriptdocumentation import ScriptingDocumentationWidget
 
 
diff --git a/picard/ui/tagsfromfilenames.py b/picard/ui/tagsfromfilenames.py
index 96d03c8553..aef6fa17ec 100644
--- a/picard/ui/tagsfromfilenames.py
+++ b/picard/ui/tagsfromfilenames.py
@@ -38,7 +38,7 @@
 from picard.util.tags import display_tag_name
 
 from picard.ui import PicardDialog
-from picard.ui.ui_tagsfromfilenames import Ui_TagsFromFileNamesDialog
+from picard.ui.forms.ui_tagsfromfilenames import Ui_TagsFromFileNamesDialog
 from picard.ui.util import StandardButton
 
 
diff --git a/picard/ui/widgets/taglisteditor.py b/picard/ui/widgets/taglisteditor.py
index 2cdd30c8ac..94a3812334 100644
--- a/picard/ui/widgets/taglisteditor.py
+++ b/picard/ui/widgets/taglisteditor.py
@@ -24,7 +24,7 @@
 
 from picard.util.tags import TAG_NAMES
 
-from picard.ui.ui_widget_taglisteditor import Ui_TagListEditor
+from picard.ui.forms.ui_widget_taglisteditor import Ui_TagListEditor
 from picard.ui.widgets.editablelistview import (
     AutocompleteItemDelegate,
     EditableListModel,
diff --git a/setup.py b/setup.py
index 66897e148f..b5075f8784 100644
--- a/setup.py
+++ b/setup.py
@@ -325,7 +325,7 @@ def py_from_ui(uifile):
 
 
 def py_from_ui_with_defaultdir(uifile):
-    return os.path.join("picard", "ui", py_from_ui(uifile))
+    return os.path.join('picard', 'ui', 'forms', py_from_ui(uifile))
 
 
 def ui_files():