diff --git a/tagstudio/src/core/library.py b/tagstudio/src/core/library.py
index 485e30b..0ece31d 100644
--- a/tagstudio/src/core/library.py
+++ b/tagstudio/src/core/library.py
@@ -8,6 +8,7 @@ import datetime
 import glob
 import json
 import logging
+import os
 import sys
 import time
 import traceback
@@ -16,10 +17,9 @@ from enum import Enum
 
 import ujson
 
-import tagstudio.src.core.ts_core as ts_core
-from tagstudio.src.core.utils.fs import *
-from tagstudio.src.core.utils.str import *
-from tagstudio.src.core.utils.web import *
+from tagstudio.src.core import ts_core
+from tagstudio.src.core.utils.str import strip_punctuation
+from tagstudio.src.core.utils.web import strip_web_protocol
 
 TYPE = ['file', 'meta', 'alt', 'mask']
 # RESULT_TYPE = Enum('Result', ['ENTRY', 'COLLATION', 'TAG_GROUP'])
diff --git a/tagstudio/src/core/ts_core.py b/tagstudio/src/core/ts_core.py
index bb6ad79..4115cbb 100644
--- a/tagstudio/src/core/ts_core.py
+++ b/tagstudio/src/core/ts_core.py
@@ -7,7 +7,7 @@
 import json
 import os
 
-from src.core.library import *
+from tagstudio.src.core.library import Entry, Library
 
 VERSION: str = '9.1.0'  # Major.Minor.Patch
 VERSION_BRANCH: str = 'Alpha'  # 'Alpha', 'Beta', or '' for Full Release
diff --git a/tagstudio/src/qt/main_window.py b/tagstudio/src/qt/main_window.py
index 8055d93..daa79d6 100644
--- a/tagstudio/src/qt/main_window.py
+++ b/tagstudio/src/qt/main_window.py
@@ -19,7 +19,7 @@ from PySide6.QtWidgets import (QComboBox, QFrame, QGridLayout,
 							   QHBoxLayout, QVBoxLayout, QLayout, QLineEdit, QMainWindow,
 							   QMenuBar, QPushButton, QScrollArea, QSizePolicy,
 							   QStatusBar, QWidget, QSplitter, QMenu)
-from src.qt.pagination import Pagination
+from tagstudio.src.qt.pagination import Pagination
 
 
 class Ui_MainWindow(QMainWindow):
diff --git a/tagstudio/src/qt/pagination.py b/tagstudio/src/qt/pagination.py
index c190fa1..074bf86 100644
--- a/tagstudio/src/qt/pagination.py
+++ b/tagstudio/src/qt/pagination.py
@@ -6,8 +6,8 @@
 # I never want to see this code again.
 
 from PySide6.QtCore import QObject, Signal, QSize
-from PySide6.QtGui import *
-from PySide6.QtWidgets import *
+from PySide6.QtGui import QIntValidator
+from PySide6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QLabel, QLineEdit, QSizePolicy
 
 
 # class NumberEdit(QLineEdit):
diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py
index ec304f8..61c6a5c 100644
--- a/tagstudio/src/qt/ts_qt.py
+++ b/tagstudio/src/qt/ts_qt.py
@@ -10,9 +10,13 @@
 import ctypes
 import logging
 import math
+import os
 import sys
 import time
+import traceback
+from types import FunctionType
 from datetime import datetime as dt
+from pathlib import Path
 from queue import Empty, Queue
 from time import sleep
 from typing import Optional
@@ -21,17 +25,26 @@ import cv2
 from PIL import Image, ImageChops, UnidentifiedImageError, ImageQt, ImageDraw, ImageFont, ImageEnhance
 from PySide6 import QtCore
 from PySide6.QtCore import QObject, QThread, Signal, QRunnable, Qt, QThreadPool, QSize, QEvent, QTimer
-from PySide6.QtGui import *
+from PySide6.QtGui import (QGuiApplication, QPixmap, QEnterEvent, QMouseEvent, QResizeEvent, QPainter, QColor, QPen,
+						   QAction, QStandardItemModel, QStandardItem, QPainterPath, QFontDatabase, QIcon)
 from PySide6.QtUiTools import QUiLoader
-from PySide6.QtWidgets import *
-from humanfriendly import format_timespan
-from src.core.library import *
-from src.core.palette import ColorType, get_tag_color
-from src.core.ts_core import *
-from src.qt.flowlayout import FlowLayout, FlowWidget
-from src.qt.main_window import Ui_MainWindow
+from PySide6.QtWidgets import (QApplication, QWidget, QVBoxLayout, QHBoxLayout, QLabel, QPushButton, QPlainTextEdit,
+							   QLineEdit, QScrollArea, QFrame, QTextEdit, QComboBox, QProgressDialog, QFileDialog,
+							   QListView, QSplitter, QSizePolicy, QMessageBox, QBoxLayout, QCheckBox, QSplashScreen,
+							   QMenu)
 from humanfriendly import format_timespan, format_size
 
+from tagstudio.src.core.library import Collation, Entry, ItemType, Library, Tag
+from tagstudio.src.core.palette import ColorType, get_tag_color
+from tagstudio.src.core.ts_core import (TagStudioCore, TAG_COLORS, DATE_FIELDS, TEXT_FIELDS, BOX_FIELDS, ALL_FILE_TYPES,
+										SHORTCUT_TYPES, PROGRAM_TYPES, ARCHIVE_TYPES, PRESENTATION_TYPES,
+										SPREADSHEET_TYPES, TEXT_TYPES, AUDIO_TYPES, VIDEO_TYPES, IMAGE_TYPES,
+										LIBRARY_FILENAME, COLLAGE_FOLDER_NAME, BACKUP_FOLDER_NAME, TS_FOLDER_NAME,
+										VERSION_BRANCH, VERSION)
+from tagstudio.src.core.utils.web import strip_web_protocol
+from tagstudio.src.qt.flowlayout import FlowLayout, FlowWidget
+from tagstudio.src.qt.main_window import Ui_MainWindow
+import tagstudio.src.qt.resources_rc
 
 # SIGQUIT is not defined on Windows
 if sys.platform == "win32":
diff --git a/tagstudio/tag_studio.py b/tagstudio/tag_studio.py
index 50f48d6..683529f 100644
--- a/tagstudio/tag_studio.py
+++ b/tagstudio/tag_studio.py
@@ -4,12 +4,11 @@
 
 """TagStudio launcher."""
 
-from src.core.ts_core import TagStudioCore
-from src.cli.ts_cli import CliDriver
-from src.qt.ts_qt import QtDriver
+from tagstudio.src.core.ts_core import TagStudioCore
+from tagstudio.src.cli.ts_cli import CliDriver
+from tagstudio.src.qt.ts_qt import QtDriver
 import argparse
 import traceback
-# import ctypes
 
 
 def main():
diff --git a/tagstudio/tests/core/test_tags.py b/tagstudio/tests/core/test_tags.py
index 33c8e89..7ff70d0 100644
--- a/tagstudio/tests/core/test_tags.py
+++ b/tagstudio/tests/core/test_tags.py
@@ -1,4 +1,4 @@
-from src.core.library import Tag
+from tagstudio.src.core.library import Tag
 
 
 class TestTags: