From c32f500f3cfe5a3c4dea63ef3a29093bfe219fe7 Mon Sep 17 00:00:00 2001
From: Travis Abendshien <46939827+CyanVoxel@users.noreply.github.com>
Date: Tue, 18 Aug 2026 13:56:35 -0700
Subject: [PATCH] refactor!: organize project layout (#1483)

* refactor!: organize project layout

* refactor: organize tests

* fix: change main.py with __main__.py in tagstudio.spec

* refactor: rename renderer.py to file_renderer.py
---
 contrib/.vscode/launch.json                   |  2 +-
 docs/entries.md                               |  4 +-
 docs/fields.md                                |  2 +-
 docs/roadmap.md                               |  4 +-
 docs/style.md                                 |  4 +-
 docs/tags.md                                  |  2 +-
 docs/usage.md                                 |  2 +-
 pyproject.toml                                |  6 +-
 scripts/tagstudio.spec                        |  2 +-
 src/tagstudio/__main__.py                     | 69 +++++++++++++++-
 src/tagstudio/core/driver.py                  |  8 +-
 .../core/library/alchemy/migrations.py        |  2 +-
 .../{qt => i18n}/platform_strings.py          |  4 +-
 src/tagstudio/{qt => i18n}/translations.py    |  4 +-
 src/tagstudio/main.py                         | 80 -------------------
 .../renderer.py => previews/file_renderer.py} | 56 +++++++------
 .../{qt/helpers => previews}/gradients.py     |  0
 .../{ => previews}/renderers/archive.py       |  2 +-
 .../{ => previews}/renderers/audio.py         |  2 +-
 .../{ => previews}/renderers/blender.py       |  2 +-
 .../{ => previews}/renderers/clip_studio.py   |  0
 .../{ => previews}/renderers/ebook.py         |  4 +-
 .../{ => previews}/renderers/font.py          |  2 +-
 .../renderers/medibang_paint.py               |  0
 .../{ => previews}/renderers/paint_dot_net.py |  0
 src/tagstudio/{ => previews}/renderers/pdf.py |  2 +-
 .../{ => previews}/renderers/raster_image.py  |  0
 .../{ => previews}/renderers/source_engine.py |  0
 .../{ => previews}/renderers/text.py          |  0
 .../{ => previews}/renderers/vector_image.py  |  0
 .../{ => previews}/renderers/video.py         |  2 +-
 .../vendored/blender_thumbnailer.py           |  0
 .../{renderers => previews}/vendored/probe.py |  0
 .../vendored/pydub/audio_segment.py           |  2 +-
 .../vendored/pydub/utils.py                   |  6 +-
 .../video_tester.py}                          |  4 +-
 .../{global_settings.py => app_settings.py}   |  8 +-
 src/tagstudio/qt/cache_manager.py             |  2 +-
 .../qt/controllers/autofill_line_edit.py      |  8 +-
 .../clickable_slider.py                       |  4 +-
 .../controllers/edit_field_template_modal.py  |  5 +-
 .../{edit_text_controller.py => edit_text.py} |  1 +
 .../qt/controllers/field_suggest_box.py       |  8 +-
 ...ller.py => field_template_search_panel.py} |  6 +-
 ...controller.py => field_template_widget.py} |  3 +-
 .../qt/controllers/file_opener_label.py       | 55 +++++++++++++
 ...dal_controller.py => fix_ignored_modal.py} |  9 ++-
 ...re_modal_controller.py => ignore_modal.py} |  1 +
 ...eview_panel_controller.py => inspector.py} | 16 ++--
 ...w_controller.py => library_info_window.py} |  7 +-
 .../qt/{views => controllers}/main_window.py  | 21 ++---
 .../merge_dupe_entries_progress.py}           |  9 +--
 ...w_thumb_controller.py => preview_thumb.py} |  5 +-
 .../qt/{mixed => controllers}/progress_bar.py |  1 +
 .../relink_entries_progress.py}               |  6 +-
 ...ch_panel_controller.py => search_panel.py} |  4 +-
 .../qt/{views => controllers}/splash.py       |  5 +-
 src/tagstudio/qt/controllers/suggest_box.py   | 12 ++-
 .../{tag_box_controller.py => tag_box.py}     |  3 +-
 ...anel_controller.py => tag_search_panel.py} |  4 +-
 .../qt/controllers/tag_suggest_box.py         |  8 +-
 .../qt/controllers/underlined_widget.py       |  2 +
 .../update_available_message_box.py           |  7 +-
 src/tagstudio/qt/{ => helpers}/mnemonics.py   |  6 +-
 src/tagstudio/qt/mixed/about_modal.py         |  7 +-
 src/tagstudio/qt/mixed/build_color.py         |  7 +-
 src/tagstudio/qt/mixed/build_namespace.py     |  5 +-
 src/tagstudio/qt/mixed/build_tag.py           |  7 +-
 src/tagstudio/qt/mixed/color_box.py           |  5 +-
 src/tagstudio/qt/mixed/datetime_picker.py     |  5 +-
 src/tagstudio/qt/mixed/drop_import_modal.py   | 16 ++--
 src/tagstudio/qt/mixed/field_containers.py    | 11 +--
 src/tagstudio/qt/mixed/field_widget.py        |  5 +-
 src/tagstudio/qt/mixed/file_attributes.py     | 14 ++--
 src/tagstudio/qt/mixed/fix_dupe_files.py      |  8 +-
 src/tagstudio/qt/mixed/fix_unlinked.py        | 18 ++---
 src/tagstudio/qt/mixed/folders_to_tags.py     |  8 +-
 src/tagstudio/qt/mixed/item_thumb.py          |  7 +-
 src/tagstudio/qt/mixed/landing.py             |  7 +-
 src/tagstudio/qt/mixed/media_player.py        |  9 ++-
 src/tagstudio/qt/mixed/migration_modal.py     | 12 +--
 .../qt/mixed/mirror_entries_modal.py          |  7 +-
 .../qt/{views => mixed}/paged_body_wrapper.py |  2 -
 .../paged_panel.py}                           |  5 +-
 .../paged_panel_state.py                      |  2 +-
 src/tagstudio/qt/mixed/pagination.py          |  5 +-
 .../qt/mixed/remove_ignored_modal.py          | 17 ++--
 .../qt/mixed/remove_unlinked_modal.py         | 17 ++--
 src/tagstudio/qt/mixed/settings_panel.py      | 11 +--
 src/tagstudio/qt/mixed/tag_color_label.py     |  6 +-
 src/tagstudio/qt/mixed/tag_color_manager.py   |  8 +-
 src/tagstudio/qt/mixed/tag_color_preview.py   |  7 +-
 src/tagstudio/qt/mixed/tag_color_selection.py |  7 +-
 src/tagstudio/qt/mixed/tag_widget.py          |  7 +-
 src/tagstudio/qt/mixed/text_field.py          |  1 +
 src/tagstudio/qt/{ts_qt.py => qt_driver.py}   | 30 +++----
 src/tagstudio/qt/qt_file_renderer.py          |  6 +-
 src/tagstudio/qt/utils/file_opener.py         | 44 ----------
 .../views/edit_field_template_modal_view.py   |  4 +-
 src/tagstudio/qt/views/edit_text_view.py      |  4 +-
 .../qt/views/field_template_widget_view.py    |  5 +-
 .../qt/views/fix_ignored_modal_view.py        |  5 +-
 src/tagstudio/qt/views/ignore_modal_view.py   |  3 +-
 ...review_panel_view.py => inspector_view.py} | 10 +--
 .../{ => views/layouts}/thumb_grid_layout.py  |  2 +-
 .../qt/views/library_info_window_view.py      | 11 +--
 src/tagstudio/qt/views/modal_view.py          |  4 +-
 src/tagstudio/qt/views/preview_thumb_view.py  |  9 ++-
 src/tagstudio/qt/views/search_panel_view.py   |  4 +-
 .../styles}/color_overlay.py                  |  2 +-
 .../styles}/image_effects.py                  |  0
 .../qt/{models => views/styles}/palette.py    |  0
 .../rounded_pixmap_style.py                   |  0
 .../{stylesheets => styles}/stylesheets.py    |  8 +-
 src/tagstudio/qt/views/suggest_box_view.py    |  2 +-
 src/tagstudio/qt/views/tag_box_view.py        |  3 +-
 src/tagstudio/qt/views/thumb_button.py        | 12 +--
 .../qt/views/underlined_widget_view.py        |  2 +-
 tests/conftest.py                             | 14 +++-
 .../{ => core/library}/test_json_migration.py |  2 +-
 tests/{ => core/library}/test_library.py      |  0
 .../library/test_migrations.py}               | 22 ++---
 .../library/test_refresh.py}                  |  0
 tests/{ => core/library}/test_search.py       |  0
 .../library/test_unlinked_entries.py}         |  2 +-
 tests/{ => core}/macros/test_folders_tags.py  |  0
 .../test_base_driver.py}                      | 17 ++--
 tests/{macros => core}/test_dupe_files.py     |  0
 tests/{ => i18n}/test_translations.py         |  2 +-
 ...lobal_settings.py => test_app_settings.py} | 22 ++++-
 tests/qt/test_build_tag_panel.py              |  2 +-
 tests/qt/test_field_containers.py             | 22 ++---
 tests/qt/test_file_path_options.py            |  6 +-
 ...est_preview_panel.py => test_inspector.py} | 10 +--
 tests/qt/test_item_thumb.py                   |  2 +-
 tests/qt/test_qt_driver.py                    |  2 +-
 tests/qt/test_tag_panel.py                    |  2 +-
 tests/qt/test_tag_search_panel.py             |  2 +-
 tests/qt/test_theme_system.py                 |  2 +-
 139 files changed, 545 insertions(+), 514 deletions(-)
 rename src/tagstudio/{qt => i18n}/platform_strings.py (86%)
 rename src/tagstudio/{qt => i18n}/translations.py (96%)
 delete mode 100755 src/tagstudio/main.py
 rename src/tagstudio/{qt/previews/renderer.py => previews/file_renderer.py} (96%)
 rename src/tagstudio/{qt/helpers => previews}/gradients.py (100%)
 rename src/tagstudio/{ => previews}/renderers/archive.py (98%)
 rename src/tagstudio/{ => previews}/renderers/audio.py (98%)
 rename src/tagstudio/{ => previews}/renderers/blender.py (94%)
 rename src/tagstudio/{ => previews}/renderers/clip_studio.py (100%)
 rename src/tagstudio/{ => previews}/renderers/ebook.py (93%)
 rename src/tagstudio/{ => previews}/renderers/font.py (98%)
 rename src/tagstudio/{ => previews}/renderers/medibang_paint.py (100%)
 rename src/tagstudio/{ => previews}/renderers/paint_dot_net.py (100%)
 rename src/tagstudio/{ => previews}/renderers/pdf.py (96%)
 rename src/tagstudio/{ => previews}/renderers/raster_image.py (100%)
 rename src/tagstudio/{ => previews}/renderers/source_engine.py (100%)
 rename src/tagstudio/{ => previews}/renderers/text.py (100%)
 rename src/tagstudio/{ => previews}/renderers/vector_image.py (100%)
 rename src/tagstudio/{ => previews}/renderers/video.py (96%)
 rename src/tagstudio/{renderers => previews}/vendored/blender_thumbnailer.py (100%)
 rename src/tagstudio/{renderers => previews}/vendored/probe.py (100%)
 rename src/tagstudio/{renderers => previews}/vendored/pydub/audio_segment.py (99%)
 rename src/tagstudio/{renderers => previews}/vendored/pydub/utils.py (97%)
 rename src/tagstudio/{qt/helpers/file_tester.py => previews/video_tester.py} (88%)
 rename src/tagstudio/qt/{global_settings.py => app_settings.py} (96%)
 rename src/tagstudio/qt/{views => controllers}/clickable_slider.py (92%)
 rename src/tagstudio/qt/controllers/{edit_text_controller.py => edit_text.py} (98%)
 rename src/tagstudio/qt/controllers/{field_template_search_panel_controller.py => field_template_search_panel.py} (96%)
 rename src/tagstudio/qt/controllers/{field_template_widget_controller.py => field_template_widget.py} (93%)
 create mode 100644 src/tagstudio/qt/controllers/file_opener_label.py
 rename src/tagstudio/qt/controllers/{fix_ignored_modal_controller.py => fix_ignored_modal.py} (92%)
 rename src/tagstudio/qt/controllers/{ignore_modal_controller.py => ignore_modal.py} (97%)
 rename src/tagstudio/qt/controllers/{preview_panel_controller.py => inspector.py} (96%)
 rename src/tagstudio/qt/controllers/{library_info_window_controller.py => library_info_window.py} (96%)
 rename src/tagstudio/qt/{views => controllers}/main_window.py (97%)
 rename src/tagstudio/qt/{mixed/merge_dupe_entries.py => controllers/merge_dupe_entries_progress.py} (78%)
 rename src/tagstudio/qt/controllers/{preview_thumb_controller.py => preview_thumb.py} (97%)
 rename src/tagstudio/qt/{mixed => controllers}/progress_bar.py (98%)
 rename src/tagstudio/qt/{mixed/relink_entries_modal.py => controllers/relink_entries_progress.py} (86%)
 rename src/tagstudio/qt/controllers/{search_panel_controller.py => search_panel.py} (99%)
 rename src/tagstudio/qt/{views => controllers}/splash.py (98%)
 rename src/tagstudio/qt/controllers/{tag_box_controller.py => tag_box.py} (97%)
 rename src/tagstudio/qt/controllers/{tag_search_panel_controller.py => tag_search_panel.py} (98%)
 rename src/tagstudio/qt/{ => helpers}/mnemonics.py (97%)
 rename src/tagstudio/qt/{views => mixed}/paged_body_wrapper.py (90%)
 rename src/tagstudio/qt/{controllers/paged_panel_controller.py => mixed/paged_panel.py} (95%)
 rename src/tagstudio/qt/{controllers => mixed}/paged_panel_state.py (91%)
 rename src/tagstudio/qt/{ts_qt.py => qt_driver.py} (98%)
 rename src/tagstudio/qt/views/{preview_panel_view.py => inspector_view.py} (94%)
 rename src/tagstudio/qt/{ => views/layouts}/thumb_grid_layout.py (99%)
 rename src/tagstudio/qt/{helpers => views/styles}/color_overlay.py (98%)
 rename src/tagstudio/qt/{helpers => views/styles}/image_effects.py (100%)
 rename src/tagstudio/qt/{models => views/styles}/palette.py (100%)
 rename src/tagstudio/qt/views/{stylesheets => styles}/rounded_pixmap_style.py (100%)
 rename src/tagstudio/qt/views/{stylesheets => styles}/stylesheets.py (99%)
 rename tests/{ => core/library}/test_json_migration.py (93%)
 rename tests/{ => core/library}/test_library.py (100%)
 rename tests/{test_db_migrations.py => core/library/test_migrations.py} (55%)
 rename tests/{macros/test_refresh_dir.py => core/library/test_refresh.py} (100%)
 rename tests/{ => core/library}/test_search.py (100%)
 rename tests/{macros/test_missing_files.py => core/library/test_unlinked_entries.py} (96%)
 rename tests/{ => core}/macros/test_folders_tags.py (100%)
 rename tests/{test_driver.py => core/test_base_driver.py} (76%)
 rename tests/{macros => core}/test_dupe_files.py (100%)
 rename tests/{ => i18n}/test_translations.py (98%)
 rename tests/qt/{test_global_settings.py => test_app_settings.py} (55%)
 rename tests/qt/{test_preview_panel.py => test_inspector.py} (89%)

diff --git a/contrib/.vscode/launch.json b/contrib/.vscode/launch.json
index 28e5523d..941d90ca 100644
--- a/contrib/.vscode/launch.json
+++ b/contrib/.vscode/launch.json
@@ -5,7 +5,7 @@
             "name": "TagStudio",
             "type": "python",
             "request": "launch",
-            "program": "${workspaceRoot}/src/tagstudio/main.py",
+            "program": "${workspaceRoot}/src/tagstudio/__main__.py",
             "console": "integratedTerminal",
             "justMyCode": true,
             "args": ["-o", "~/Documents/Example"]
diff --git a/docs/entries.md b/docs/entries.md
index d16442c3..7b11939f 100644
--- a/docs/entries.md
+++ b/docs/entries.md
@@ -16,11 +16,11 @@ File entry data is stored within the `ts_library.sqlite` file inside each librar
 
 ## Appearance
 
-File entries appear as thumbnails inside the grid display. The preview panel shows a more detailed preview of the file, along with extra file stats and all attached TagStudio tags and fields.
+File entries appear as thumbnails inside the grid display. The inspector shows a more detailed preview of the file, along with extra file stats and all attached TagStudio tags and fields.
 
 ## Unlinked Entries
 
-If the file that an entry is referencing has been moved, renamed, or deleted on disk, then TagStudio will display its unlinked status with a red chain-link icon instead of its thumbnail image. Certain uncached stats such as the file size and image dimensions will also be unavailable to see in the preview panel.
+If the file that an entry is referencing has been moved, renamed, or deleted on disk, then TagStudio will display its unlinked status with a red chain-link icon instead of its thumbnail image. Certain uncached stats such as the file size and image dimensions will also be unavailable to see in the inspector.
 
 To fix file entries that have become unlinked, select the "Fix Unlinked Entries" option from the Tools menu. From there, refresh the unlinked entry count and choose whether to search and relink you files, and/or delete the file entries from your library. This will NOT delete or modify any files on disk.
 
