diff --git a/API/folder.py b/API/folder.py
index 573a82a..bf018c6 100644
--- a/API/folder.py
+++ b/API/folder.py
@@ -31,7 +31,7 @@ except ImportError:
     mutagen = None
 
 try:
-    from metadata import (
+    from SYS.metadata import (
         _read_sidecar_metadata,
         _derive_sidecar_path,
         write_tags,
diff --git a/Provider/metadata_provider.py b/Provider/metadata_provider.py
index a5e7bb9..9856ebb 100644
--- a/Provider/metadata_provider.py
+++ b/Provider/metadata_provider.py
@@ -701,7 +701,7 @@ class YtdlpMetadataProvider(MetadataProvider):
 
         tags: List[str] = []
         try:
-            from metadata import extract_ytdlp_tags
+            from SYS.metadata import extract_ytdlp_tags
         except Exception:
             extract_ytdlp_tags = None  # type: ignore[assignment]
 
diff --git a/Store/HydrusNetwork.py b/Store/HydrusNetwork.py
index 9ac5cc8..1de2f6e 100644
--- a/Store/HydrusNetwork.py
+++ b/Store/HydrusNetwork.py
@@ -1380,7 +1380,7 @@ class HydrusNetwork(Store):
             except Exception:
                 existing_tags = []
 
-            from metadata import compute_namespaced_tag_overwrite
+            from SYS.metadata import compute_namespaced_tag_overwrite
 
             tags_to_remove, tags_to_add, _merged = compute_namespaced_tag_overwrite(
                 existing_tags, incoming_tags
diff --git a/TUI/menu_actions.py b/TUI/menu_actions.py
index 9cf9d5d..22d0994 100644
--- a/TUI/menu_actions.py
+++ b/TUI/menu_actions.py
@@ -14,7 +14,7 @@ for path in (ROOT_DIR, BASE_DIR):
     if str_path not in sys.path:
         sys.path.insert(0, str_path)
 
-import metadata
+import SYS.metadata as metadata
 
 
 @dataclass(slots=True)
diff --git a/TUI/modalscreen/download.py b/TUI/modalscreen/download.py
index d426076..764abb3 100644
--- a/TUI/modalscreen/download.py
+++ b/TUI/modalscreen/download.py
@@ -42,7 +42,7 @@ except ImportError:
 
 # Import tag processing helpers
 try:
-    from metadata import expand_tag_lists, process_tags_from_string
+    from SYS.metadata import expand_tag_lists, process_tags_from_string
 except ImportError:
     expand_tag_lists = None
     process_tags_from_string = None
diff --git a/metadata.py b/metadata.py
deleted file mode 100644
index d73484c..0000000
--- a/metadata.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""Backwards-compatibility shim for top-level `metadata` module.
-
-Moved into `SYS.metadata` — keep the old import path working for tests
-and third-party code.
-"""
-
-from importlib import import_module
-import sys
-
-_real = import_module("SYS.metadata")
-sys.modules[__name__] = _real
diff --git a/models.py b/models.py
deleted file mode 100644
index 3cc6542..0000000
--- a/models.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""Backwards-compatibility shim for top-level `models` module.
-
-Moved into `SYS.models` — preserve old import semantics.
-"""
-
-from importlib import import_module
-import sys
-
-_real = import_module("SYS.models")
-sys.modules[__name__] = _real
diff --git a/pipeline.py b/pipeline.py
deleted file mode 100644
index 8c1f450..0000000
--- a/pipeline.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Backwards-compatibility shim for top-level `pipeline` module.
-
-The project moved core modules into the `SYS` package (e.g. `SYS.pipeline`).
-Many third-party code and tests still import top-level names like `pipeline`.
-This shim ensures `import pipeline` returns the `SYS.pipeline` module object.
-"""
-
-from importlib import import_module
-import sys
-
-# Import the real implementation and ensure subsequent imports of
-# the top-level name point to the SYS package module object.
-_real = import_module("SYS.pipeline")
-sys.modules[__name__] = _real
diff --git a/result_table.py b/result_table.py
deleted file mode 100644
index 0a4f77b..0000000
--- a/result_table.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""Backwards-compatibility shim for top-level `result_table` module.
-
-Moved into `SYS.result_table` — keep the old import path working for tests
-and third-party code.
-"""
-
-from importlib import import_module
-import sys
-
-_real = import_module("SYS.result_table")
-sys.modules[__name__] = _real
diff --git a/rich_display.py b/rich_display.py
deleted file mode 100644
index fdd27f9..0000000
--- a/rich_display.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""Backwards-compatibility shim for top-level `rich_display` module.
-
-Moved into `SYS.rich_display` — preserve old import path.
-"""
-
-from importlib import import_module
-import sys
-
-_real = import_module("SYS.rich_display")
-sys.modules[__name__] = _real