diff --git a/picard/const/__init__.py b/picard/const/__init__.py
index 799e56aed..911c674dd 100644
--- a/picard/const/__init__.py
+++ b/picard/const/__init__.py
@@ -120,6 +120,8 @@ for k, v in MB_ATTRIBUTES.items():
     elif k.startswith('DB:release_status/name:'):
         RELEASE_STATUS[v] = v
 
+# TODO: remove those 4 imports before 3.0 release
+
 # Release countries
 from picard.const.countries import (  # noqa: F401,E402 # pylint: disable=unused-import
     RELEASE_COUNTRIES,
diff --git a/picard/ui/edittagdialog.py b/picard/ui/edittagdialog.py
index 61a695345..df5ea06cf 100644
--- a/picard/ui/edittagdialog.py
+++ b/picard/ui/edittagdialog.py
@@ -33,12 +33,12 @@ from PyQt5 import (
 )
 
 from picard.const import (
-    RELEASE_COUNTRIES,
     RELEASE_FORMATS,
     RELEASE_PRIMARY_GROUPS,
     RELEASE_SECONDARY_GROUPS,
     RELEASE_STATUS,
 )
+from picard.const.countries import RELEASE_COUNTRIES
 from picard.util.tags import TAG_NAMES
 
 from picard.ui import PicardDialog
diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 1ddb50bab..1a784749e 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -42,7 +42,7 @@ from picard.config import (
     TextOption,
     get_config,
 )
-from picard.const import UI_LANGUAGES
+from picard.const.languages import UI_LANGUAGES
 from picard.const.sys import IS_MACOS
 from picard.util import strxfrm
 
diff --git a/picard/ui/options/metadata.py b/picard/ui/options/metadata.py
index f6aa3c85e..d8abef476 100644
--- a/picard/ui/options/metadata.py
+++ b/picard/ui/options/metadata.py
@@ -38,11 +38,11 @@ from picard.config import (
     TextOption,
     get_config,
 )
-from picard.const import (
-    ALIAS_LOCALES,
+from picard.const.locales import ALIAS_LOCALES
+from picard.const.scripts import (
     SCRIPTS,
+    scripts_sorted_by_localized_name,
 )
-from picard.const.scripts import scripts_sorted_by_localized_name
 
 from picard.ui import PicardDialog
 from picard.ui.moveable_list_view import MoveableListView
diff --git a/picard/ui/options/releases.py b/picard/ui/options/releases.py
index c0be03652..2631f471b 100644
--- a/picard/ui/options/releases.py
+++ b/picard/ui/options/releases.py
@@ -37,11 +37,11 @@ from picard.config import (
     get_config,
 )
 from picard.const import (
-    RELEASE_COUNTRIES,
     RELEASE_FORMATS,
     RELEASE_PRIMARY_GROUPS,
     RELEASE_SECONDARY_GROUPS,
 )
+from picard.const.countries import RELEASE_COUNTRIES
 from picard.const.sys import IS_WIN
 from picard.util import strxfrm