diff --git a/ui/extends/components/ocrQueue/__init__.py b/ui/extends/components/ocrQueue.py
similarity index 100%
rename from ui/extends/components/ocrQueue/__init__.py
rename to ui/extends/components/ocrQueue.py
diff --git a/ui/extends/score.py b/ui/extends/score.py
deleted file mode 100644
index e69de29..0000000
diff --git a/ui/extends/color.py b/ui/extends/shared/color.py
similarity index 100%
rename from ui/extends/color.py
rename to ui/extends/shared/color.py
diff --git a/ui/extends/settings.py b/ui/extends/shared/settings.py
similarity index 100%
rename from ui/extends/settings.py
rename to ui/extends/shared/settings.py
diff --git a/ui/implements/components/ratingClassRadioButton.py b/ui/implements/components/ratingClassRadioButton.py
index 0d02200..be2b2f4 100644
--- a/ui/implements/components/ratingClassRadioButton.py
+++ b/ui/implements/components/ratingClassRadioButton.py
@@ -2,7 +2,7 @@ from PySide6.QtCore import Slot
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QGraphicsColorizeEffect, QRadioButton
 
-from ui.extends.color import mix_color
+from ui.extends.shared.color import mix_color
 
 STYLESHEET = """
 QRadioButton {{
diff --git a/ui/implements/settings/settingsDefault.py b/ui/implements/settings/settingsDefault.py
index 35bb634..7d1a3b9 100644
--- a/ui/implements/settings/settingsDefault.py
+++ b/ui/implements/settings/settingsDefault.py
@@ -5,7 +5,7 @@ from PySide6.QtWidgets import QWidget
 
 from ui.designer.settings.settingsDefault_ui import Ui_SettingsDefault
 from ui.extends.ocr import load_devices_json
-from ui.extends.settings import *
+from ui.extends.shared.settings import *
 
 logger = logging.getLogger(__name__)
 
diff --git a/ui/implements/tabs/tabOcr/tabOcr_B30.py b/ui/implements/tabs/tabOcr/tabOcr_B30.py
index 7377f2c..b63975e 100644
--- a/ui/implements/tabs/tabOcr/tabOcr_B30.py
+++ b/ui/implements/tabs/tabOcr/tabOcr_B30.py
@@ -12,7 +12,7 @@ from PySide6.QtWidgets import QWidget
 
 from ui.designer.tabs.tabOcr.tabOcr_B30_ui import Ui_TabOcr_B30
 from ui.extends.components.ocrQueue import OcrQueueModel
-from ui.extends.settings import Settings
+from ui.extends.shared.settings import Settings
 from ui.extends.shared.cv2_utils import cv2BgrMatToQImage, qImageToCvMatBgr
 from ui.extends.tabs.tabOcr.tabOcr_B30 import (
     ChieriV4OcrRunnable,
diff --git a/ui/implements/tabs/tabOcr/tabOcr_Device.py b/ui/implements/tabs/tabOcr/tabOcr_Device.py
index 62fce15..a06a768 100644
--- a/ui/implements/tabs/tabOcr/tabOcr_Device.py
+++ b/ui/implements/tabs/tabOcr/tabOcr_Device.py
@@ -12,7 +12,7 @@ from PySide6.QtWidgets import QFileDialog, QWidget
 
 from ui.designer.tabs.tabOcr.tabOcr_Device_ui import Ui_TabOcr_Device
 from ui.extends.components.ocrQueue import OcrQueueModel
-from ui.extends.settings import Settings
+from ui.extends.shared.settings import Settings
 from ui.extends.tabs.tabOcr.tabOcr_Device import (
     ScoreInsertConverter,
     TabDeviceV2OcrRunnable,
diff --git a/ui/startup/databaseChecker.py b/ui/startup/databaseChecker.py
index ec390bd..73d70ea 100644
--- a/ui/startup/databaseChecker.py
+++ b/ui/startup/databaseChecker.py
@@ -4,7 +4,7 @@ from arcaea_offline.database import Database
 from PySide6.QtCore import QDir, QFile, Qt, QTimer, Slot
 from PySide6.QtWidgets import QDialog, QMessageBox
 
-from ui.extends.settings import Settings
+from ui.extends.shared.settings import Settings
 
 from .databaseChecker_ui import Ui_DatabaseChecker