diff --git a/docs/fields.md b/docs/fields.md
index c2d672dd..9f3e4572 100644
--- a/docs/fields.md
+++ b/docs/fields.md
@@ -12,7 +12,7 @@ Fields are extra pieces of information you can add to [file entries](./entries.m
 
 Unlike tags, fields are based on [templates](#templates) that contain pre-filled information such as the field type and title, and that information is _copied_ to fields when adding them to entries. Editing field information on entries **does not** modify the template it was created from.
 
-To add a field to an entry, click the "Add Field" button in the preview panel. From there you can search and/or select a [field template](#field-templates) to choose from, or create a new one from the search bar. Alternatively you can create new field templates from **Edit -> Manage Field Templates**.
+To add a field to an entry, click the "Add Field" button at the bottom of the inspector. From there you can search and/or select a [field template](#field-templates) to choose from, or create a new one from the search bar. Alternatively you can create new field templates from **Edit -> Manage Field Templates**.
 
 <figure markdown="span">
   ![Fields Example](assets/fields_example.png)
diff --git a/docs/roadmap.md b/docs/roadmap.md
index da4c440f..518f44dd 100644
--- a/docs/roadmap.md
+++ b/docs/roadmap.md
@@ -203,8 +203,8 @@ Discrete library objects representing [attributes](<https://en.wikipedia.org/wik
     - [ ] User-Defined Icons :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.7.x]**
     - [ ] Tint Icons with Text Color :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.7.x]**
 - [x] [Category Property](tags.md#is-category) **[[v9.5.0](changelog.md#950-march-3rd-2025)]**
-    - [x] Property available for tags that allow the tag and any inheriting from it to be displayed separately in the preview panel under a title
-    - [ ] Fine-tuned exclusion from categories :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
+    - [x] Property available for tags that allow the tag and any inheriting from it to be displayed separately in the inspector under a title
+    - [x] Fine-tuned exclusion from categories :material-chevron-triple-up:{ .priority-high title="High Priority" } **[v9.6.x]**
 - [x] Hidden Property **[[v9.5.7](changelog.md#957-may-5th-2026)]**
     - [x] Built-in "Archived" tag has this property by default **[[v9.5.7](changelog.md#957-may-5th-2026)]**
     - [x] Checkbox near search bar to show hidden tags in search **[[v9.5.7](changelog.md#957-may-5th-2026)]**
diff --git a/docs/style.md b/docs/style.md
index f52adf61..1fe5b40f 100644
--- a/docs/style.md
+++ b/docs/style.md
@@ -50,7 +50,7 @@ TagStudio provides an [EditorConfig](https://editorconfig.org/#example-file) fil
 ### :material-tag: TagStudio Systems
 
 - Translation keys can be accessed via bracket notation (e.g. `Translations["translation_key"]`) or with the `Translations.format()` method when a value needs to be passed to a placeholder in the translation.
-- Avoid passing around the `QtDriver` class where possible. Instead, pass only the necessary components such as the `Library` and `GlobalSettings` instances.
+- Avoid passing around the `QtDriver` class where possible. Instead, pass only the necessary components such as the `Library` and `AppSettings` instances.
 - Use HTML-like tags inside strings over explicit stylesheets where possible. The `Style` class provides several handy methods for formatting text with these.
 - Use the `format` method in the stylesheets class to format text headers.
 
@@ -138,7 +138,7 @@ qt/
 │   # Frontend classes that aren't related to widgets, like managers
 ├── resource_manager.py
 ├── cache_manager.py
-├── ts_qt.py # Qt Driver
+├── qt_driver.py
 └── ...
 ```
 
diff --git a/docs/tags.md b/docs/tags.md
index d1119f99..2b47d86a 100644
--- a/docs/tags.md
+++ b/docs/tags.md
@@ -100,7 +100,7 @@ Properties are special attributes of tags that change their behavior in some way
 
 #### Is Category
 
-The "Is Category" property of tags determines if a tag should be treated as a category itself when being organized inside the preview panel. If this tag or any tags inheriting from this tag (i.e. tags that have this tag as a "[Parent Tag](#parent-tags)"), then these tags will appear under a separated group that's named after this tag. Tags inheriting from multiple "category tags" will still show up under any applicable category.
+The "Is Category" property of tags determines if a tag should be treated as a category itself when being organized inside the inspector. If this tag or any tags inheriting from this tag (i.e. tags that have this tag as a "[Parent Tag](#parent-tags)"), then these tags will appear under a separated group that's named after this tag. Tags inheriting from multiple "category tags" will still show up under any applicable category.
 
 This means that duplicates of tags can appear on entries if the tag inherits from multiple parent categories, however this is by design and reflects the nature of multiple inheritance. Any tags not inheriting from a category tag will simply show under a default "Tag" section.
 
diff --git a/docs/usage.md b/docs/usage.md
index f0200a01..8dc08345 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -24,7 +24,7 @@ TagStudio automatically scans for new or updated files when opening a library by
 
 ## :material-tag-text: Tagging
 
-With one or more file entries selected, you can **search for** or **create a new tag** by clicking the "Add Tag" button at the bottom of the preview panel or by pressing <kbd>Ctrl</kbd>+<kbd>T</kbd>.
+With one or more file entries selected, you can **search for** or **create a new tag** by clicking the "Add Tag" button at the bottom of the inspector or by pressing <kbd>Ctrl</kbd>+<kbd>T</kbd>.
 
 This will open the the **"Tag Bar"**, a combination search/creation bar that is designed to allow you to quickly create and apply tags that don't exist yet, find and apply existing tags from your library, and verify if certain tags already exist and/or are applied to your selection.
 
diff --git a/pyproject.toml b/pyproject.toml
index e13ed903..f5a29a70 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ dependencies = [
 ]
 
 [project.gui-scripts]
-tagstudio = "tagstudio.main:main"
+tagstudio = "tagstudio.__main__:main"
 
 [dependency-groups]
 all = [
@@ -97,7 +97,7 @@ filterwarnings = [
 ignore = [
     ".venv/**",
     "src/tagstudio/core/library/json/",
-    "src/tagstudio/renderers/vendored/pydub/",
+    "src/tagstudio/previews/vendored/pydub/",
 ]
 include = ["src/tagstudio", "tests"]
 # Reference for the settings here: https://github.com/microsoft/pyright/blob/main/docs/configuration.md
@@ -126,7 +126,7 @@ ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D106", "D107"]
 
 [tool.ruff.lint.per-file-ignores]
 "tests/**" = ["D", "E402"]
-"src/tagstudio/renderers/vendored/**" = ["B", "E", "N", "UP", "SIM115"]
+"src/tagstudio/previews/vendored/**" = ["B", "E", "N", "UP", "SIM115"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"
diff --git a/scripts/tagstudio.spec b/scripts/tagstudio.spec
index 995e0195..ee709ce7 100755
--- a/scripts/tagstudio.spec
+++ b/scripts/tagstudio.spec
@@ -41,7 +41,7 @@ datafiles = [
 ]
 
 a = Analysis(
-    [Path(project_root, "main.py")],
+    [Path(project_root, "__main__.py")],
     pathex=[],
     binaries=[],
     datas=datafiles,
diff --git a/src/tagstudio/__main__.py b/src/tagstudio/__main__.py
index 3774e755..c89e02e5 100755
--- a/src/tagstudio/__main__.py
+++ b/src/tagstudio/__main__.py
@@ -1,9 +1,72 @@
 #!/usr/bin/env python3
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
+# SPDX-License-Identifier: MIT
 
 
-from tagstudio.main import main
+"""TagStudio launcher."""
+
+import argparse
+import sys
+import traceback
+
+import structlog
+
+from tagstudio.core.constants import BUILD_TYPE, VERSION
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.qt_driver import QtDriver
+
+logger = structlog.get_logger(__name__)
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-o",
+        "--open",
+        dest="open",
+        type=str,
+        help="Path to a TagStudio Library folder to open on start.",
+    )
+    parser.add_argument(
+        "-s",
+        "--settings-file",
+        dest="settings_file",
+        type=str,
+        help="Path to a TagStudio .toml global settings file to use.",
+    )
+    parser.add_argument(
+        "-c",
+        "--cache-file",
+        dest="cache_file",
+        type=str,
+        help="Path to a TagStudio .ini or .plist cache file to use.",
+    )
+    parser.add_argument(
+        "--debug",
+        dest="debug",
+        action="store_true",
+        help="Reveals additional internal data useful for debugging.",
+    )
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        help="Displays TagStudio version information.",
+        version=f"TagStudio v{VERSION} {Translations[BUILD_TYPE] if BUILD_TYPE else ''}",
+    )
+    args = parser.parse_args()
+
+    driver = QtDriver(args)
+    ui_name = "Qt"
+
+    # Run the chosen frontend driver.
+    try:
+        driver.start()
+    except Exception:
+        traceback.print_exc()
+        logger.info(f"\nTagStudio Frontend ({ui_name}) Crashed! Press Enter to Continue...")
+        input()
+
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())
diff --git a/src/tagstudio/core/driver.py b/src/tagstudio/core/driver.py
index 4d73a92a..e553afe1 100644
--- a/src/tagstudio/core/driver.py
+++ b/src/tagstudio/core/driver.py
@@ -10,16 +10,16 @@ from PySide6.QtCore import QSettings
 from tagstudio.core.constants import TS_FOLDER_NAME
 from tagstudio.core.enums import AppCacheItems
 from tagstudio.core.library.alchemy.library import LibraryStatus
-from tagstudio.qt.global_settings import GlobalSettings
+from tagstudio.qt.app_settings import AppSettings
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Turn into a BaseDriver class instead of a "Mixin".
 class DriverMixin:
     cached_values: QSettings
-    # TODO: GlobalSettings has become closely tied to Qt.
-    # Should there be a base Settings class?
-    settings: GlobalSettings
+    # TODO: AppSettings is Qt-specific and should not be in a base driver class.
+    settings: AppSettings
 
     def evaluate_path(self, open_path: str | None) -> LibraryStatus:
         """Check if the path of library is valid."""
diff --git a/src/tagstudio/core/library/alchemy/migrations.py b/src/tagstudio/core/library/alchemy/migrations.py
index 0224589a..5acc31e8 100644
--- a/src/tagstudio/core/library/alchemy/migrations.py
+++ b/src/tagstudio/core/library/alchemy/migrations.py
@@ -25,7 +25,7 @@ from tagstudio.core.library.alchemy.joins import TagParent
 from tagstudio.core.library.alchemy.models import Entry, Tag, TagColorGroup, Version
 from tagstudio.core.library.ignore import migrate_ext_list
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/qt/platform_strings.py b/src/tagstudio/i18n/platform_strings.py
similarity index 86%
rename from src/tagstudio/qt/platform_strings.py
rename to src/tagstudio/i18n/platform_strings.py
index 91f12a31..d7b8408d 100644
--- a/src/tagstudio/qt/platform_strings.py
+++ b/src/tagstudio/i18n/platform_strings.py
@@ -1,12 +1,12 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
+# SPDX-License-Identifier: MIT
 
 
 """A collection of platform-dependant strings."""
 
 import platform
 
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 
 
 def open_file_str() -> str:
diff --git a/src/tagstudio/qt/translations.py b/src/tagstudio/i18n/translations.py
similarity index 96%
rename from src/tagstudio/qt/translations.py
rename to src/tagstudio/i18n/translations.py
index eb0b88a8..7c9c0195 100644
--- a/src/tagstudio/qt/translations.py
+++ b/src/tagstudio/i18n/translations.py
@@ -1,5 +1,5 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
+# SPDX-License-Identifier: MIT
 
 
 from collections import defaultdict
@@ -10,7 +10,7 @@ from typing import Any
 import structlog
 import ujson
 
-from tagstudio.qt.mnemonics import remove_mnemonic_marker
+from tagstudio.qt.helpers.mnemonics import remove_mnemonic_marker
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/main.py b/src/tagstudio/main.py
deleted file mode 100755
index bf98a849..00000000
--- a/src/tagstudio/main.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-# SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
-
-
-"""TagStudio launcher."""
-
-import argparse
-import traceback
-
-import structlog
-
-from tagstudio.core.constants import BUILD_TYPE, VERSION
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.ts_qt import QtDriver
-
-logger = structlog.get_logger(__name__)
-
-
-def main():
-    # appid = "cyanvoxel.tagstudio.9"
-    # ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appid)
-
-    # Parse arguments.
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "-o",
-        "--open",
-        dest="open",
-        type=str,
-        help="Path to a TagStudio Library folder to open on start.",
-    )
-    parser.add_argument(
-        "-s",
-        "--settings-file",
-        dest="settings_file",
-        type=str,
-        help="Path to a TagStudio .toml global settings file to use.",
-    )
-    parser.add_argument(
-        "-c",
-        "--cache-file",
-        dest="cache_file",
-        type=str,
-        help="Path to a TagStudio .ini or .plist cache file to use.",
-    )
-
-    # parser.add_argument('--browse', dest='browse', action='store_true',
-    #                     help='Jumps to entry browsing on startup.')
-    # parser.add_argument('--external_preview', dest='external_preview', action='store_true',
-    #                     help='Outputs current preview thumbnail to a live-updating file.')
-    parser.add_argument(
-        "--debug",
-        dest="debug",
-        action="store_true",
-        help="Reveals additional internal data useful for debugging.",
-    )
-    parser.add_argument(
-        "-v",
-        "--version",
-        action="version",
-        help="Displays TagStudio version information.",
-        version=f"TagStudio v{VERSION} {Translations[BUILD_TYPE] if BUILD_TYPE else ''}",
-    )
-    args = parser.parse_args()
-
-    driver = QtDriver(args)
-    ui_name = "Qt"
-
-    # Run the chosen frontend driver.
-    try:
-        driver.start()
-    except Exception:
-        traceback.print_exc()
-        logger.info(f"\nTagStudio Frontend ({ui_name}) Crashed! Press Enter to Continue...")
-        input()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/tagstudio/qt/previews/renderer.py b/src/tagstudio/previews/file_renderer.py
similarity index 96%
rename from src/tagstudio/qt/previews/renderer.py
rename to src/tagstudio/previews/file_renderer.py
index 97db0a6e..07df276b 100644
--- a/src/tagstudio/qt/previews/renderer.py
+++ b/src/tagstudio/previews/file_renderer.py
@@ -17,37 +17,41 @@ from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.ignore import Ignore
 from tagstudio.core.media_types import MediaCategories, MediaType
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.cache_manager import CacheManager
-from tagstudio.qt.global_settings import (
-    DEFAULT_CACHED_THUMB_RES,
-    MAX_CACHED_THUMB_RES,
-    MIN_CACHED_THUMB_RES,
-    GlobalSettings,
-    Theme,
-)
-from tagstudio.qt.helpers.gradients import four_corner_gradient
-from tagstudio.qt.models.palette import UI_COLORS, ColorType, UiColor, get_ui_color
-from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.renderers.archive import (
+from tagstudio.previews.gradients import four_corner_gradient
+from tagstudio.previews.renderers.archive import (
     apple_embedded_thumb,
     archive_thumb,
     krita_thumb,
     open_doc_thumb,
     powerpoint_thumb,
 )
-from tagstudio.renderers.audio import audio_album_thumb, audio_waveform_thumb
-from tagstudio.renderers.blender import blender_thumb
-from tagstudio.renderers.clip_studio import clip_studio_thumb
-from tagstudio.renderers.ebook import epub_thumb
-from tagstudio.renderers.font import font_full_preview, font_small_thumb
-from tagstudio.renderers.medibang_paint import medibang_paint_thumb
-from tagstudio.renderers.paint_dot_net import paint_dot_net_thumb
-from tagstudio.renderers.pdf import pdf_thumb
-from tagstudio.renderers.raster_image import exr_image_thumb, raster_image_thumb, raw_image_thumb
-from tagstudio.renderers.source_engine import vtf_thumb
-from tagstudio.renderers.text import text_thumb
-from tagstudio.renderers.vector_image import vector_image_thumb
-from tagstudio.renderers.video import video_thumb
+from tagstudio.previews.renderers.audio import audio_album_thumb, audio_waveform_thumb
+from tagstudio.previews.renderers.blender import blender_thumb
+from tagstudio.previews.renderers.clip_studio import clip_studio_thumb
+from tagstudio.previews.renderers.ebook import epub_thumb
+from tagstudio.previews.renderers.font import font_full_preview, font_small_thumb
+from tagstudio.previews.renderers.medibang_paint import medibang_paint_thumb
+from tagstudio.previews.renderers.paint_dot_net import paint_dot_net_thumb
+from tagstudio.previews.renderers.pdf import pdf_thumb
+from tagstudio.previews.renderers.raster_image import (
+    exr_image_thumb,
+    raster_image_thumb,
+    raw_image_thumb,
+)
+from tagstudio.previews.renderers.source_engine import vtf_thumb
+from tagstudio.previews.renderers.text import text_thumb
+from tagstudio.previews.renderers.vector_image import vector_image_thumb
+from tagstudio.previews.renderers.video import video_thumb
+from tagstudio.qt.app_settings import (
+    DEFAULT_CACHED_THUMB_RES,
+    MAX_CACHED_THUMB_RES,
+    MIN_CACHED_THUMB_RES,
+    AppSettings,
+    Theme,
+)
+from tagstudio.qt.cache_manager import CacheManager
+from tagstudio.qt.resource_manager import ResourceManager
+from tagstudio.qt.views.styles.palette import UI_COLORS, ColorType, UiColor, get_ui_color
 
 ImageFile.LOAD_TRUNCATED_IMAGES = True
 Image.MAX_IMAGE_PIXELS = None
@@ -62,7 +66,7 @@ class FileRenderer:
     rm: ResourceManager = ResourceManager()
     cached_img_ext: str = ".webp"
 
-    def __init__(self, library: Library, settings: GlobalSettings) -> None:
+    def __init__(self, library: Library, settings: AppSettings) -> None:
         super().__init__()
         self.lib = library
         self.settings = settings
diff --git a/src/tagstudio/qt/helpers/gradients.py b/src/tagstudio/previews/gradients.py
similarity index 100%
rename from src/tagstudio/qt/helpers/gradients.py
rename to src/tagstudio/previews/gradients.py
diff --git a/src/tagstudio/renderers/archive.py b/src/tagstudio/previews/renderers/archive.py
similarity index 98%
rename from src/tagstudio/renderers/archive.py
rename to src/tagstudio/previews/renderers/archive.py
index dd16ae02..d2918e51 100644
--- a/src/tagstudio/renderers/archive.py
+++ b/src/tagstudio/previews/renderers/archive.py
@@ -16,7 +16,7 @@ from PIL import Image
 
 from tagstudio.core.media_types import MediaCategories
 from tagstudio.core.utils.types import unwrap
-from tagstudio.renderers.raster_image import image_from_bytes
+from tagstudio.previews.renderers.raster_image import image_from_bytes
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/audio.py b/src/tagstudio/previews/renderers/audio.py
similarity index 98%
rename from src/tagstudio/renderers/audio.py
rename to src/tagstudio/previews/renderers/audio.py
index ced8b961..262e484c 100644
--- a/src/tagstudio/renderers/audio.py
+++ b/src/tagstudio/previews/renderers/audio.py
@@ -13,7 +13,7 @@ from mutagen import flac, id3, mp4
 from mutagen._util import MutagenError
 from PIL import Image, ImageDraw
 
-from tagstudio.renderers.vendored.pydub.audio_segment import (
+from tagstudio.previews.vendored.pydub.audio_segment import (
     _AudioSegment as AudioSegment,  # pyright: ignore[reportPrivateUsage]
 )
 
diff --git a/src/tagstudio/renderers/blender.py b/src/tagstudio/previews/renderers/blender.py
similarity index 94%
rename from src/tagstudio/renderers/blender.py
rename to src/tagstudio/previews/renderers/blender.py
index b8de3479..8b0e4074 100644
--- a/src/tagstudio/renderers/blender.py
+++ b/src/tagstudio/previews/renderers/blender.py
@@ -9,7 +9,7 @@ from PIL import Image
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
 
-from tagstudio.renderers.vendored.blender_thumbnailer import blend_thumb
+from tagstudio.previews.vendored.blender_thumbnailer import blend_thumb
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/clip_studio.py b/src/tagstudio/previews/renderers/clip_studio.py
similarity index 100%
rename from src/tagstudio/renderers/clip_studio.py
rename to src/tagstudio/previews/renderers/clip_studio.py
diff --git a/src/tagstudio/renderers/ebook.py b/src/tagstudio/previews/renderers/ebook.py
similarity index 93%
rename from src/tagstudio/renderers/ebook.py
rename to src/tagstudio/previews/renderers/ebook.py
index 0dec5749..b8fcf0be 100644
--- a/src/tagstudio/renderers/ebook.py
+++ b/src/tagstudio/previews/renderers/ebook.py
@@ -12,8 +12,8 @@ from PIL import Image
 
 from tagstudio.core.media_types import MediaCategories
 from tagstudio.core.utils.types import unwrap
-from tagstudio.renderers.archive import Archive, first_image_in_archive, open_archive
-from tagstudio.renderers.raster_image import image_from_bytes
+from tagstudio.previews.renderers.archive import Archive, first_image_in_archive, open_archive
+from tagstudio.previews.renderers.raster_image import image_from_bytes
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/font.py b/src/tagstudio/previews/renderers/font.py
similarity index 98%
rename from src/tagstudio/renderers/font.py
rename to src/tagstudio/previews/renderers/font.py
index a48e033d..4b39351c 100644
--- a/src/tagstudio/renderers/font.py
+++ b/src/tagstudio/previews/renderers/font.py
@@ -11,8 +11,8 @@ import structlog
 from PIL import Image, ImageDraw, ImageFont
 
 from tagstudio.core.constants import FONT_SAMPLE_SIZES, FONT_SAMPLE_TEXT
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.helpers.text_wrapper import wrap_full_text
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/medibang_paint.py b/src/tagstudio/previews/renderers/medibang_paint.py
similarity index 100%
rename from src/tagstudio/renderers/medibang_paint.py
rename to src/tagstudio/previews/renderers/medibang_paint.py
diff --git a/src/tagstudio/renderers/paint_dot_net.py b/src/tagstudio/previews/renderers/paint_dot_net.py
similarity index 100%
rename from src/tagstudio/renderers/paint_dot_net.py
rename to src/tagstudio/previews/renderers/paint_dot_net.py
diff --git a/src/tagstudio/renderers/pdf.py b/src/tagstudio/previews/renderers/pdf.py
similarity index 96%
rename from src/tagstudio/renderers/pdf.py
rename to src/tagstudio/previews/renderers/pdf.py
index 39e97b26..65b67646 100644
--- a/src/tagstudio/renderers/pdf.py
+++ b/src/tagstudio/previews/renderers/pdf.py
@@ -14,7 +14,7 @@ from PySide6.QtCore import QBuffer, QFile, QFileDevice, QIODeviceBase, QSizeF
 from PySide6.QtGui import QImage
 from PySide6.QtPdf import QPdfDocument, QPdfDocumentRenderOptions
 
-from tagstudio.qt.helpers.image_effects import replace_transparent_pixels
+from tagstudio.qt.views.styles.image_effects import replace_transparent_pixels
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/raster_image.py b/src/tagstudio/previews/renderers/raster_image.py
similarity index 100%
rename from src/tagstudio/renderers/raster_image.py
rename to src/tagstudio/previews/renderers/raster_image.py
diff --git a/src/tagstudio/renderers/source_engine.py b/src/tagstudio/previews/renderers/source_engine.py
similarity index 100%
rename from src/tagstudio/renderers/source_engine.py
rename to src/tagstudio/previews/renderers/source_engine.py
diff --git a/src/tagstudio/renderers/text.py b/src/tagstudio/previews/renderers/text.py
similarity index 100%
rename from src/tagstudio/renderers/text.py
rename to src/tagstudio/previews/renderers/text.py
diff --git a/src/tagstudio/renderers/vector_image.py b/src/tagstudio/previews/renderers/vector_image.py
similarity index 100%
rename from src/tagstudio/renderers/vector_image.py
rename to src/tagstudio/previews/renderers/vector_image.py
diff --git a/src/tagstudio/renderers/video.py b/src/tagstudio/previews/renderers/video.py
similarity index 96%
rename from src/tagstudio/renderers/video.py
rename to src/tagstudio/previews/renderers/video.py
index 548cfca2..8ea8b4db 100644
--- a/src/tagstudio/renderers/video.py
+++ b/src/tagstudio/previews/renderers/video.py
@@ -11,7 +11,7 @@ from cv2.typing import MatLike
 from PIL import Image, UnidentifiedImageError
 from PIL.Image import DecompressionBombError
 
-from tagstudio.qt.helpers.file_tester import is_readable_video
+from tagstudio.previews.video_tester import is_readable_video
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/renderers/vendored/blender_thumbnailer.py b/src/tagstudio/previews/vendored/blender_thumbnailer.py
similarity index 100%
rename from src/tagstudio/renderers/vendored/blender_thumbnailer.py
rename to src/tagstudio/previews/vendored/blender_thumbnailer.py
diff --git a/src/tagstudio/renderers/vendored/probe.py b/src/tagstudio/previews/vendored/probe.py
similarity index 100%
rename from src/tagstudio/renderers/vendored/probe.py
rename to src/tagstudio/previews/vendored/probe.py
diff --git a/src/tagstudio/renderers/vendored/pydub/audio_segment.py b/src/tagstudio/previews/vendored/pydub/audio_segment.py
similarity index 99%
rename from src/tagstudio/renderers/vendored/pydub/audio_segment.py
rename to src/tagstudio/previews/vendored/pydub/audio_segment.py
index 1a04ecdf..bdb08b63 100644
--- a/src/tagstudio/renderers/vendored/pydub/audio_segment.py
+++ b/src/tagstudio/previews/vendored/pydub/audio_segment.py
@@ -43,7 +43,7 @@ from pydub.utils import (
 )
 
 from tagstudio.core.utils.silent_subprocess import silent_popen
-from tagstudio.renderers.vendored.pydub.utils import _mediainfo_json
+from tagstudio.previews.vendored.pydub.utils import _mediainfo_json
 
 basestring = str
 xrange = range
diff --git a/src/tagstudio/renderers/vendored/pydub/utils.py b/src/tagstudio/previews/vendored/pydub/utils.py
similarity index 97%
rename from src/tagstudio/renderers/vendored/pydub/utils.py
rename to src/tagstudio/previews/vendored/pydub/utils.py
index 58bc7957..e346cd0a 100644
--- a/src/tagstudio/renderers/vendored/pydub/utils.py
+++ b/src/tagstudio/previews/vendored/pydub/utils.py
@@ -8,11 +8,7 @@ import json
 import re
 import subprocess
 
-from pydub.utils import (
-    _fd_or_path_or_tempfile,
-    fsdecode,
-    get_extra_info,
-)
+from pydub.utils import _fd_or_path_or_tempfile, fsdecode, get_extra_info
 
 from tagstudio.core.utils.ffmpeg_status import FfprobeStatus
 from tagstudio.core.utils.silent_subprocess import silent_popen
diff --git a/src/tagstudio/qt/helpers/file_tester.py b/src/tagstudio/previews/video_tester.py
similarity index 88%
rename from src/tagstudio/qt/helpers/file_tester.py
rename to src/tagstudio/previews/video_tester.py
index e7eb7fbc..fbd78b40 100644
--- a/src/tagstudio/qt/helpers/file_tester.py
+++ b/src/tagstudio/previews/video_tester.py
@@ -1,12 +1,12 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
-# SPDX-License-Identifier: GPL-3.0-only
+# SPDX-License-Identifier: MIT
 
 
 from pathlib import Path
 
 import ffmpeg
 
-from tagstudio.renderers.vendored.probe import probe
+from tagstudio.previews.vendored.probe import probe
 
 
 def is_readable_video(filepath: Path | str):
diff --git a/src/tagstudio/qt/global_settings.py b/src/tagstudio/qt/app_settings.py
similarity index 96%
rename from src/tagstudio/qt/global_settings.py
rename to src/tagstudio/qt/app_settings.py
index f1a4f1a3..5817e4a6 100644
--- a/src/tagstudio/qt/global_settings.py
+++ b/src/tagstudio/qt/app_settings.py
@@ -59,7 +59,7 @@ class TomlEnumEncoder(toml.TomlEncoder):
 # NOTE: pydantic also has a BaseSettings class (from pydantic-settings) that allows any settings
 # properties to be overwritten with environment variables. As TagStudio is not currently using
 # environment variables, this was not based on that, but that may be useful in the future.
-class GlobalSettings(BaseModel):
+class AppSettings(BaseModel):
     language: str = Field(default="en")
     open_last_loaded_on_startup: bool = Field(default=True)
     generate_thumbs: bool = Field(default=True)
@@ -88,17 +88,17 @@ class GlobalSettings(BaseModel):
     loaded_from: Path = Field(default=DEFAULT_GLOBAL_SETTINGS_PATH, exclude=True)
 
     @staticmethod
-    def read_settings(path: Path = DEFAULT_GLOBAL_SETTINGS_PATH) -> "GlobalSettings":
+    def read_settings(path: Path = DEFAULT_GLOBAL_SETTINGS_PATH) -> "AppSettings":
         if path.exists():
             with open(path) as file:
                 filecontents = file.read()
                 if len(filecontents.strip()) != 0:
                     logger.info("[Settings] Reading Global Settings File", path=path)
                     settings_data = toml.loads(filecontents)
-                    settings = GlobalSettings(**settings_data, loaded_from=path)
+                    settings = AppSettings(**settings_data, loaded_from=path)
                     return settings
 
-        return GlobalSettings(loaded_from=path)
+        return AppSettings(loaded_from=path)
 
     def save(self, path: Path | None = None) -> None:
         if path is None:
diff --git a/src/tagstudio/qt/cache_manager.py b/src/tagstudio/qt/cache_manager.py
index 98094ffc..5508a8ba 100644
--- a/src/tagstudio/qt/cache_manager.py
+++ b/src/tagstudio/qt/cache_manager.py
@@ -12,7 +12,7 @@ import structlog
 from PIL import Image
 
 from tagstudio.core.constants import THUMB_CACHE_NAME, TS_FOLDER_NAME
-from tagstudio.qt.global_settings import DEFAULT_CACHED_THUMB_QUALITY, DEFAULT_THUMB_CACHE_SIZE
+from tagstudio.qt.app_settings import DEFAULT_CACHED_THUMB_QUALITY, DEFAULT_THUMB_CACHE_SIZE
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/qt/controllers/autofill_line_edit.py b/src/tagstudio/qt/controllers/autofill_line_edit.py
index daaa9f48..dfc5a451 100644
--- a/src/tagstudio/qt/controllers/autofill_line_edit.py
+++ b/src/tagstudio/qt/controllers/autofill_line_edit.py
@@ -6,13 +6,9 @@ from typing import override
 import structlog
 from PySide6 import QtCore, QtGui
 from PySide6.QtCore import QPoint, Signal
-from PySide6.QtWidgets import (
-    QLineEdit,
-    QMenu,
-    QWidget,
-)
+from PySide6.QtWidgets import QLineEdit, QMenu, QWidget
 
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.stylesheets import (
     autofill_scroll_top_focus_style,
     autofill_scroll_top_style,
 )
diff --git a/src/tagstudio/qt/views/clickable_slider.py b/src/tagstudio/qt/controllers/clickable_slider.py
similarity index 92%
rename from src/tagstudio/qt/views/clickable_slider.py
rename to src/tagstudio/qt/controllers/clickable_slider.py
index d1ac82a1..28b53a6c 100644
--- a/src/tagstudio/qt/views/clickable_slider.py
+++ b/src/tagstudio/qt/controllers/clickable_slider.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-from typing import override
+from typing import Any, override
 
 import structlog
 from PySide6.QtGui import QMouseEvent
@@ -18,7 +18,7 @@ class ClickableSlider(QSlider):
     based on click events.
     """
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any):  # pyright: ignore[reportExplicitAny]
         super().__init__(*args, **kwargs)
 
     @override
diff --git a/src/tagstudio/qt/controllers/edit_field_template_modal.py b/src/tagstudio/qt/controllers/edit_field_template_modal.py
index 4a2a1174..f8ebaf99 100644
--- a/src/tagstudio/qt/controllers/edit_field_template_modal.py
+++ b/src/tagstudio/qt/controllers/edit_field_template_modal.py
@@ -9,13 +9,14 @@ from tagstudio.core.library.alchemy.fields import (
     DatetimeFieldTemplate,
     TextFieldTemplate,
 )
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.views.edit_field_template_modal_view import EditFieldTemplateModalView
-from tagstudio.qt.views.stylesheets.stylesheets import line_edit_style
+from tagstudio.qt.views.styles.stylesheets import line_edit_style
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class EditFieldTemplateModal(EditFieldTemplateModalView):
     field_type_map: dict[str, str] = {
         "TextFieldTemplate": Translations["field_type.text"],
diff --git a/src/tagstudio/qt/controllers/edit_text_controller.py b/src/tagstudio/qt/controllers/edit_text.py
similarity index 98%
rename from src/tagstudio/qt/controllers/edit_text_controller.py
rename to src/tagstudio/qt/controllers/edit_text.py
index 3e98003e..3fef8c69 100644
--- a/src/tagstudio/qt/controllers/edit_text_controller.py
+++ b/src/tagstudio/qt/controllers/edit_text.py
@@ -11,6 +11,7 @@ from tagstudio.qt.views.edit_text_view import EditTextView
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class EditText(EditTextView):
     def __init__(self, name: str, text: str | None, is_multiline: bool = False):
         super().__init__()
diff --git a/src/tagstudio/qt/controllers/field_suggest_box.py b/src/tagstudio/qt/controllers/field_suggest_box.py
index 797543d1..199de7f3 100644
--- a/src/tagstudio/qt/controllers/field_suggest_box.py
+++ b/src/tagstudio/qt/controllers/field_suggest_box.py
@@ -11,20 +11,20 @@ from PySide6.QtWidgets import QWidget
 
 from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.app_settings import AppSettings
 from tagstudio.qt.controllers.edit_field_template_modal import EditFieldTemplateModal
-from tagstudio.qt.controllers.field_template_widget_controller import FieldTemplateWidget
+from tagstudio.qt.controllers.field_template_widget import FieldTemplateWidget
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.controllers.suggest_box import SuggestBox
 from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
-from tagstudio.qt.global_settings import GlobalSettings
-from tagstudio.qt.translations import Translations
 
 logger = structlog.get_logger(__name__)
 
 
 class FieldSuggestBox(SuggestBox[BaseFieldTemplate]):
-    def __init__(self, library: Library, settings: GlobalSettings, placeholder_text: str = ""):
+    def __init__(self, library: Library, settings: AppSettings, placeholder_text: str = ""):
         super().__init__(library, settings, placeholder_text)
 
         # Context Menu Actions
diff --git a/src/tagstudio/qt/controllers/field_template_search_panel_controller.py b/src/tagstudio/qt/controllers/field_template_search_panel.py
similarity index 96%
rename from src/tagstudio/qt/controllers/field_template_search_panel_controller.py
rename to src/tagstudio/qt/controllers/field_template_search_panel.py
index dc57a68c..d131b3f4 100644
--- a/src/tagstudio/qt/controllers/field_template_search_panel_controller.py
+++ b/src/tagstudio/qt/controllers/field_template_search_panel.py
@@ -11,12 +11,12 @@ from PySide6.QtWidgets import QMessageBox, QWidget
 
 from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.edit_field_template_modal import EditFieldTemplateModal
-from tagstudio.qt.controllers.field_template_widget_controller import FieldTemplateWidget
+from tagstudio.qt.controllers.field_template_widget import FieldTemplateWidget
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.controllers.search_panel_controller import SearchPanel
-from tagstudio.qt.translations import Translations
+from tagstudio.qt.controllers.search_panel import SearchPanel
 from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
diff --git a/src/tagstudio/qt/controllers/field_template_widget_controller.py b/src/tagstudio/qt/controllers/field_template_widget.py
similarity index 93%
rename from src/tagstudio/qt/controllers/field_template_widget_controller.py
rename to src/tagstudio/qt/controllers/field_template_widget.py
index e23e9e66..a0592d5c 100644
--- a/src/tagstudio/qt/controllers/field_template_widget_controller.py
+++ b/src/tagstudio/qt/controllers/field_template_widget.py
@@ -7,10 +7,11 @@ from PySide6.QtCore import QEvent, Qt
 from PySide6.QtGui import QAction, QEnterEvent
 
 from tagstudio.core.library.alchemy.fields import BaseFieldTemplate
-from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
+from tagstudio.i18n.translations import FIELD_TYPE_KEYS, Translations
 from tagstudio.qt.views.field_template_widget_view import FieldTemplateWidgetView
 
 
+# TODO: Use newer MVC style guidelines
 class FieldTemplateWidget(FieldTemplateWidgetView):
     def __init__(self) -> None:
         super().__init__()
diff --git a/src/tagstudio/qt/controllers/file_opener_label.py b/src/tagstudio/qt/controllers/file_opener_label.py
new file mode 100644
index 00000000..dfc57cc9
--- /dev/null
+++ b/src/tagstudio/qt/controllers/file_opener_label.py
@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: (c) TagStudio Contributors
+# SPDX-License-Identifier: GPL-3.0-only
+
+
+from pathlib import Path
+from typing import override
+
+import structlog
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QMouseEvent
+from PySide6.QtWidgets import QLabel, QWidget
+
+from tagstudio.core.utils.types import unwrap
+from tagstudio.qt.utils.file_opener import FileOpenerHelper
+
+logger = structlog.get_logger(__name__)
+
+
+class FileOpenerLabel(QLabel):
+    def __init__(self, parent: QWidget | None = None) -> None:
+        """Initialize the FileOpenerLabel.
+
+        Args:
+            parent (QWidget, optional): The parent widget. Defaults to None.
+        """
+        self.filepath: Path | None = None
+
+        super().__init__(parent)
+
+    def set_file_path(self, filepath: Path) -> None:
+        """Set the filepath to open.
+
+        Args:
+            filepath (Path): The path to the file to open.
+        """
+        self.filepath = filepath
+
+    @override
+    def mousePressEvent(self, ev: QMouseEvent) -> None:
+        """Handle mouse press events.
+
+        On a left click, open the file in the default file explorer.
+        On a right click, show a context menu.
+
+        Args:
+            ev (QMouseEvent): The mouse press event.
+        """
+        if ev.button() == Qt.MouseButton.LeftButton:
+            opener = FileOpenerHelper(unwrap(self.filepath))
+            opener.open_explorer()
+        elif ev.button() == Qt.MouseButton.RightButton:
+            # Show context menu
+            pass
+        else:
+            super().mousePressEvent(ev)
diff --git a/src/tagstudio/qt/controllers/fix_ignored_modal_controller.py b/src/tagstudio/qt/controllers/fix_ignored_modal.py
similarity index 92%
rename from src/tagstudio/qt/controllers/fix_ignored_modal_controller.py
rename to src/tagstudio/qt/controllers/fix_ignored_modal.py
index cad8181c..341469e0 100644
--- a/src/tagstudio/qt/controllers/fix_ignored_modal_controller.py
+++ b/src/tagstudio/qt/controllers/fix_ignored_modal.py
@@ -9,19 +9,20 @@ from PySide6 import QtGui
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.registries.ignored_registry import IgnoredRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 from tagstudio.qt.mixed.remove_ignored_modal import RemoveIgnoredModal
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.fix_ignored_modal_view import FixIgnoredEntriesModalView
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class FixIgnoredEntriesModal(FixIgnoredEntriesModalView):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__(library, driver)
diff --git a/src/tagstudio/qt/controllers/ignore_modal_controller.py b/src/tagstudio/qt/controllers/ignore_modal.py
similarity index 97%
rename from src/tagstudio/qt/controllers/ignore_modal_controller.py
rename to src/tagstudio/qt/controllers/ignore_modal.py
index cbefd0ae..4e4e1142 100644
--- a/src/tagstudio/qt/controllers/ignore_modal_controller.py
+++ b/src/tagstudio/qt/controllers/ignore_modal.py
@@ -19,6 +19,7 @@ from tagstudio.qt.views.ignore_modal_view import IgnoreModalView
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class IgnoreModal(IgnoreModalView):
     on_edit = Signal(Tag)
 
diff --git a/src/tagstudio/qt/controllers/preview_panel_controller.py b/src/tagstudio/qt/controllers/inspector.py
similarity index 96%
rename from src/tagstudio/qt/controllers/preview_panel_controller.py
rename to src/tagstudio/qt/controllers/inspector.py
index 1d13baba..b20871be 100644
--- a/src/tagstudio/qt/controllers/preview_panel_controller.py
+++ b/src/tagstudio/qt/controllers/inspector.py
@@ -25,16 +25,16 @@ from tagstudio.core.library.alchemy.fields import (
 from tagstudio.core.library.alchemy.models import Entry
 from tagstudio.core.utils.ffmpeg_status import FfmpegStatus, FfprobeStatus
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.edit_text_controller import EditText
+from tagstudio.i18n.translations import FIELD_TYPE_KEYS, Translations
+from tagstudio.qt.controllers.edit_text import EditText
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.datetime_picker import DatetimePicker
 from tagstudio.qt.mixed.field_containers import FieldContainers
 from tagstudio.qt.mixed.file_attributes import FileAttributeData
-from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
-from tagstudio.qt.views.preview_panel_view import PreviewPanelView
+from tagstudio.qt.views.inspector_view import InspectorView
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
@@ -44,7 +44,7 @@ class _ItemMode(IntEnum):
     FIELD = 2
 
 
-class PreviewPanel(QWidget):
+class Inspector(QWidget):
     def __init__(self, driver: "QtDriver") -> None:
         super().__init__()
         self._driver = driver
@@ -68,7 +68,7 @@ class PreviewPanel(QWidget):
             self,
         )
 
-        self.setLayout(PreviewPanelView(driver=driver, pixel_ratio=self.devicePixelRatio()))
+        self.setLayout(InspectorView(driver=driver, pixel_ratio=self.devicePixelRatio()))
         self._set_item_mode(None)
         self._connect_callbacks()
 
@@ -276,7 +276,7 @@ class PreviewPanel(QWidget):
             logger.error("[Preview Panel] Error updating selection", error=e)
 
     def stop_media_playback(self) -> None:
-        """Stop any media playback in the preview panel."""
+        """Stop any media playback in the inspector."""
         self.layout().preview_thumb.media_player.stop()
 
     @property
@@ -284,5 +284,5 @@ class PreviewPanel(QWidget):
         return self.layout().containers
 
     @override
-    def layout(self) -> PreviewPanelView:
+    def layout(self) -> InspectorView:
         return super().layout()  # pyright: ignore[reportReturnType]
diff --git a/src/tagstudio/qt/controllers/library_info_window_controller.py b/src/tagstudio/qt/controllers/library_info_window.py
similarity index 96%
rename from src/tagstudio/qt/controllers/library_info_window_controller.py
rename to src/tagstudio/qt/controllers/library_info_window.py
index d0828dcb..9dddd034 100644
--- a/src/tagstudio/qt/controllers/library_info_window_controller.py
+++ b/src/tagstudio/qt/controllers/library_info_window.py
@@ -19,18 +19,19 @@ from tagstudio.core.library.alchemy.constants import (
 )
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.utils import file_opener
 from tagstudio.qt.views.library_info_window_view import LibraryInfoWindowView
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class LibraryInfoWindow(LibraryInfoWindowView):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__(library, driver)
diff --git a/src/tagstudio/qt/views/main_window.py b/src/tagstudio/qt/controllers/main_window.py
similarity index 97%
rename from src/tagstudio/qt/views/main_window.py
rename to src/tagstudio/qt/controllers/main_window.py
index 0a1082af..6bf6b9fb 100644
--- a/src/tagstudio/qt/views/main_window.py
+++ b/src/tagstudio/qt/controllers/main_window.py
@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: (c) TagStudio Contributors
 # SPDX-License-Identifier: GPL-3.0-only
 
+# TODO: Split view and logic, split classes into individual files
 
 import typing
 from collections.abc import Callable
@@ -37,20 +38,20 @@ from PySide6.QtWidgets import (
 
 from tagstudio.core.enums import ShowFilepathOption
 from tagstudio.core.library.alchemy.enums import SortingModeEnum
-from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
+from tagstudio.i18n.platform_strings import trash_term
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.inspector import Inspector
+from tagstudio.qt.helpers.mnemonics import assign_mnemonics
 from tagstudio.qt.mixed.landing import LandingWidget
 from tagstudio.qt.mixed.pagination import Pagination
-from tagstudio.qt.mnemonics import assign_mnemonics
-from tagstudio.qt.platform_strings import trash_term
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.thumb_grid_layout import ThumbGridLayout
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import checkbox_style
+from tagstudio.qt.views.layouts.thumb_grid_layout import ThumbGridLayout
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
+from tagstudio.qt.views.styles.stylesheets import checkbox_style
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
 logger = structlog.get_logger(__name__)
@@ -491,7 +492,7 @@ class MainWindow(QMainWindow):
         self.pagination: Pagination
 
         # initialized in setup_preview_panel
-        self.preview_panel: PreviewPanel
+        self.preview_panel: Inspector
         # endregion
 
         if not self.objectName():
@@ -700,7 +701,7 @@ class MainWindow(QMainWindow):
         self.content_splitter.addWidget(self.entry_list_container)
 
     def setup_preview_panel(self, driver: "QtDriver"):
-        self.preview_panel = PreviewPanel(driver)
+        self.preview_panel = Inspector(driver)
         self.content_splitter.addWidget(self.preview_panel)
 
     def setup_status_bar(self):
diff --git a/src/tagstudio/qt/mixed/merge_dupe_entries.py b/src/tagstudio/qt/controllers/merge_dupe_entries_progress.py
similarity index 78%
rename from src/tagstudio/qt/mixed/merge_dupe_entries.py
rename to src/tagstudio/qt/controllers/merge_dupe_entries_progress.py
index 0091bb3a..d7973379 100644
--- a/src/tagstudio/qt/mixed/merge_dupe_entries.py
+++ b/src/tagstudio/qt/controllers/merge_dupe_entries_progress.py
@@ -8,15 +8,14 @@ from PySide6.QtCore import QObject, Signal
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.registries.dupe_files_registry import DupeFilesRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
-class MergeDuplicateEntries(QObject):
+class MergeDuplicateEntriesProgress(QObject):
     done = Signal()
 
     def __init__(self, library: "Library", driver: "QtDriver"):
diff --git a/src/tagstudio/qt/controllers/preview_thumb_controller.py b/src/tagstudio/qt/controllers/preview_thumb.py
similarity index 97%
rename from src/tagstudio/qt/controllers/preview_thumb_controller.py
rename to src/tagstudio/qt/controllers/preview_thumb.py
index eccc80ec..d20723a2 100644
--- a/src/tagstudio/qt/controllers/preview_thumb_controller.py
+++ b/src/tagstudio/qt/controllers/preview_thumb.py
@@ -19,18 +19,19 @@ from rawpy import (
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.media_types import MediaCategories
-from tagstudio.qt.helpers.file_tester import is_readable_video
+from tagstudio.previews.video_tester import is_readable_video
 from tagstudio.qt.mixed.file_attributes import FileAttributeData
 from tagstudio.qt.utils.file_opener import open_file
 from tagstudio.qt.views.preview_thumb_view import PreviewThumbView
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 Image.MAX_IMAGE_PIXELS = None
 
 
+# TODO: Use newer MVC style guidelines
 class PreviewThumb(PreviewThumbView):
     def __init__(self, library: Library, driver: "QtDriver"):
         super().__init__(library, driver)
diff --git a/src/tagstudio/qt/mixed/progress_bar.py b/src/tagstudio/qt/controllers/progress_bar.py
similarity index 98%
rename from src/tagstudio/qt/mixed/progress_bar.py
rename to src/tagstudio/qt/controllers/progress_bar.py
index c7bd1fe9..98b5fc7b 100644
--- a/src/tagstudio/qt/mixed/progress_bar.py
+++ b/src/tagstudio/qt/controllers/progress_bar.py
@@ -11,6 +11,7 @@ from tagstudio.qt.utils.custom_runnable import CustomRunnable
 from tagstudio.qt.utils.function_iterator import FunctionIterator
 
 
+# TODO: Split to use MVC guidelines.
 class ProgressWidget(QWidget):
     """Prebuilt thread-safe progress bar widget."""
 
diff --git a/src/tagstudio/qt/mixed/relink_entries_modal.py b/src/tagstudio/qt/controllers/relink_entries_progress.py
similarity index 86%
rename from src/tagstudio/qt/mixed/relink_entries_modal.py
rename to src/tagstudio/qt/controllers/relink_entries_progress.py
index 8acd7c1b..9aae5056 100644
--- a/src/tagstudio/qt/mixed/relink_entries_modal.py
+++ b/src/tagstudio/qt/controllers/relink_entries_progress.py
@@ -5,11 +5,11 @@
 from PySide6.QtCore import QObject, Signal
 
 from tagstudio.core.library.alchemy.registries.unlinked_registry import UnlinkedRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 
 
-class RelinkUnlinkedEntries(QObject):
+class RelinkUnlinkedEntriesProgress(QObject):
     done = Signal()
 
     def __init__(self, tracker: UnlinkedRegistry):
diff --git a/src/tagstudio/qt/controllers/search_panel_controller.py b/src/tagstudio/qt/controllers/search_panel.py
similarity index 99%
rename from src/tagstudio/qt/controllers/search_panel_controller.py
rename to src/tagstudio/qt/controllers/search_panel.py
index 09f82e97..9518ac1e 100644
--- a/src/tagstudio/qt/controllers/search_panel_controller.py
+++ b/src/tagstudio/qt/controllers/search_panel.py
@@ -11,15 +11,15 @@ from PySide6.QtGui import QShowEvent
 from PySide6.QtWidgets import QWidget
 
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
 def _item_id(item: object) -> int:
diff --git a/src/tagstudio/qt/views/splash.py b/src/tagstudio/qt/controllers/splash.py
similarity index 98%
rename from src/tagstudio/qt/views/splash.py
rename to src/tagstudio/qt/controllers/splash.py
index d6dcb637..143db711 100644
--- a/src/tagstudio/qt/views/splash.py
+++ b/src/tagstudio/qt/controllers/splash.py
@@ -11,13 +11,14 @@ from PySide6.QtGui import QColor, QFont, QPainter, QPen, QPixmap
 from PySide6.QtWidgets import QSplashScreen, QWidget
 
 from tagstudio.core.constants import BUILD_TYPE, COPYRIGHT, COPYRIGHT_COMPACT, VERSION
-from tagstudio.qt.global_settings import Splash
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.app_settings import Splash
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split view and logic.
 class SplashScreen:
     """The custom splash screen widget for TagStudio."""
 
diff --git a/src/tagstudio/qt/controllers/suggest_box.py b/src/tagstudio/qt/controllers/suggest_box.py
index 21a1a377..b8c33160 100644
--- a/src/tagstudio/qt/controllers/suggest_box.py
+++ b/src/tagstudio/qt/controllers/suggest_box.py
@@ -11,14 +11,14 @@ from PySide6.QtGui import QAction, QPixmap, QShowEvent, Qt
 from PySide6.QtWidgets import QGraphicsOpacityEffect, QWidget
 
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.app_settings import AppSettings
 from tagstudio.qt.controllers.autofill_line_edit import QtCore, QtGui
 from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
-from tagstudio.qt.global_settings import GlobalSettings
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
+from tagstudio.qt.views.styles.stylesheets import (
     autofill_line_edit_style,
     autofill_line_edit_top_style,
 )
@@ -49,9 +49,7 @@ class SuggestBox[T](QWidget):
     item_chosen = Signal(object)
     done = Signal(str)  # Query
 
-    def __init__(
-        self, library: Library, settings: GlobalSettings, placeholder_text: str = ""
-    ) -> None:
+    def __init__(self, library: Library, settings: AppSettings, placeholder_text: str = "") -> None:
         super().__init__()
         self._lib = library
         self._settings = settings
diff --git a/src/tagstudio/qt/controllers/tag_box_controller.py b/src/tagstudio/qt/controllers/tag_box.py
similarity index 97%
rename from src/tagstudio/qt/controllers/tag_box_controller.py
rename to src/tagstudio/qt/controllers/tag_box.py
index 42e52232..a6bdcbd8 100644
--- a/src/tagstudio/qt/controllers/tag_box_controller.py
+++ b/src/tagstudio/qt/controllers/tag_box.py
@@ -17,11 +17,12 @@ from tagstudio.qt.mixed.build_tag import BuildTagPanel
 from tagstudio.qt.views.tag_box_view import TagBoxWidgetView
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class TagBoxWidget(TagBoxWidgetView):
     on_update = Signal()
 
diff --git a/src/tagstudio/qt/controllers/tag_search_panel_controller.py b/src/tagstudio/qt/controllers/tag_search_panel.py
similarity index 98%
rename from src/tagstudio/qt/controllers/tag_search_panel_controller.py
rename to src/tagstudio/qt/controllers/tag_search_panel.py
index ed2f248c..1f469fa8 100644
--- a/src/tagstudio/qt/controllers/tag_search_panel_controller.py
+++ b/src/tagstudio/qt/controllers/tag_search_panel.py
@@ -12,11 +12,11 @@ from PySide6.QtWidgets import QMessageBox, QWidget
 from tagstudio.core.constants import RESERVED_TAG_END, RESERVED_TAG_START
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.controllers.search_panel_controller import SearchPanel
+from tagstudio.qt.controllers.search_panel import SearchPanel
 from tagstudio.qt.mixed.tag_widget import TagWidget
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.search_panel_view import SearchPanelView
 
 logger = structlog.get_logger(__name__)
diff --git a/src/tagstudio/qt/controllers/tag_suggest_box.py b/src/tagstudio/qt/controllers/tag_suggest_box.py
index 28683798..d7735ba7 100644
--- a/src/tagstudio/qt/controllers/tag_suggest_box.py
+++ b/src/tagstudio/qt/controllers/tag_suggest_box.py
@@ -12,14 +12,14 @@ from PySide6.QtWidgets import QGraphicsOpacityEffect, QWidget
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.app_settings import AppSettings
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.controllers.suggest_box import SuggestBox
 from tagstudio.qt.controllers.underlined_widget import UnderlinedWidget
-from tagstudio.qt.global_settings import GlobalSettings
 from tagstudio.qt.mixed.build_tag import BuildTagPanel
 from tagstudio.qt.mixed.tag_widget import TagWidget
-from tagstudio.qt.translations import Translations
 
 logger = structlog.get_logger(__name__)
 
@@ -27,9 +27,7 @@ logger = structlog.get_logger(__name__)
 class TagSuggestBox(SuggestBox[Tag]):
     search_for_tag = Signal(int)
 
-    def __init__(
-        self, library: Library, settings: GlobalSettings, placeholder_text: str = ""
-    ) -> None:
+    def __init__(self, library: Library, settings: AppSettings, placeholder_text: str = "") -> None:
         super().__init__(library, settings, placeholder_text)
 
         # Context Menu Actions
diff --git a/src/tagstudio/qt/controllers/underlined_widget.py b/src/tagstudio/qt/controllers/underlined_widget.py
index fe86de6d..8c041f3b 100644
--- a/src/tagstudio/qt/controllers/underlined_widget.py
+++ b/src/tagstudio/qt/controllers/underlined_widget.py
@@ -10,6 +10,8 @@ from tagstudio.qt.views.underlined_widget_view import UnderlinedWidgetView
 
 
 class UnderlinedWidget(QWidget):
+    """A container for a widget and an underline indicator."""
+
     def __init__(self, widget: QWidget) -> None:
         super().__init__()
         self.setLayout(UnderlinedWidgetView(widget))
diff --git a/src/tagstudio/qt/controllers/update_available_message_box.py b/src/tagstudio/qt/controllers/update_available_message_box.py
index a9415673..97362438 100644
--- a/src/tagstudio/qt/controllers/update_available_message_box.py
+++ b/src/tagstudio/qt/controllers/update_available_message_box.py
@@ -14,15 +14,16 @@ from PySide6.QtWidgets import QMessageBox
 from tagstudio.core.constants import GITHUB_RELEASE_URL, VERSION
 from tagstudio.core.ts_core import TagStudioCore
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.models.palette import ColorType, UiColor, get_ui_color
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
+from tagstudio.qt.views.styles.palette import ColorType, UiColor, get_ui_color
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split view into UpdateAvailableMessageBoxView
 class UpdateAvailableMessageBox(QMessageBox):
-    """A warning dialog for if the TagStudio is not running under the latest release version."""
+    """A message box notifying the user if there is a new version of TagStudio available."""
 
     def __init__(self):
         super().__init__()
diff --git a/src/tagstudio/qt/mnemonics.py b/src/tagstudio/qt/helpers/mnemonics.py
similarity index 97%
rename from src/tagstudio/qt/mnemonics.py
rename to src/tagstudio/qt/helpers/mnemonics.py
index 359e7f44..9599373f 100644
--- a/src/tagstudio/qt/mnemonics.py
+++ b/src/tagstudio/qt/helpers/mnemonics.py
@@ -35,7 +35,7 @@ def get_wanted_mnemonics(text: str) -> list[str]:
     return matches
 
 
-def sanitise_mnemonics(actions: list[QAction]) -> None:
+def sanitize_mnemonics(actions: list[QAction]) -> None:
     previous = []
     for action in actions:
         text = action.text()
@@ -127,8 +127,8 @@ def assign_mnemonics(menu: QMenu):
     # Collect actions
     actions = [a for a in menu.actions() if not a.isSeparator()]
 
-    # sanitise mnemonics to prevent deadlocks
-    sanitise_mnemonics(actions)
+    # sanitize mnemonics to prevent deadlocks
+    sanitize_mnemonics(actions)
 
     # Sequence map: mnemonic key -> QAction
     sequence_to_action: dict[str, QAction] = {}
diff --git a/src/tagstudio/qt/mixed/about_modal.py b/src/tagstudio/qt/mixed/about_modal.py
index 4284f559..064c3b0d 100644
--- a/src/tagstudio/qt/mixed/about_modal.py
+++ b/src/tagstudio/qt/mixed/about_modal.py
@@ -32,14 +32,15 @@ from tagstudio.core.utils.ffmpeg_status import FfmpegStatus, FfprobeStatus
 from tagstudio.core.utils.ripgrep_status import RipgrepStatus
 from tagstudio.core.utils.str_formatting import is_version_outdated
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.clickable_label import ClickableLabel
-from tagstudio.qt.models.palette import ColorType, UiColor, get_ui_color
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.utils.file_opener import open_file
-from tagstudio.qt.views.stylesheets.stylesheets import form_content_style, header
+from tagstudio.qt.views.styles.palette import ColorType, UiColor, get_ui_color
+from tagstudio.qt.views.styles.stylesheets import form_content_style, header
 
 
+# TODO: Split to use MVC guidelines.
 class AboutModal(QWidget):
     """Modal window showing information about the TagStudio application."""
 
diff --git a/src/tagstudio/qt/mixed/build_color.py b/src/tagstudio/qt/mixed/build_color.py
index b8590dfd..abfc0960 100644
--- a/src/tagstudio/qt/mixed/build_color.py
+++ b/src/tagstudio/qt/mixed/build_color.py
@@ -24,11 +24,11 @@ from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.library import Library, slugify
 from tagstudio.core.library.alchemy.models import TagColorGroup
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
 from tagstudio.qt.mixed.tag_color_preview import TagColorPreview
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import (
     checkbox_style,
     line_edit_style,
     list_button_style,
@@ -37,6 +37,7 @@ from tagstudio.qt.views.stylesheets.stylesheets import (
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class BuildColorPanel(ModalContent):
     on_edit = Signal(TagColorGroup)
 
diff --git a/src/tagstudio/qt/mixed/build_namespace.py b/src/tagstudio/qt/mixed/build_namespace.py
index 0fc8bc9d..f2098016 100644
--- a/src/tagstudio/qt/mixed/build_namespace.py
+++ b/src/tagstudio/qt/mixed/build_namespace.py
@@ -13,13 +13,14 @@ from PySide6.QtWidgets import QLabel, QLineEdit, QVBoxLayout, QWidget
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.library.alchemy.library import Library, ReservedNamespaceError, slugify
 from tagstudio.core.library.alchemy.models import Namespace
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import line_edit_style
+from tagstudio.qt.views.styles.stylesheets import line_edit_style
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class BuildNamespacePanel(ModalContent):
     on_edit = Signal(Namespace)
 
diff --git a/src/tagstudio/qt/mixed/build_tag.py b/src/tagstudio/qt/mixed/build_tag.py
index 7ffba392..3ce3e111 100644
--- a/src/tagstudio/qt/mixed/build_tag.py
+++ b/src/tagstudio/qt/mixed/build_tag.py
@@ -29,15 +29,15 @@ from PySide6.QtWidgets import (
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag, TagAlias, TagColorGroup
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchPanel
+from tagstudio.qt.controllers.tag_search_panel import TagSearchPanel
 from tagstudio.qt.mixed.tag_color_preview import TagColorPreview
 from tagstudio.qt.mixed.tag_color_selection import TagColorSelection
 from tagstudio.qt.mixed.tag_widget import TagWidget
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.search_panel_view import SearchPanelView
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.stylesheets import (
     checkbox_style,
     colored_checkbox_style,
     colored_radio_button_style,
@@ -77,6 +77,7 @@ class CustomTableItem(QLineEdit):
             super().keyPressEvent(arg__1)
 
 
+# TODO: Split to use MVC guidelines.
 class BuildTagPanel(ModalContent):
     on_edit = Signal(Tag)
 
diff --git a/src/tagstudio/qt/mixed/color_box.py b/src/tagstudio/qt/mixed/color_box.py
index ffa427d4..39a0577d 100644
--- a/src/tagstudio/qt/mixed/color_box.py
+++ b/src/tagstudio/qt/mixed/color_box.py
@@ -12,13 +12,13 @@ from PySide6.QtWidgets import QMessageBox, QPushButton
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.library.alchemy.models import TagColorGroup
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.build_color import BuildColorPanel
 from tagstudio.qt.mixed.field_widget import FieldWidget
 from tagstudio.qt.mixed.tag_color_label import TagColorLabel
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
-from tagstudio.qt.views.stylesheets.stylesheets import add_button_style
+from tagstudio.qt.views.styles.stylesheets import add_button_style
 
 if typing.TYPE_CHECKING:
     from tagstudio.core.library.alchemy.library import Library
@@ -26,6 +26,7 @@ if typing.TYPE_CHECKING:
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class ColorBoxWidget(FieldWidget):
     updated = Signal()
 
diff --git a/src/tagstudio/qt/mixed/datetime_picker.py b/src/tagstudio/qt/mixed/datetime_picker.py
index aa2a7a4e..cca8e91f 100644
--- a/src/tagstudio/qt/mixed/datetime_picker.py
+++ b/src/tagstudio/qt/mixed/datetime_picker.py
@@ -10,10 +10,10 @@ from PySide6.QtCore import QDateTime
 from PySide6.QtWidgets import QDateTimeEdit, QLineEdit, QVBoxLayout
 
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.views.stylesheets.stylesheets import title_line_edit_style
+from tagstudio.qt.views.styles.stylesheets import title_line_edit_style
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
 
@@ -39,6 +39,7 @@ def qdtf2dtf(dtf: str) -> str:
     return out
 
 
+# TODO: Split to use MVC guidelines.
 class DatetimePicker(ModalContent):
     def __init__(self, driver: "QtDriver", name: str, datetime: dt | str):
         super().__init__()
diff --git a/src/tagstudio/qt/mixed/drop_import_modal.py b/src/tagstudio/qt/mixed/drop_import_modal.py
index 415302bb..df2da028 100644
--- a/src/tagstudio/qt/mixed/drop_import_modal.py
+++ b/src/tagstudio/qt/mixed/drop_import_modal.py
@@ -11,21 +11,14 @@ import structlog
 from PySide6 import QtCore, QtGui
 from PySide6.QtCore import Qt, QUrl
 from PySide6.QtGui import QStandardItem, QStandardItemModel
-from PySide6.QtWidgets import (
-    QHBoxLayout,
-    QLabel,
-    QListView,
-    QPushButton,
-    QVBoxLayout,
-    QWidget,
-)
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QListView, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
@@ -37,6 +30,7 @@ class DuplicateChoice(enum.StrEnum):
     CANCEL = "Cancelled"
 
 
+# TODO: Split to use MVC guidelines.
 class DropImportModal(QWidget):
     DUPE_NAME_LIMT: int = 5
 
diff --git a/src/tagstudio/qt/mixed/field_containers.py b/src/tagstudio/qt/mixed/field_containers.py
index 8e8fd01d..2997731c 100644
--- a/src/tagstudio/qt/mixed/field_containers.py
+++ b/src/tagstudio/qt/mixed/field_containers.py
@@ -29,21 +29,22 @@ from tagstudio.core.library.alchemy.fields import (
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry, Tag
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.edit_text_controller import EditText
+from tagstudio.i18n.translations import FIELD_TYPE_KEYS, Translations
+from tagstudio.qt.controllers.edit_text import EditText
 from tagstudio.qt.controllers.modal import Modal
-from tagstudio.qt.controllers.tag_box_controller import TagBoxWidget
+from tagstudio.qt.controllers.tag_box import TagBoxWidget
 from tagstudio.qt.mixed.datetime_picker import DatetimePicker
 from tagstudio.qt.mixed.field_widget import FieldContainer
 from tagstudio.qt.mixed.text_field import TextContainerWidget
-from tagstudio.qt.translations import FIELD_TYPE_KEYS, Translations
-from tagstudio.qt.views.stylesheets.stylesheets import inset_container_style
+from tagstudio.qt.views.styles.stylesheets import inset_container_style
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class FieldContainers(QWidget):
     """Widget for the tag and field containers displayed inside the Preview Panel."""
 
diff --git a/src/tagstudio/qt/mixed/field_widget.py b/src/tagstudio/qt/mixed/field_widget.py
index 7108f7ae..914ab7f6 100644
--- a/src/tagstudio/qt/mixed/field_widget.py
+++ b/src/tagstudio/qt/mixed/field_widget.py
@@ -12,13 +12,14 @@ from PySide6.QtCore import QEvent, QSize, Qt
 from PySide6.QtGui import QEnterEvent, QPixmap, QResizeEvent
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
 
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.views.stylesheets.stylesheets import container_style, header
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
+from tagstudio.qt.views.styles.stylesheets import container_style, header
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class FieldContainer(QWidget):
     rm: ResourceManager = ResourceManager()
     copy_icon = auto_theme_overlay(rm.copy, inverse=True)
diff --git a/src/tagstudio/qt/mixed/file_attributes.py b/src/tagstudio/qt/mixed/file_attributes.py
index b4737e4d..9409bb66 100644
--- a/src/tagstudio/qt/mixed/file_attributes.py
+++ b/src/tagstudio/qt/mixed/file_attributes.py
@@ -21,13 +21,14 @@ from tagstudio.core.library.ignore import Ignore
 from tagstudio.core.media_types import MediaCategories
 from tagstudio.core.utils.str_formatting import format_duration
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.models.palette import ColorType, UiColor, get_ui_color
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.utils.file_opener import FileOpenerHelper, FileOpenerLabel
-from tagstudio.qt.views.stylesheets.stylesheets import properties_style
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.file_opener_label import FileOpenerLabel
+from tagstudio.qt.utils.file_opener import FileOpenerHelper
+from tagstudio.qt.views.styles.palette import ColorType, UiColor, get_ui_color
+from tagstudio.qt.views.styles.stylesheets import properties_style
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
@@ -39,9 +40,8 @@ class FileAttributeData:
     duration: int | None = None
 
 
+# TODO: Split to use MVC guidelines.
 class FileAttributes(QWidget):
-    """The Preview Panel Widget."""
-
     def __init__(self, library: Library, driver: "QtDriver"):
         super().__init__()
         root_layout = QVBoxLayout(self)
diff --git a/src/tagstudio/qt/mixed/fix_dupe_files.py b/src/tagstudio/qt/mixed/fix_dupe_files.py
index 9b102dfa..cc275c44 100644
--- a/src/tagstudio/qt/mixed/fix_dupe_files.py
+++ b/src/tagstudio/qt/mixed/fix_dupe_files.py
@@ -17,16 +17,16 @@ from PySide6.QtWidgets import (
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.registries.dupe_files_registry import DupeFilesRegistry
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.mixed.mirror_entries_modal import MirrorEntriesModal
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
-# TODO: Break up into MVC classes, similar to fix_ignored_modal
+# TODO: Split to use MVC guidelines.
 class FixDupeFilesModal(QWidget):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
diff --git a/src/tagstudio/qt/mixed/fix_unlinked.py b/src/tagstudio/qt/mixed/fix_unlinked.py
index f96bf2d0..56237134 100644
--- a/src/tagstudio/qt/mixed/fix_unlinked.py
+++ b/src/tagstudio/qt/mixed/fix_unlinked.py
@@ -10,19 +10,19 @@ from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWi
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.registries.unlinked_registry import UnlinkedRegistry
-from tagstudio.qt.mixed.merge_dupe_entries import MergeDuplicateEntries
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.mixed.relink_entries_modal import RelinkUnlinkedEntries
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.merge_dupe_entries_progress import MergeDuplicateEntriesProgress
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
+from tagstudio.qt.controllers.relink_entries_progress import RelinkUnlinkedEntriesProgress
 from tagstudio.qt.mixed.remove_unlinked_modal import RemoveUnlinkedEntriesModal
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
-# TODO: Break up into MVC classes, similar to fix_ignored_modal
+# TODO: Split to use MVC guidelines.
 class FixUnlinkedEntriesModal(QWidget):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
@@ -55,8 +55,8 @@ class FixUnlinkedEntriesModal(QWidget):
         self.refresh_unlinked_button = QPushButton(Translations["entries.generic.refresh_alt"])
         self.refresh_unlinked_button.clicked.connect(self.refresh_unlinked)
 
-        self.merge_class = MergeDuplicateEntries(self.lib, self.driver)
-        self.relink_class = RelinkUnlinkedEntries(self.tracker)
+        self.merge_class = MergeDuplicateEntriesProgress(self.lib, self.driver)
+        self.relink_class = RelinkUnlinkedEntriesProgress(self.tracker)
 
         self.search_button = QPushButton(Translations["entries.unlinked.search_and_relink"])
         self.relink_class.done.connect(
diff --git a/src/tagstudio/qt/mixed/folders_to_tags.py b/src/tagstudio/qt/mixed/folders_to_tags.py
index 0f9742e2..45908b0b 100644
--- a/src/tagstudio/qt/mixed/folders_to_tags.py
+++ b/src/tagstudio/qt/mixed/folders_to_tags.py
@@ -26,13 +26,13 @@ from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import header
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/qt/mixed/item_thumb.py b/src/tagstudio/qt/mixed/item_thumb.py
index 42e43b37..6ebf8707 100644
--- a/src/tagstudio/qt/mixed/item_thumb.py
+++ b/src/tagstudio/qt/mixed/item_thumb.py
@@ -17,15 +17,15 @@ from tagstudio.core.library.alchemy.enums import ItemType
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.media_types import MediaCategories, MediaType
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.platform_strings import open_file_str, trash_term
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.platform_strings import open_file_str, trash_term
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.utils.file_opener import FileOpenerHelper
 from tagstudio.qt.views.layouts.flow_layout import FlowWidget
 from tagstudio.qt.views.thumb_button import ThumbButton
 
 if TYPE_CHECKING:
     from tagstudio.core.library.alchemy.models import Entry
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
@@ -60,6 +60,7 @@ def badge_update_lock(func):
     return wrapper
 
 
+# TODO: Split to use MVC guidelines.
 class ItemThumb(FlowWidget):
     """The thumbnail widget for a library item (Entry, Entry Group, etc.)."""
 
diff --git a/src/tagstudio/qt/mixed/landing.py b/src/tagstudio/qt/mixed/landing.py
index d07678a4..a738ac0f 100644
--- a/src/tagstudio/qt/mixed/landing.py
+++ b/src/tagstudio/qt/mixed/landing.py
@@ -11,18 +11,19 @@ from PySide6.QtCore import QEasingCurve, QPoint, QPropertyAnimation, Qt
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import QLabel, QPushButton, QVBoxLayout, QWidget
 
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.clickable_label import ClickableLabel
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class LandingWidget(QWidget):
     rm: ResourceManager = ResourceManager()
     mono_logo: Image.Image = rm.ts_logo_text_mono
diff --git a/src/tagstudio/qt/mixed/media_player.py b/src/tagstudio/qt/mixed/media_player.py
index 46e2c07b..7de45359 100644
--- a/src/tagstudio/qt/mixed/media_player.py
+++ b/src/tagstudio/qt/mixed/media_player.py
@@ -36,16 +36,17 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from tagstudio.qt.helpers.color_overlay import light_overlay
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.clickable_slider import ClickableSlider
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.clickable_slider import ClickableSlider
+from tagstudio.qt.views.styles.color_overlay import light_overlay
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class MediaPlayer(QGraphicsView):
     """A basic media player widget.
 
diff --git a/src/tagstudio/qt/mixed/migration_modal.py b/src/tagstudio/qt/mixed/migration_modal.py
index def95daf..65457e10 100644
--- a/src/tagstudio/qt/mixed/migration_modal.py
+++ b/src/tagstudio/qt/mixed/migration_modal.py
@@ -23,6 +23,7 @@ from PySide6.QtWidgets import (
 )
 from sqlalchemy import select
 from sqlalchemy.orm import Session
+from typing_extensions import deprecated
 
 from tagstudio.core.constants import (
     IGNORE_NAME,
@@ -42,17 +43,18 @@ from tagstudio.core.library.ignore import PATH_GLOB_FLAGS, Ignore, ignore_to_glo
 from tagstudio.core.library.json.library import Library as JsonLibrary
 from tagstudio.core.library.json.library import Tag as JsonTag
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.paged_panel_controller import PagedPanel
-from tagstudio.qt.controllers.paged_panel_state import PagedPanelState
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.mixed.paged_body_wrapper import PagedBodyWrapper
+from tagstudio.qt.mixed.paged_panel import PagedPanel
+from tagstudio.qt.mixed.paged_panel_state import PagedPanelState
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 from tagstudio.qt.utils.function_iterator import FunctionIterator
-from tagstudio.qt.views.paged_body_wrapper import PagedBodyWrapper
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 logger = structlog.get_logger(__name__)
 
 
+@deprecated("This modal will be removed when legacy JSON library support is dropped.")
 class JsonMigrationModal(QObject):
     """A modal for data migration from v9.4 JSON to v9.5+ SQLite."""
 
diff --git a/src/tagstudio/qt/mixed/mirror_entries_modal.py b/src/tagstudio/qt/mixed/mirror_entries_modal.py
index 07714088..66b964ce 100644
--- a/src/tagstudio/qt/mixed/mirror_entries_modal.py
+++ b/src/tagstudio/qt/mixed/mirror_entries_modal.py
@@ -10,14 +10,15 @@ from PySide6.QtGui import QStandardItem, QStandardItemModel
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QListView, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.registries.dupe_files_registry import DupeFilesRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Split to use MVC guidelines.
 class MirrorEntriesModal(QWidget):
     done = Signal()
 
diff --git a/src/tagstudio/qt/views/paged_body_wrapper.py b/src/tagstudio/qt/mixed/paged_body_wrapper.py
similarity index 90%
rename from src/tagstudio/qt/views/paged_body_wrapper.py
rename to src/tagstudio/qt/mixed/paged_body_wrapper.py
index a6380d54..d25495eb 100644
--- a/src/tagstudio/qt/views/paged_body_wrapper.py
+++ b/src/tagstudio/qt/mixed/paged_body_wrapper.py
@@ -7,8 +7,6 @@ from PySide6.QtWidgets import QVBoxLayout, QWidget
 
 
 class PagedBodyWrapper(QWidget):
-    """A state object for paged panels."""
-
     def __init__(self):
         super().__init__()
         layout: QVBoxLayout = QVBoxLayout(self)
diff --git a/src/tagstudio/qt/controllers/paged_panel_controller.py b/src/tagstudio/qt/mixed/paged_panel.py
similarity index 95%
rename from src/tagstudio/qt/controllers/paged_panel_controller.py
rename to src/tagstudio/qt/mixed/paged_panel.py
index 53cc146f..8c55cb62 100644
--- a/src/tagstudio/qt/controllers/paged_panel_controller.py
+++ b/src/tagstudio/qt/mixed/paged_panel.py
@@ -9,12 +9,13 @@ from PySide6 import QtCore, QtGui
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
 
-from tagstudio.qt.controllers.paged_panel_state import PagedPanelState
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.mixed.paged_panel_state import PagedPanelState
+from tagstudio.qt.views.styles.stylesheets import header
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines, or remove the Paged[...] classes.
 class PagedPanel(QWidget):
     """A paginated modal panel."""
 
diff --git a/src/tagstudio/qt/controllers/paged_panel_state.py b/src/tagstudio/qt/mixed/paged_panel_state.py
similarity index 91%
rename from src/tagstudio/qt/controllers/paged_panel_state.py
rename to src/tagstudio/qt/mixed/paged_panel_state.py
index a239ca76..ab62c1c5 100644
--- a/src/tagstudio/qt/controllers/paged_panel_state.py
+++ b/src/tagstudio/qt/mixed/paged_panel_state.py
@@ -4,7 +4,7 @@
 
 from PySide6.QtWidgets import QPushButton
 
-from tagstudio.qt.views.paged_body_wrapper import PagedBodyWrapper
+from tagstudio.qt.mixed.paged_body_wrapper import PagedBodyWrapper
 
 
 class PagedPanelState:
diff --git a/src/tagstudio/qt/mixed/pagination.py b/src/tagstudio/qt/mixed/pagination.py
index 5a58058b..b10be79d 100644
--- a/src/tagstudio/qt/mixed/pagination.py
+++ b/src/tagstudio/qt/mixed/pagination.py
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 
-"""A pagination widget created for TagStudio."""
-
 from typing import cast, override
 from warnings import catch_warnings
 
@@ -12,10 +10,11 @@ from PySide6.QtCore import QSize, Signal
 from PySide6.QtGui import QIntValidator, QPixmap
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QLineEdit, QPushButton, QSizePolicy, QWidget
 
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
 from tagstudio.qt.resource_manager import ResourceManager
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
 
 
+# TODO: Split to use MVC guidelines.
 class Pagination(QWidget):
     """Widget containing controls for navigating between pages of items."""
 
diff --git a/src/tagstudio/qt/mixed/remove_ignored_modal.py b/src/tagstudio/qt/mixed/remove_ignored_modal.py
index 5977009e..0870770e 100644
--- a/src/tagstudio/qt/mixed/remove_ignored_modal.py
+++ b/src/tagstudio/qt/mixed/remove_ignored_modal.py
@@ -7,25 +7,18 @@ from typing import TYPE_CHECKING, override
 from PySide6 import QtCore, QtGui
 from PySide6.QtCore import Qt, QThreadPool, Signal
 from PySide6.QtGui import QStandardItem, QStandardItemModel
-from PySide6.QtWidgets import (
-    QHBoxLayout,
-    QLabel,
-    QListView,
-    QPushButton,
-    QVBoxLayout,
-    QWidget,
-)
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QListView, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.registries.ignored_registry import IgnoredRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Split to use MVC guidelines.
 class RemoveIgnoredModal(QWidget):
     done = Signal()
 
diff --git a/src/tagstudio/qt/mixed/remove_unlinked_modal.py b/src/tagstudio/qt/mixed/remove_unlinked_modal.py
index 0b4e6b6b..ff6bbcf1 100644
--- a/src/tagstudio/qt/mixed/remove_unlinked_modal.py
+++ b/src/tagstudio/qt/mixed/remove_unlinked_modal.py
@@ -7,25 +7,18 @@ from typing import TYPE_CHECKING, override
 from PySide6 import QtCore, QtGui
 from PySide6.QtCore import Qt, QThreadPool, Signal
 from PySide6.QtGui import QStandardItem, QStandardItemModel
-from PySide6.QtWidgets import (
-    QHBoxLayout,
-    QLabel,
-    QListView,
-    QPushButton,
-    QVBoxLayout,
-    QWidget,
-)
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QListView, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.registries.unlinked_registry import UnlinkedRegistry
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Split to use MVC guidelines.
 class RemoveUnlinkedEntriesModal(QWidget):
     done = Signal()
 
diff --git a/src/tagstudio/qt/mixed/settings_panel.py b/src/tagstudio/qt/mixed/settings_panel.py
index 2304ba23..3a104398 100644
--- a/src/tagstudio/qt/mixed/settings_panel.py
+++ b/src/tagstudio/qt/mixed/settings_panel.py
@@ -20,9 +20,8 @@ from PySide6.QtWidgets import (
 )
 
 from tagstudio.core.enums import ShowFilepathOption, TagClickActionOption
-from tagstudio.qt.controllers.modal import Modal
-from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.global_settings import (
+from tagstudio.i18n.translations import DEFAULT_TRANSLATION, LANGUAGES, Translations
+from tagstudio.qt.app_settings import (
     DEFAULT_CACHED_THUMB_RES,
     DEFAULT_THUMB_CACHE_SIZE,
     MAX_CACHED_THUMB_RES,
@@ -31,14 +30,16 @@ from tagstudio.qt.global_settings import (
     Splash,
     Theme,
 )
-from tagstudio.qt.translations import DEFAULT_TRANSLATION, LANGUAGES, Translations
+from tagstudio.qt.controllers.modal import Modal
+from tagstudio.qt.controllers.modal_content import ModalContent
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class SettingsPanel(ModalContent):
     driver: "QtDriver"
 
diff --git a/src/tagstudio/qt/mixed/tag_color_label.py b/src/tagstudio/qt/mixed/tag_color_label.py
index 90d797b7..bcbea886 100644
--- a/src/tagstudio/qt/mixed/tag_color_label.py
+++ b/src/tagstudio/qt/mixed/tag_color_label.py
@@ -10,9 +10,9 @@ from PySide6.QtGui import QAction, QColor, QEnterEvent
 from PySide6.QtWidgets import QHBoxLayout, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.models import TagColorGroup
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.helpers.escape_text import escape_text
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.stylesheets import (
     get_tag_border_color,
     get_tag_highlight_color,
     get_tag_text_color,
@@ -22,11 +22,11 @@ from tagstudio.qt.views.stylesheets.stylesheets import (
 
 logger = structlog.get_logger(__name__)
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
 if typing.TYPE_CHECKING:
     from tagstudio.core.library.alchemy.library import Library
 
 
+# TODO: Split to use MVC guidelines.
 class TagColorLabel(QWidget):
     """A widget for displaying a tag color's name.
 
diff --git a/src/tagstudio/qt/mixed/tag_color_manager.py b/src/tagstudio/qt/mixed/tag_color_manager.py
index 36794ce7..12df1b4f 100644
--- a/src/tagstudio/qt/mixed/tag_color_manager.py
+++ b/src/tagstudio/qt/mixed/tag_color_manager.py
@@ -23,20 +23,20 @@ from PySide6.QtWidgets import (
 
 from tagstudio.core.constants import RESERVED_NAMESPACE_PREFIX
 from tagstudio.core.enums import Theme
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal import Modal
 from tagstudio.qt.mixed.build_namespace import BuildNamespacePanel
 from tagstudio.qt.mixed.color_box import ColorBoxWidget
 from tagstudio.qt.mixed.field_widget import FieldContainer
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 logger = structlog.get_logger(__name__)
 
-# Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Split to use MVC guidelines.
 class TagColorManager(QWidget):
     create_namespace_modal: Modal | None = None
 
diff --git a/src/tagstudio/qt/mixed/tag_color_preview.py b/src/tagstudio/qt/mixed/tag_color_preview.py
index 965a823a..098569e2 100644
--- a/src/tagstudio/qt/mixed/tag_color_preview.py
+++ b/src/tagstudio/qt/mixed/tag_color_preview.py
@@ -11,9 +11,9 @@ from PySide6.QtWidgets import QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.models import TagColorGroup
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import (
     get_tag_border_color,
     get_tag_highlight_color,
     get_tag_text_color,
@@ -26,6 +26,7 @@ if typing.TYPE_CHECKING:
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class TagColorPreview(QWidget):
     on_click = Signal()
 
diff --git a/src/tagstudio/qt/mixed/tag_color_selection.py b/src/tagstudio/qt/mixed/tag_color_selection.py
index cbc823d7..71563fc0 100644
--- a/src/tagstudio/qt/mixed/tag_color_selection.py
+++ b/src/tagstudio/qt/mixed/tag_color_selection.py
@@ -20,11 +20,11 @@ from PySide6.QtWidgets import (
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import TagColorGroup
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import (
     color_swatch_style,
     get_tag_border_color,
     get_tag_highlight_color,
@@ -35,6 +35,7 @@ from tagstudio.qt.views.stylesheets.stylesheets import (
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Split to use MVC guidelines.
 class TagColorSelection(ModalContent):
     def __init__(self, library: Library):
         super().__init__()
diff --git a/src/tagstudio/qt/mixed/tag_widget.py b/src/tagstudio/qt/mixed/tag_widget.py
index d0ae2db5..c65ab366 100644
--- a/src/tagstudio/qt/mixed/tag_widget.py
+++ b/src/tagstudio/qt/mixed/tag_widget.py
@@ -12,10 +12,10 @@ from PySide6.QtWidgets import QHBoxLayout, QLineEdit, QPushButton, QSizePolicy,
 
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.helpers.escape_text import escape_text
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import (
     get_tag_border_color,
     get_tag_highlight_color,
     get_tag_primary_color,
@@ -31,6 +31,7 @@ if TYPE_CHECKING:
     from tagstudio.core.library.alchemy.library import Library
 
 
+# TODO: Split to use MVC guidelines.
 class TagAliasWidget(QWidget):
     on_remove = Signal()
 
diff --git a/src/tagstudio/qt/mixed/text_field.py b/src/tagstudio/qt/mixed/text_field.py
index 879a0121..683bfadb 100644
--- a/src/tagstudio/qt/mixed/text_field.py
+++ b/src/tagstudio/qt/mixed/text_field.py
@@ -10,6 +10,7 @@ from PySide6.QtWidgets import QHBoxLayout, QLabel
 from tagstudio.qt.mixed.field_widget import FieldWidget
 
 
+# TODO: Split to use MVC guidelines.
 class TextContainerWidget(FieldWidget):
     def __init__(self, title: str, text: str) -> None:
         super().__init__(title)
diff --git a/src/tagstudio/qt/ts_qt.py b/src/tagstudio/qt/qt_driver.py
similarity index 98%
rename from src/tagstudio/qt/ts_qt.py
rename to src/tagstudio/qt/qt_driver.py
index c0e5fc26..7d708f2c 100644
--- a/src/tagstudio/qt/ts_qt.py
+++ b/src/tagstudio/qt/qt_driver.py
@@ -56,15 +56,20 @@ from tagstudio.core.utils.module_status import ModuleStatus
 from tagstudio.core.utils.ripgrep_status import RipgrepStatus
 from tagstudio.core.utils.str_formatting import is_version_outdated
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.platform_strings import trash_term
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.app_settings import DEFAULT_GLOBAL_SETTINGS_PATH, AppSettings, Theme
 from tagstudio.qt.cache_manager import CacheManager
-from tagstudio.qt.controllers.field_template_search_panel_controller import FieldTemplateSearchPanel
-from tagstudio.qt.controllers.fix_ignored_modal_controller import FixIgnoredEntriesModal
-from tagstudio.qt.controllers.ignore_modal_controller import IgnoreModal
-from tagstudio.qt.controllers.library_info_window_controller import LibraryInfoWindow
+from tagstudio.qt.controllers.field_template_search_panel import FieldTemplateSearchPanel
+from tagstudio.qt.controllers.fix_ignored_modal import FixIgnoredEntriesModal
+from tagstudio.qt.controllers.ignore_modal import IgnoreModal
+from tagstudio.qt.controllers.library_info_window import LibraryInfoWindow
+from tagstudio.qt.controllers.main_window import MainWindow
 from tagstudio.qt.controllers.modal import Modal
-from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchPanel
+from tagstudio.qt.controllers.progress_bar import ProgressWidget
+from tagstudio.qt.controllers.splash import SplashScreen
+from tagstudio.qt.controllers.tag_search_panel import TagSearchPanel
 from tagstudio.qt.controllers.update_available_message_box import UpdateAvailableMessageBox
-from tagstudio.qt.global_settings import DEFAULT_GLOBAL_SETTINGS_PATH, GlobalSettings, Theme
 from tagstudio.qt.mixed.about_modal import AboutModal
 from tagstudio.qt.mixed.build_tag import BuildTagPanel
 from tagstudio.qt.mixed.drop_import_modal import DropImportModal
@@ -73,20 +78,15 @@ from tagstudio.qt.mixed.fix_unlinked import FixUnlinkedEntriesModal
 from tagstudio.qt.mixed.folders_to_tags import FoldersToTagsModal
 from tagstudio.qt.mixed.item_thumb import BadgeType
 from tagstudio.qt.mixed.migration_modal import JsonMigrationModal
-from tagstudio.qt.mixed.progress_bar import ProgressWidget
 from tagstudio.qt.mixed.settings_panel import SettingsPanel
 from tagstudio.qt.mixed.tag_color_manager import TagColorManager
-from tagstudio.qt.models.palette import ColorType, Palette, UiColor, get_ui_color
-from tagstudio.qt.platform_strings import trash_term
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
 from tagstudio.qt.utils.custom_runnable import CustomRunnable
 from tagstudio.qt.utils.file_deleter import delete_file
 from tagstudio.qt.utils.function_iterator import FunctionIterator
-from tagstudio.qt.views.main_window import MainWindow
 from tagstudio.qt.views.search_panel_view import SearchPanelView
-from tagstudio.qt.views.splash import SplashScreen
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.palette import ColorType, Palette, UiColor, get_ui_color
+from tagstudio.qt.views.styles.stylesheets import header
 
 BADGE_TAGS = {
     BadgeType.FAVORITE: TAG_FAVORITE,
@@ -164,6 +164,8 @@ class QtDriver(DriverMixin, QObject):
 
     SIGTERM = Signal()
 
+    # TODO: If these signals are removed from the base QtDriver, we can probably get rid of the
+    # QObject multiple inheritance and make DriverMixin a proper BaseDriver class.
     favorite_updated = Signal(bool)
     archived_updated = Signal(bool)
 
@@ -215,7 +217,7 @@ class QtDriver(DriverMixin, QObject):
             self.global_settings_path = Path(self.args.settings_file)
         else:
             logger.info("[Settings] Global Settings File Path not specified, using default")
-        self.settings = GlobalSettings.read_settings(self.global_settings_path)
+        self.settings = AppSettings.read_settings(self.global_settings_path)
         if not self.global_settings_path.exists():
             logger.warning(
                 "[Settings] Global Settings File does not exist creating",
diff --git a/src/tagstudio/qt/qt_file_renderer.py b/src/tagstudio/qt/qt_file_renderer.py
index c2cf84e9..d71d1f18 100644
--- a/src/tagstudio/qt/qt_file_renderer.py
+++ b/src/tagstudio/qt/qt_file_renderer.py
@@ -8,9 +8,9 @@ from PySide6.QtCore import QObject, QSize, Signal
 from PySide6.QtGui import QGuiApplication, QPixmap, Qt
 
 from tagstudio.core.library.alchemy.library import Library
+from tagstudio.previews.file_renderer import FileRenderer
+from tagstudio.qt.app_settings import AppSettings, Theme
 from tagstudio.qt.cache_manager import CacheManager
-from tagstudio.qt.global_settings import GlobalSettings, Theme
-from tagstudio.qt.previews.renderer import FileRenderer
 
 
 class QtFileRenderer(QObject):
@@ -19,7 +19,7 @@ class QtFileRenderer(QObject):
     updated = Signal(float, QPixmap, QSize, Path)
     updated_ratio = Signal(float)
 
-    def __init__(self, library: Library, settings: GlobalSettings) -> None:
+    def __init__(self, library: Library, settings: AppSettings) -> None:
         super().__init__()
         self.renderer = FileRenderer(library, settings)
         self.theme = (
diff --git a/src/tagstudio/qt/utils/file_opener.py b/src/tagstudio/qt/utils/file_opener.py
index a009dcff..7d4c8286 100644
--- a/src/tagstudio/qt/utils/file_opener.py
+++ b/src/tagstudio/qt/utils/file_opener.py
@@ -7,15 +7,10 @@ import subprocess
 import sys
 import traceback
 from pathlib import Path
-from typing import override
 
 import structlog
-from PySide6.QtCore import Qt
-from PySide6.QtGui import QMouseEvent
-from PySide6.QtWidgets import QLabel, QWidget
 
 from tagstudio.core.utils.silent_subprocess import silent_popen  # pyright: ignore
-from tagstudio.core.utils.types import unwrap
 
 logger = structlog.get_logger(__name__)
 
@@ -131,42 +126,3 @@ class FileOpenerHelper:
         """Open the file in the default file explorer."""
         if Path(self.filepath).is_file():
             open_file(self.filepath, file_manager=True)
-
-
-class FileOpenerLabel(QLabel):
-    def __init__(self, parent: QWidget | None = None) -> None:
-        """Initialize the FileOpenerLabel.
-
-        Args:
-            parent (QWidget, optional): The parent widget. Defaults to None.
-        """
-        self.filepath: Path | None = None
-
-        super().__init__(parent)
-
-    def set_file_path(self, filepath: Path) -> None:
-        """Set the filepath to open.
-
-        Args:
-            filepath (Path): The path to the file to open.
-        """
-        self.filepath = filepath
-
-    @override
-    def mousePressEvent(self, ev: QMouseEvent) -> None:
-        """Handle mouse press events.
-
-        On a left click, open the file in the default file explorer.
-        On a right click, show a context menu.
-
-        Args:
-            ev (QMouseEvent): The mouse press event.
-        """
-        if ev.button() == Qt.MouseButton.LeftButton:
-            opener = FileOpenerHelper(unwrap(self.filepath))
-            opener.open_explorer()
-        elif ev.button() == Qt.MouseButton.RightButton:
-            # Show context menu
-            pass
-        else:
-            super().mousePressEvent(ev)
diff --git a/src/tagstudio/qt/views/edit_field_template_modal_view.py b/src/tagstudio/qt/views/edit_field_template_modal_view.py
index 944dffa0..b28b8b72 100644
--- a/src/tagstudio/qt/views/edit_field_template_modal_view.py
+++ b/src/tagstudio/qt/views/edit_field_template_modal_view.py
@@ -14,10 +14,10 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.clickable_label import ClickableLabel
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import checkbox_style
+from tagstudio.qt.views.styles.stylesheets import checkbox_style
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/qt/views/edit_text_view.py b/src/tagstudio/qt/views/edit_text_view.py
index 7fbc53e0..7bd4328b 100644
--- a/src/tagstudio/qt/views/edit_text_view.py
+++ b/src/tagstudio/qt/views/edit_text_view.py
@@ -13,10 +13,10 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.clickable_label import ClickableLabel
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import checkbox_style, title_line_edit_style
+from tagstudio.qt.views.styles.stylesheets import checkbox_style, title_line_edit_style
 
 
 class EditTextView(ModalContent):
diff --git a/src/tagstudio/qt/views/field_template_widget_view.py b/src/tagstudio/qt/views/field_template_widget_view.py
index fe916c11..6d3f9e8d 100644
--- a/src/tagstudio/qt/views/field_template_widget_view.py
+++ b/src/tagstudio/qt/views/field_template_widget_view.py
@@ -6,8 +6,8 @@ from PySide6.QtGui import QColor, Qt
 from PySide6.QtWidgets import QHBoxLayout, QPushButton, QSizePolicy, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.enums import TagColorEnum
-from tagstudio.qt.models.palette import ColorType, get_tag_color
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.palette import ColorType, get_tag_color
+from tagstudio.qt.views.styles.stylesheets import (
     get_tag_border_color,
     get_tag_highlight_color,
     get_tag_text_color,
@@ -22,6 +22,7 @@ highlight_color: QColor = get_tag_highlight_color(primary_color)
 text_color: QColor = get_tag_text_color(primary_color, highlight_color)
 
 
+# TODO: Use newer MVC style guidelines
 class FieldTemplateWidgetView(QWidget):
     on_click = Signal()
     on_edit = Signal()
diff --git a/src/tagstudio/qt/views/fix_ignored_modal_view.py b/src/tagstudio/qt/views/fix_ignored_modal_view.py
index fdad55e6..a164c4a2 100644
--- a/src/tagstudio/qt/views/fix_ignored_modal_view.py
+++ b/src/tagstudio/qt/views/fix_ignored_modal_view.py
@@ -9,13 +9,14 @@ from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
 
 from tagstudio.core.library.alchemy.library import Library
-from tagstudio.qt.translations import Translations
+from tagstudio.i18n.translations import Translations
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Use newer MVC style guidelines
 class FixIgnoredEntriesModalView(QWidget):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
diff --git a/src/tagstudio/qt/views/ignore_modal_view.py b/src/tagstudio/qt/views/ignore_modal_view.py
index dac325d4..d00d0d44 100644
--- a/src/tagstudio/qt/views/ignore_modal_view.py
+++ b/src/tagstudio/qt/views/ignore_modal_view.py
@@ -14,12 +14,13 @@ from PySide6.QtWidgets import (
 from tagstudio.core.constants import IGNORE_NAME
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class IgnoreModalView(ModalContent):
     on_edit = Signal(Tag)
 
diff --git a/src/tagstudio/qt/views/preview_panel_view.py b/src/tagstudio/qt/views/inspector_view.py
similarity index 94%
rename from src/tagstudio/qt/views/preview_panel_view.py
rename to src/tagstudio/qt/views/inspector_view.py
index 5e1c905c..a0732ac1 100644
--- a/src/tagstudio/qt/views/preview_panel_view.py
+++ b/src/tagstudio/qt/views/inspector_view.py
@@ -11,23 +11,23 @@ from PySide6.QtGui import QDesktopServices
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QSplitter, QVBoxLayout, QWidget
 
 from tagstudio.core.constants import FFMPEG_HELP_URL
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.field_suggest_box import FieldSuggestBox
-from tagstudio.qt.controllers.preview_thumb_controller import PreviewThumb
+from tagstudio.qt.controllers.preview_thumb import PreviewThumb
 from tagstudio.qt.controllers.return_button import ReturnButton
 from tagstudio.qt.controllers.tag_suggest_box import TagSuggestBox
 from tagstudio.qt.mixed.field_containers import FieldContainers
 from tagstudio.qt.mixed.file_attributes import FileAttributes
 from tagstudio.qt.resource_manager import ResourceManager
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import button_style, preview_warning_style
+from tagstudio.qt.views.styles.stylesheets import button_style, preview_warning_style
 
 if typing.TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
-class PreviewPanelView(QVBoxLayout):
+class InspectorView(QVBoxLayout):
     def __init__(self, driver: "QtDriver", pixel_ratio: float) -> None:
         super().__init__()
         self.setContentsMargins(0, 0, 0, 0)
diff --git a/src/tagstudio/qt/thumb_grid_layout.py b/src/tagstudio/qt/views/layouts/thumb_grid_layout.py
similarity index 99%
rename from src/tagstudio/qt/thumb_grid_layout.py
rename to src/tagstudio/qt/views/layouts/thumb_grid_layout.py
index b95307ba..12c2e68f 100644
--- a/src/tagstudio/qt/thumb_grid_layout.py
+++ b/src/tagstudio/qt/views/layouts/thumb_grid_layout.py
@@ -20,7 +20,7 @@ from tagstudio.qt.mixed.item_thumb import BadgeType, ItemThumb
 from tagstudio.qt.qt_file_renderer import QtFileRenderer
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
 class ThumbGridLayout(QLayout):
diff --git a/src/tagstudio/qt/views/library_info_window_view.py b/src/tagstudio/qt/views/library_info_window_view.py
index 2ad72dda..46cecd6c 100644
--- a/src/tagstudio/qt/views/library_info_window_view.py
+++ b/src/tagstudio/qt/views/library_info_window_view.py
@@ -21,17 +21,18 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from tagstudio.qt.helpers.color_overlay import auto_theme_overlay
-from tagstudio.qt.platform_strings import open_file_str
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.i18n.platform_strings import open_file_str
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.views.styles.color_overlay import auto_theme_overlay
+from tagstudio.qt.views.styles.stylesheets import header
 
 # Only import for type checking/autocompletion, will not be imported at runtime.
 if TYPE_CHECKING:
     from tagstudio.core.library.alchemy.library import Library
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 
+# TODO: Use newer MVC style guidelines
 class LibraryInfoWindowView(QWidget):
     def __init__(self, library: "Library", driver: "QtDriver"):
         super().__init__()
diff --git a/src/tagstudio/qt/views/modal_view.py b/src/tagstudio/qt/views/modal_view.py
index b9fc1aba..b082bc67 100644
--- a/src/tagstudio/qt/views/modal_view.py
+++ b/src/tagstudio/qt/views/modal_view.py
@@ -6,9 +6,9 @@ import structlog
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
 
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.controllers.modal_content import ModalContent
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import header
+from tagstudio.qt.views.styles.stylesheets import header
 
 logger = structlog.get_logger(__name__)
 
diff --git a/src/tagstudio/qt/views/preview_thumb_view.py b/src/tagstudio/qt/views/preview_thumb_view.py
index 916c2b85..f3ca286a 100644
--- a/src/tagstudio/qt/views/preview_thumb_view.py
+++ b/src/tagstudio/qt/views/preview_thumb_view.py
@@ -14,15 +14,15 @@ from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QStackedLayout,
 
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.media_types import MediaType
+from tagstudio.i18n.platform_strings import open_file_str, trash_term
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.mixed.file_attributes import FileAttributeData
 from tagstudio.qt.mixed.media_player import MediaPlayer
-from tagstudio.qt.platform_strings import open_file_str, trash_term
 from tagstudio.qt.qt_file_renderer import QtFileRenderer
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.rounded_pixmap_style import RoundedPixmapStyle
+from tagstudio.qt.views.styles.rounded_pixmap_style import RoundedPixmapStyle
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
@@ -30,6 +30,7 @@ logger = structlog.get_logger(__name__)
 THUMB_SIZE_FACTOR = 2
 
 
+# TODO: Use newer MVC style guidelines
 class PreviewThumbView(QWidget):
     """The Preview Panel Widget."""
 
diff --git a/src/tagstudio/qt/views/search_panel_view.py b/src/tagstudio/qt/views/search_panel_view.py
index cabcbc92..0bce724a 100644
--- a/src/tagstudio/qt/views/search_panel_view.py
+++ b/src/tagstudio/qt/views/search_panel_view.py
@@ -16,8 +16,8 @@ from PySide6.QtWidgets import (
     QWidget,
 )
 
-from tagstudio.qt.translations import Translations
-from tagstudio.qt.views.stylesheets.stylesheets import list_button_style
+from tagstudio.i18n.translations import Translations
+from tagstudio.qt.views.styles.stylesheets import list_button_style
 
 if TYPE_CHECKING:
     pass
diff --git a/src/tagstudio/qt/helpers/color_overlay.py b/src/tagstudio/qt/views/styles/color_overlay.py
similarity index 98%
rename from src/tagstudio/qt/helpers/color_overlay.py
rename to src/tagstudio/qt/views/styles/color_overlay.py
index 8af12bf9..b5097c0b 100644
--- a/src/tagstudio/qt/helpers/color_overlay.py
+++ b/src/tagstudio/qt/views/styles/color_overlay.py
@@ -6,7 +6,7 @@ from PIL import Image
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
 
-from tagstudio.qt.helpers.gradients import linear_gradient
+from tagstudio.previews.gradients import linear_gradient
 
 # TODO: Consolidate the built-in QT theme values with the values
 # here, in enums.py, and in palette.py.
diff --git a/src/tagstudio/qt/helpers/image_effects.py b/src/tagstudio/qt/views/styles/image_effects.py
similarity index 100%
rename from src/tagstudio/qt/helpers/image_effects.py
rename to src/tagstudio/qt/views/styles/image_effects.py
diff --git a/src/tagstudio/qt/models/palette.py b/src/tagstudio/qt/views/styles/palette.py
similarity index 100%
rename from src/tagstudio/qt/models/palette.py
rename to src/tagstudio/qt/views/styles/palette.py
diff --git a/src/tagstudio/qt/views/stylesheets/rounded_pixmap_style.py b/src/tagstudio/qt/views/styles/rounded_pixmap_style.py
similarity index 100%
rename from src/tagstudio/qt/views/stylesheets/rounded_pixmap_style.py
rename to src/tagstudio/qt/views/styles/rounded_pixmap_style.py
diff --git a/src/tagstudio/qt/views/stylesheets/stylesheets.py b/src/tagstudio/qt/views/styles/stylesheets.py
similarity index 99%
rename from src/tagstudio/qt/views/stylesheets/stylesheets.py
rename to src/tagstudio/qt/views/styles/stylesheets.py
index cedb25a7..c8ff15f2 100644
--- a/src/tagstudio/qt/views/stylesheets/stylesheets.py
+++ b/src/tagstudio/qt/views/styles/stylesheets.py
@@ -8,7 +8,13 @@ from PySide6.QtGui import QColor, QGuiApplication
 from tagstudio.core.enums import Theme
 from tagstudio.core.library.alchemy.enums import TagColorEnum
 from tagstudio.core.library.alchemy.models import Tag
-from tagstudio.qt.models.palette import ColorType, Palette, UiColor, get_tag_color, get_ui_color
+from tagstudio.qt.views.styles.palette import (
+    ColorType,
+    Palette,
+    UiColor,
+    get_tag_color,
+    get_ui_color,
+)
 
 # TODO: There's plenty of good opportunities here to consolidate similar styles.
 # Work should be done to more closely use Qt's theming systems rather than override them.
diff --git a/src/tagstudio/qt/views/suggest_box_view.py b/src/tagstudio/qt/views/suggest_box_view.py
index 6b790551..202dc23f 100644
--- a/src/tagstudio/qt/views/suggest_box_view.py
+++ b/src/tagstudio/qt/views/suggest_box_view.py
@@ -9,7 +9,7 @@ from PySide6.QtWidgets import QFrame, QHBoxLayout, QSizePolicy, QVBoxLayout, QWi
 
 from tagstudio.qt.controllers.autofill_line_edit import AutofillLineEdit
 from tagstudio.qt.controllers.horizontal_scroll_area import HorizontalScrollArea
-from tagstudio.qt.views.stylesheets.stylesheets import (
+from tagstudio.qt.views.styles.stylesheets import (
     autofill_line_edit_style,
     autofill_scroll_top_style,
 )
diff --git a/src/tagstudio/qt/views/tag_box_view.py b/src/tagstudio/qt/views/tag_box_view.py
index a3097cb1..0d3ddde1 100644
--- a/src/tagstudio/qt/views/tag_box_view.py
+++ b/src/tagstudio/qt/views/tag_box_view.py
@@ -14,11 +14,12 @@ from tagstudio.qt.mixed.tag_widget import TagWidget
 from tagstudio.qt.views.layouts.flow_layout import FlowLayout
 
 if TYPE_CHECKING:
-    from tagstudio.qt.ts_qt import QtDriver
+    from tagstudio.qt.qt_driver import QtDriver
 
 logger = structlog.get_logger(__name__)
 
 
+# TODO: Use newer MVC style guidelines
 class TagBoxWidgetView(FieldWidget):
     __lib: Library
 
diff --git a/src/tagstudio/qt/views/thumb_button.py b/src/tagstudio/qt/views/thumb_button.py
index 07fd833e..5b497981 100644
--- a/src/tagstudio/qt/views/thumb_button.py
+++ b/src/tagstudio/qt/views/thumb_button.py
@@ -6,19 +6,13 @@ from typing import override
 
 from PySide6 import QtCore
 from PySide6.QtCore import QEvent
-from PySide6.QtGui import (
-    QColor,
-    QEnterEvent,
-    QPainter,
-    QPainterPath,
-    QPaintEvent,
-    QPen,
-)
+from PySide6.QtGui import QColor, QEnterEvent, QPainter, QPainterPath, QPaintEvent, QPen
 from PySide6.QtWidgets import QPushButton, QWidget
 
-from tagstudio.qt.models.palette import Palette
+from tagstudio.qt.views.styles.palette import Palette
 
 
+# TODO: Use newer MVC style guidelines
 class ThumbButton(QPushButton):
     def __init__(self, parent: QWidget, thumb_size: tuple[int, int]) -> None:
         super().__init__(parent)
diff --git a/src/tagstudio/qt/views/underlined_widget_view.py b/src/tagstudio/qt/views/underlined_widget_view.py
index 029da759..e8565700 100644
--- a/src/tagstudio/qt/views/underlined_widget_view.py
+++ b/src/tagstudio/qt/views/underlined_widget_view.py
@@ -5,7 +5,7 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QPushButton, QVBoxLayout, QWidget
 
-from tagstudio.qt.views.stylesheets.stylesheets import widget_underline_style
+from tagstudio.qt.views.styles.stylesheets import widget_underline_style
 
 
 class UnderlinedWidgetView(QVBoxLayout):
diff --git a/tests/conftest.py b/tests/conftest.py
index 6a7a3070..d1a17f16 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,6 +10,7 @@ from unittest.mock import Mock, patch
 
 import pytest
 from PySide6.QtWidgets import QScrollArea
+from pytestqt.qtbot import QtBot
 
 from tagstudio.core.library.alchemy.fields import TextField
 
@@ -20,8 +21,8 @@ sys.path.insert(0, str(CWD.parent))
 from tagstudio.core.constants import THUMB_CACHE_NAME, TS_FOLDER_NAME
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Entry, Tag
-from tagstudio.qt.thumb_grid_layout import ThumbGridLayout
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.qt_driver import QtDriver
+from tagstudio.qt.views.layouts.thumb_grid_layout import ThumbGridLayout
 
 
 @pytest.fixture
@@ -146,6 +147,12 @@ def entry_full(library: Library):
     yield next(library.all_entries(with_joins=True))
 
 
+@pytest.fixture(autouse=True)
+def _init_qtbot(qtbot: QtBot):  # pyright: ignore[reportUnusedFunction]
+    """Ensures that a QtBot is initialized for all subsequent tests, regardless of order."""
+    return qtbot
+
+
 @pytest.fixture
 def qt_driver(library: Library, library_dir: Path):
     class Args:
@@ -154,7 +161,8 @@ def qt_driver(library: Library, library_dir: Path):
         open = library_dir
         ci = True
 
-    with patch("tagstudio.qt.ts_qt.Consumer"), patch("tagstudio.qt.ts_qt.CustomRunnable"):
+    # NOTE: What the heck is this
+    with patch("tagstudio.qt.qt_driver.Consumer"), patch("tagstudio.qt.qt_driver.CustomRunnable"):
         driver = QtDriver(Args())  # pyright: ignore[reportArgumentType]
 
         driver.app = Mock()
diff --git a/tests/test_json_migration.py b/tests/core/library/test_json_migration.py
similarity index 93%
rename from tests/test_json_migration.py
rename to tests/core/library/test_json_migration.py
index 003eb08f..517769b9 100644
--- a/tests/test_json_migration.py
+++ b/tests/core/library/test_json_migration.py
@@ -10,7 +10,7 @@ CWD = Path(__file__)
 
 
 def test_json_migration():
-    modal = JsonMigrationModal(CWD.parent / "fixtures" / "json_library")
+    modal = JsonMigrationModal(CWD.parents[2] / "fixtures" / "json_library")
     modal.migrate(skip_ui=True)
 
     # Entries ==================================================================
diff --git a/tests/test_library.py b/tests/core/library/test_library.py
similarity index 100%
rename from tests/test_library.py
rename to tests/core/library/test_library.py
diff --git a/tests/test_db_migrations.py b/tests/core/library/test_migrations.py
similarity index 55%
rename from tests/test_db_migrations.py
rename to tests/core/library/test_migrations.py
index 87ef3574..4f6c77b9 100644
--- a/tests/test_db_migrations.py
+++ b/tests/core/library/test_migrations.py
@@ -21,16 +21,16 @@ EMPTY_LIBRARIES = "empty_libraries"
 @pytest.mark.parametrize(
     "path",
     [
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_6")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_7")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_8")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_9")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_100")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_101")),
-        # str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_102")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_103")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_200")),
-        str(Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_201")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_6")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_7")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_8")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_9")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_100")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_101")),
+        # str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_102")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_103")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_200")),
+        str(Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_201")),
     ],
 )
 def test_library_migrations(path: str):
@@ -38,7 +38,7 @@ def test_library_migrations(path: str):
 
     # Copy libraries to temp dir so modifications don't show up in version control
     original_path = Path(path)
-    temp_path = Path(CWD.parent / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_TEMP")
+    temp_path = Path(CWD.parents[2] / FIXTURES / EMPTY_LIBRARIES / "DB_VERSION_TEMP")
     temp_path.mkdir(exist_ok=True)
     temp_path_ts = temp_path / TS_FOLDER_NAME
     temp_path_ts.mkdir(exist_ok=True)
diff --git a/tests/macros/test_refresh_dir.py b/tests/core/library/test_refresh.py
similarity index 100%
rename from tests/macros/test_refresh_dir.py
rename to tests/core/library/test_refresh.py
diff --git a/tests/test_search.py b/tests/core/library/test_search.py
similarity index 100%
rename from tests/test_search.py
rename to tests/core/library/test_search.py
diff --git a/tests/macros/test_missing_files.py b/tests/core/library/test_unlinked_entries.py
similarity index 96%
rename from tests/macros/test_missing_files.py
rename to tests/core/library/test_unlinked_entries.py
index 3ea463a6..4d20590c 100644
--- a/tests/macros/test_missing_files.py
+++ b/tests/core/library/test_unlinked_entries.py
@@ -17,7 +17,7 @@ CWD = Path(__file__).parent
 
 # NOTE: Does this test actually work?
 @pytest.mark.parametrize("library", [TemporaryDirectory()], indirect=True)
-def test_refresh_missing_files(library: Library):
+def test_refresh_unlinked_entries(library: Library):
     registry = UnlinkedRegistry(lib=library)
 
     # touch the file `one/two/bar.md` but in wrong location to simulate a moved file
diff --git a/tests/macros/test_folders_tags.py b/tests/core/macros/test_folders_tags.py
similarity index 100%
rename from tests/macros/test_folders_tags.py
rename to tests/core/macros/test_folders_tags.py
diff --git a/tests/test_driver.py b/tests/core/test_base_driver.py
similarity index 76%
rename from tests/test_driver.py
rename to tests/core/test_base_driver.py
index b4ce1941..fbacb7c9 100644
--- a/tests/test_driver.py
+++ b/tests/core/test_base_driver.py
@@ -9,18 +9,19 @@ from PySide6.QtCore import QSettings
 from tagstudio.core.driver import DriverMixin
 from tagstudio.core.enums import AppCacheItems
 from tagstudio.core.library.alchemy.library import LibraryStatus
-from tagstudio.qt.global_settings import GlobalSettings
+from tagstudio.qt.app_settings import AppSettings
 
 
-class TestDriver(DriverMixin):
-    def __init__(self, settings: GlobalSettings, cache: QSettings):
+# TODO: Remove Qt-specific things from this base driver text
+class TestBaseDriver(DriverMixin):
+    def __init__(self, settings: AppSettings, cache: QSettings):
         self.settings = settings
         self.cached_values = cache
 
 
 def test_evaluate_path_empty():
     # Given
-    driver = TestDriver(GlobalSettings(), QSettings())
+    driver = TestBaseDriver(AppSettings(), QSettings())
 
     # When
     result = driver.evaluate_path(None)
@@ -31,7 +32,7 @@ def test_evaluate_path_empty():
 
 def test_evaluate_path_missing():
     # Given
-    driver = TestDriver(GlobalSettings(), QSettings())
+    driver = TestBaseDriver(AppSettings(), QSettings())
 
     # When
     result = driver.evaluate_path("/0/4/5/1/")
@@ -44,7 +45,7 @@ def test_evaluate_path_last_lib_not_exists():
     # Given
     cache = QSettings()
     cache.setValue(AppCacheItems.LAST_LIBRARY, "/0/4/5/1/")
-    driver = TestDriver(GlobalSettings(), cache)
+    driver = TestBaseDriver(AppSettings(), cache)
 
     # When
     result = driver.evaluate_path(None)
@@ -60,10 +61,10 @@ def test_evaluate_path_last_lib_present(library_dir: Path):
     cache.setValue(AppCacheItems.LAST_LIBRARY, library_dir)
     cache.sync()
 
-    settings = GlobalSettings()
+    settings = AppSettings()
     settings.open_last_loaded_on_startup = True
 
-    driver = TestDriver(settings, cache)
+    driver = TestBaseDriver(settings, cache)
 
     # When
     result = driver.evaluate_path(None)
diff --git a/tests/macros/test_dupe_files.py b/tests/core/test_dupe_files.py
similarity index 100%
rename from tests/macros/test_dupe_files.py
rename to tests/core/test_dupe_files.py
diff --git a/tests/test_translations.py b/tests/i18n/test_translations.py
similarity index 98%
rename from tests/test_translations.py
rename to tests/i18n/test_translations.py
index 5a699de5..8c77f22b 100644
--- a/tests/test_translations.py
+++ b/tests/i18n/test_translations.py
@@ -9,7 +9,7 @@ from pathlib import Path
 import pytest
 import ujson as json
 
-CWD = Path(__file__).parent
+CWD = Path(__file__).parents[1]
 TRANSLATION_DIR = CWD / ".." / "src" / "tagstudio" / "resources" / "translations"
 
 
diff --git a/tests/qt/test_global_settings.py b/tests/qt/test_app_settings.py
similarity index 55%
rename from tests/qt/test_global_settings.py
rename to tests/qt/test_app_settings.py
index 63eb5195..fd0e7ccc 100644
--- a/tests/qt/test_global_settings.py
+++ b/tests/qt/test_app_settings.py
@@ -4,7 +4,7 @@
 
 from pathlib import Path
 
-from tagstudio.qt.global_settings import GlobalSettings, Theme
+from tagstudio.qt.app_settings import AppSettings, Theme
 
 
 def test_read_settings(library_dir: Path):
@@ -23,7 +23,7 @@ def test_read_settings(library_dir: Path):
             zero_padding = true
         """)
 
-    settings = GlobalSettings.read_settings(settings_path)
+    settings = AppSettings.read_settings(settings_path)
     assert settings.language == "de"
     assert settings.open_last_loaded_on_startup
     assert settings.autoplay
@@ -34,3 +34,21 @@ def test_read_settings(library_dir: Path):
     assert settings.date_format == "%x"
     assert settings.hour_format
     assert settings.zero_padding
+
+    # NOTE: Other tests are affected by the settings made in this test, so as a temporary measure
+    # this just reverts the language back to English for subsequent tests.
+    with open(settings_path, "w") as settings_file:
+        settings_file.write("""
+            language = "en"
+            open_last_loaded_on_startup = true
+            autoplay = true
+            show_filenames_in_grid = true
+            page_size = 1337
+            show_filepath = 0
+            dark_mode = 2
+            date_format = "%x"
+            hour_format = true
+            zero_padding = true
+        """)
+    settings = AppSettings.read_settings(settings_path)
+    assert settings.language == "en"
diff --git a/tests/qt/test_build_tag_panel.py b/tests/qt/test_build_tag_panel.py
index b0134c23..825b1682 100644
--- a/tests/qt/test_build_tag_panel.py
+++ b/tests/qt/test_build_tag_panel.py
@@ -12,9 +12,9 @@ from pytestqt.qtbot import QtBot
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag, TagAlias
 from tagstudio.core.utils.types import unwrap
+from tagstudio.i18n.translations import Translations
 from tagstudio.qt.mixed.build_tag import BuildTagPanel, CustomTableItem
 from tagstudio.qt.mixed.tag_widget import TagWidget
-from tagstudio.qt.translations import Translations
 
 
 def test_build_tag_panel_add_sub_tag_callback(
diff --git a/tests/qt/test_field_containers.py b/tests/qt/test_field_containers.py
index 21f0e7d5..d2518360 100644
--- a/tests/qt/test_field_containers.py
+++ b/tests/qt/test_field_containers.py
@@ -8,12 +8,12 @@ from tagstudio.core.library.alchemy.library import Library
 # pyright: reportPrivateUsage=false
 from tagstudio.core.library.alchemy.models import Entry, Tag
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.controllers.inspector import Inspector
+from tagstudio.qt.qt_driver import QtDriver
 
 
 def test_update_selection_empty(qt_driver: QtDriver):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Clear the library selection (selecting 1 then unselecting 1)
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -26,7 +26,7 @@ def test_update_selection_empty(qt_driver: QtDriver):
 
 
 def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -40,7 +40,7 @@ def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
 def test_update_selection_multiple(qt_driver: QtDriver):
     # TODO: Implement mixed field editing. Currently these containers will be hidden,
     # same as the empty selection behavior.
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Select the multiple entries
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -53,7 +53,7 @@ def test_update_selection_multiple(qt_driver: QtDriver):
 
 
 def test_add_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     assert {t.id for t in entry_full.tags} == {1000}
 
@@ -70,7 +70,7 @@ def test_add_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry):
 
 
 def test_add_same_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     assert {t.id for t in entry_full.tags} == {1000}
 
@@ -87,7 +87,7 @@ def test_add_same_tag_to_selection_single(qt_driver: QtDriver, entry_full: Entry
 
 
 def test_add_tag_to_selection_multiple(qt_driver: QtDriver):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
     all_entries = qt_driver.lib.all_entries(with_joins=True)
 
     # We want to verify that tag 1000 is on some, but not all entries already.
@@ -127,7 +127,7 @@ def test_add_tag_to_selection_multiple(qt_driver: QtDriver):
 
 
 def test_meta_tag_category(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Ensure the Favorite tag is on entry_full
     qt_driver.lib.add_tags_to_entries(1, entry_full.id)
@@ -155,7 +155,7 @@ def test_meta_tag_category(qt_driver: QtDriver, entry_full: Entry):
 
 
 def test_custom_tag_category(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Set tag 1000 (foo) as a category
     tag: Tag = unwrap(qt_driver.lib.get_tag(1000))
@@ -190,7 +190,7 @@ def test_custom_tag_category(qt_driver: QtDriver, entry_full: Entry):
 def test_exclude_tag_category(
     qt_driver: QtDriver, library: Library, generate_tag: Callable[..., Tag]
 ):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     category_parent = unwrap(generate_tag("category_parent", id=123, is_category=True))
     library.add_tag(category_parent)
diff --git a/tests/qt/test_file_path_options.py b/tests/qt/test_file_path_options.py
index 252a960f..a5ab0edb 100644
--- a/tests/qt/test_file_path_options.py
+++ b/tests/qt/test_file_path_options.py
@@ -17,9 +17,9 @@ from tagstudio.core.enums import ShowFilepathOption
 from tagstudio.core.library.alchemy.library import Library, LibraryStatus
 from tagstudio.core.library.alchemy.models import Entry
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
+from tagstudio.qt.controllers.inspector import Inspector
 from tagstudio.qt.mixed.settings_panel import SettingsPanel
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.qt_driver import QtDriver
 
 
 # Tests to see if the file path setting is applied correctly
@@ -62,7 +62,7 @@ def test_file_path_display(
     filepath_option: ShowFilepathOption,
     expected_path: Callable[[Library], Path],
 ):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Select 2
     qt_driver.toggle_item_selection(2, append=False, bridge=False)
diff --git a/tests/qt/test_preview_panel.py b/tests/qt/test_inspector.py
similarity index 89%
rename from tests/qt/test_preview_panel.py
rename to tests/qt/test_inspector.py
index 05068c32..f5c42fa6 100644
--- a/tests/qt/test_preview_panel.py
+++ b/tests/qt/test_inspector.py
@@ -4,12 +4,12 @@
 # pyright: reportPrivateUsage=false
 
 from tagstudio.core.library.alchemy.models import Entry
-from tagstudio.qt.controllers.preview_panel_controller import PreviewPanel
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.controllers.inspector import Inspector
+from tagstudio.qt.qt_driver import QtDriver
 
 
 def test_update_selection_empty(qt_driver: QtDriver):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Clear the library selection (selecting 1 then unselecting 1)
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
@@ -25,7 +25,7 @@ def test_update_selection_empty(qt_driver: QtDriver):
 
 
 def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Select the single entry
     qt_driver.toggle_item_selection(entry_full.id, append=False, bridge=False)
@@ -37,7 +37,7 @@ def test_update_selection_single(qt_driver: QtDriver, entry_full: Entry):
 
 
 def test_update_selection_multiple(qt_driver: QtDriver):
-    panel = PreviewPanel(qt_driver)
+    panel = Inspector(qt_driver)
 
     # Select the multiple entries
     qt_driver.toggle_item_selection(1, append=False, bridge=False)
diff --git a/tests/qt/test_item_thumb.py b/tests/qt/test_item_thumb.py
index d5c1e904..0506c97b 100644
--- a/tests/qt/test_item_thumb.py
+++ b/tests/qt/test_item_thumb.py
@@ -6,7 +6,7 @@ import pytest
 
 from tagstudio.core.library.alchemy.enums import ItemType
 from tagstudio.qt.mixed.item_thumb import BadgeType, ItemThumb
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.qt_driver import QtDriver
 
 
 @pytest.mark.parametrize("new_value", (True, False))
diff --git a/tests/qt/test_qt_driver.py b/tests/qt/test_qt_driver.py
index 37bd3832..2317bd30 100644
--- a/tests/qt/test_qt_driver.py
+++ b/tests/qt/test_qt_driver.py
@@ -4,7 +4,7 @@
 
 from tagstudio.core.library.alchemy.enums import BrowsingState
 from tagstudio.core.utils.types import unwrap
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.qt_driver import QtDriver
 
 
 def test_browsing_state_update(qt_driver: QtDriver):
diff --git a/tests/qt/test_tag_panel.py b/tests/qt/test_tag_panel.py
index 48197372..7dabc017 100644
--- a/tests/qt/test_tag_panel.py
+++ b/tests/qt/test_tag_panel.py
@@ -7,7 +7,7 @@ from pytestqt.qtbot import QtBot
 from tagstudio.core.library.alchemy.library import Library
 from tagstudio.core.library.alchemy.models import Tag
 from tagstudio.qt.mixed.build_tag import BuildTagPanel
-from tagstudio.qt.ts_qt import QtDriver
+from tagstudio.qt.qt_driver import QtDriver
 
 
 def test_tag_panel(qtbot: QtBot, library: Library):
diff --git a/tests/qt/test_tag_search_panel.py b/tests/qt/test_tag_search_panel.py
index 86d3ebbb..aa7f5695 100644
--- a/tests/qt/test_tag_search_panel.py
+++ b/tests/qt/test_tag_search_panel.py
@@ -6,7 +6,7 @@ from PySide6.QtCore import SIGNAL
 from pytestqt.qtbot import QtBot
 
 from tagstudio.core.library.alchemy.library import Library
-from tagstudio.qt.controllers.tag_search_panel_controller import TagSearchPanel
+from tagstudio.qt.controllers.tag_search_panel import TagSearchPanel
 from tagstudio.qt.mixed.tag_widget import TagWidget
 from tagstudio.qt.views.search_panel_view import SearchPanelView
 
diff --git a/tests/qt/test_theme_system.py b/tests/qt/test_theme_system.py
index ab2eecf3..9e12b8eb 100644
--- a/tests/qt/test_theme_system.py
+++ b/tests/qt/test_theme_system.py
@@ -9,7 +9,7 @@ from unittest.mock import Mock
 import pytest
 from PySide6.QtCore import Qt
 
-from tagstudio.qt.global_settings import Theme
+from tagstudio.qt.app_settings import Theme
 
 
 @pytest.mark.parametrize(