diff --git a/bigtext.py b/bigtext.py
index da477bf..7e8d43b 100644
--- a/bigtext.py
+++ b/bigtext.py
@@ -12,7 +12,7 @@ from PySide6.QtGui import QMouseEvent
 from PySide6.QtWidgets import *
 
 import constants
-from ScaledScrollBar import ScaledScrollBar
+from raven.ui.ScaledScrollBar import ScaledScrollBar
 from conversion import humanbytes
 from highlight_selection import HighlightSelection
 from highlighted_range import HighlightedRange
diff --git a/highlightingdialog.py b/highlightingdialog.py
index 225c96f..db6a3a4 100644
--- a/highlightingdialog.py
+++ b/highlightingdialog.py
@@ -2,14 +2,15 @@ from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QDialog, QLineEdit, QLabel, QGridLayout, QCheckBox, QListWidget, QListWidgetItem, \
     QPushButton, QDialogButtonBox, QMessageBox, QSizePolicy
 
-from colorbutton import ColorButton
-from hbox import HBox
+from raven.ui.colorbutton import ColorButton
+from raven.ui.hbox import HBox
 from highlight_regex import HighlightRegex
 from highlighting import Highlighting
 from settings import Settings
 
 from raven.i18n import _
 
+
 class PayloadItem(QListWidgetItem):
     def __init__(self, text: str, payload=None):
         super(PayloadItem, self).__init__(text)
diff --git a/raven/mainwindow.py b/raven/mainwindow.py
index 7a0bc71..e567ab5 100644
--- a/raven/mainwindow.py
+++ b/raven/mainwindow.py
@@ -13,7 +13,7 @@ from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
 from settingsstore import SettingsStore
 from highlightingdialog import HighlightingDialog
-from tabs import Tabs
+from raven.ui.tabs import Tabs
 from urlutils import url_is_file
 from functools import reduce
 
diff --git a/aboutdialog.py b/raven/plugins/ravenlog/aboutdialog.py
similarity index 98%
rename from aboutdialog.py
rename to raven/plugins/ravenlog/aboutdialog.py
index bde1cd7..7413b09 100644
--- a/aboutdialog.py
+++ b/raven/plugins/ravenlog/aboutdialog.py
@@ -7,7 +7,7 @@ from PySide6.QtWidgets import *
 
 import constants
 from label import Label
-from vbox import VBox
+from raven.ui.vbox import VBox
 from raven.i18n import _
 
 class AboutDialog(QDialog):
diff --git a/raven/plugins/ravenlogplugin.py b/raven/plugins/ravenlogplugin.py
index 270d218..c88723c 100644
--- a/raven/plugins/ravenlogplugin.py
+++ b/raven/plugins/ravenlogplugin.py
@@ -1,11 +1,11 @@
 import sys
-from typing import Optional, Callable, Dict
+from typing import Optional
 
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QDockWidget, QMessageBox
 
 import constants
-from aboutdialog import AboutDialog
+from raven.plugins.ravenlog.aboutdialog import AboutDialog
 from raven.mainwindow import MainWindow
 from raven.pluginbase import PluginBase
 from raven.plugins.domain.menucontribution import MenuContribution
diff --git a/ScaledScrollBar.py b/raven/ui/ScaledScrollBar.py
similarity index 100%
rename from ScaledScrollBar.py
rename to raven/ui/ScaledScrollBar.py
diff --git a/raven/ui/__init__.py b/raven/ui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/colorbutton.py b/raven/ui/colorbutton.py
similarity index 100%
rename from colorbutton.py
rename to raven/ui/colorbutton.py
diff --git a/hbox.py b/raven/ui/hbox.py
similarity index 100%
rename from hbox.py
rename to raven/ui/hbox.py
diff --git a/tabs.py b/raven/ui/tabs.py
similarity index 100%
rename from tabs.py
rename to raven/ui/tabs.py
diff --git a/vbox.py b/raven/ui/vbox.py
similarity index 100%
rename from vbox.py
rename to raven/ui/vbox.py