From 5428553a1e8e52be9c756d8c172f16be660fdbac Mon Sep 17 00:00:00 2001
From: Andreas Huber <andreas.huber@lucares.de>
Date: Sun, 6 Feb 2022 16:02:54 +0100
Subject: [PATCH] move files into a package structure

---
 bigtext.py                                       |   4 ++--
 fulltabwidget.py                                 |   2 +-
 highlight_selection.py                           |   2 +-
 highlighting.py                                  |   2 +-
 highlightingdialog.py                            |   2 +-
 icon6.png                                        | Bin 4104 -> 0 bytes
 icon7.png                                        | Bin 2485 -> 0 bytes
 icon7_gold3.png                                  | Bin 3161 -> 0 bytes
 icon8_burned_sky.png                             | Bin 4254 -> 0 bytes
 icon8c.png                                       | Bin 4458 -> 0 bytes
 linetolinemap.py                                 |   2 +-
 logFileModel.py                                  |   2 +-
 raven/i18n.py                                    |   2 +-
 raven/mainwindow.py                              |   8 ++++----
 raven/plugins/logfileplugin.py                   |   4 ++--
 raven/plugins/openfileplugin.py                  |   4 +---
 raven/plugins/ravenlogplugin.py                  |   2 +-
 raven/settings/__init__.py                       |   0
 .../settings/cutesettings.py                     |   0
 settings.py => raven/settings/settings.py        |   0
 .../settings/settingsstore.py                    |   7 +++----
 raven/ui/tabs.py                                 |   2 +-
 raven/util/__init__.py                           |   0
 conversion.py => raven/util/conversion.py        |   0
 int2intmap.py => raven/util/int2intmap.py        |   0
 .../util/testint2intmaplike.py                   |   2 +-
 urlutils.py => raven/util/urlutils.py            |   0
 testlogfilemodel.py                              |   2 +-
 28 files changed, 23 insertions(+), 26 deletions(-)
 delete mode 100644 icon6.png
 delete mode 100644 icon7.png
 delete mode 100644 icon7_gold3.png
 delete mode 100644 icon8_burned_sky.png
 delete mode 100644 icon8c.png
 create mode 100644 raven/settings/__init__.py
 rename cutesettings.py => raven/settings/cutesettings.py (100%)
 rename settings.py => raven/settings/settings.py (100%)
 rename settingsstore.py => raven/settings/settingsstore.py (93%)
 create mode 100644 raven/util/__init__.py
 rename conversion.py => raven/util/conversion.py (100%)
 rename int2intmap.py => raven/util/int2intmap.py (100%)
 rename testint2intmaplike.py => raven/util/testint2intmaplike.py (98%)
 rename urlutils.py => raven/util/urlutils.py (100%)

diff --git a/bigtext.py b/bigtext.py
index 7e8d43b..abb7de2 100644
--- a/bigtext.py
+++ b/bigtext.py
@@ -13,7 +13,7 @@ from PySide6.QtWidgets import *
 
 import constants
 from raven.ui.ScaledScrollBar import ScaledScrollBar
-from conversion import humanbytes
+from raven.util.conversion import humanbytes
 from highlight_selection import HighlightSelection
 from highlighted_range import HighlightedRange
 from highlightingdialog import HighlightingDialog
@@ -21,7 +21,7 @@ from line import Line
 from logFileModel import LogFileModel
 from raven.pluginregistry import PluginRegistry
 
-from settings import Settings
+from raven.settings.settings import Settings
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 from raven.i18n import _
diff --git a/fulltabwidget.py b/fulltabwidget.py
index 9a6e4fe..efb2392 100644
--- a/fulltabwidget.py
+++ b/fulltabwidget.py
@@ -6,7 +6,7 @@ from filterviewsyncer import FilterViewSyncer
 from filterwidget import FilterWidget
 from logFileModel import LogFileModel
 from raven.plugins.ravenlog.Tab import Tab
-from conversion import humanbytes
+from raven.util.conversion import humanbytes
 
 
 class FullTabWidget(Tab):
diff --git a/highlight_selection.py b/highlight_selection.py
index fa8ad98..af7a327 100644
--- a/highlight_selection.py
+++ b/highlight_selection.py
@@ -6,7 +6,7 @@ from line import Line
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QBrush, QColor
 
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class HighlightSelection(Highlight):
diff --git a/highlighting.py b/highlighting.py
index aacef8e..5b78ca6 100644
--- a/highlighting.py
+++ b/highlighting.py
@@ -1,7 +1,7 @@
 import logging
 
 from highlight_regex import HighlightRegex
-from settings import Settings
+from raven.settings.settings import Settings
 
 log = logging.getLogger("highlighting")
 
diff --git a/highlightingdialog.py b/highlightingdialog.py
index db6a3a4..f9919af 100644
--- a/highlightingdialog.py
+++ b/highlightingdialog.py
@@ -6,7 +6,7 @@ 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.settings.settings import Settings
 
 from raven.i18n import _
 
diff --git a/icon6.png b/icon6.png
deleted file mode 100644
index 9f17f27523dfb6c82d6d0487d219f2aff341275c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4104
zcmWkx2{cq+7=Ol6h7gi0Gh?d^i5g3?FBwY=%`i0C*Rf<BWH6RUgds~wne5p^BT<BG
zlaVE<MArIC_K@xWdhfjZ&iT&0@80`;_qV(xjJeS<s0b7QfMdpJ11s>Y^Y1yz0k+S)
z0=@wNOPrU!KE_yIAK@Q()7{I*4FJwkBdMC`4jr*Bhik=Fc4EH}LlXKS&oS6e%L+_9
zlxFQY+CDpU-g79Us7Vc4&3;5%sDejfpjo{M8as95PF`N-)8zZxZ;A#b-^I;DwY=JD
zia2t#3OUSp%~tR;n`$i6MTo+2w@BVO`xfB8aB(px<9@=zc5`A{O=!U5xyawl<JMfK
zS;>;C@)e>&s~oEvCAfta3o$1*TN$l0Fx4NiooNIcLevZ)5I^<cxK!SQGpT&Z#W3qz
zxmm~Vh22#vA*#=DUCO}?Tz}L^j0^eQ>mZE$A=ghRJ!J?@#>cW9hl-RHK)C|!LafYO
zJ+*&+hX?HOzZ49_we{3dL{L4c@IBtBP;a3#XTBC;_<uy#Eu~o^YPlNnUhGHud|47`
zJLD$(yb)c+&LC%e`$epia`YE%YWhv=gZaN?<<=f`(<e!5U!~#MzA=B~t+frF<0Aw`
zEdH9=VCk{4`6)Uz#V0Ih`KP)2)sb5fyIW?ZZ{V)7fwTitkNaR%IGjz541mLbcR_1u
zCK%!LN81JgfP&P&hb637n*;`r1RGy9JTeCr<5l1+EI$1d4Cw|N;)C^X`ue*01q1q4
zhPqe_D|Lj2>p7yon+JlVq@aj68xrK@=YcRbF+!MN42=*Zl?$@+h=33$AFtqWgeKyW
zBDB^J4^DdQrLlo7Hth4<b#JrlW7!9a9HQLs9AV8EqM0PJ@-&g(Qs(`=AzI&Hd;>c3
zI?NYYCW2Esf%^itEZ@FnSY@}VtGrZnCrJcnL;c*~6|=`F4(p1!qjD^^^8(ETGVc`E
z{_cDmvwq$vrTfpN?p&i=%i`ItoPX?h>pt2?EH}Px<gI-#``ZF$%8d}9Ky*|9uYv)d
zHZ~nzM-~bfupf=l;h}T@CM@@XPp2eN@Nt%}?Eb7eyc8`U=+MMEi)BiXVh{XoGx3{W
z;MoX44sL0mTLM;OC|&3H9xl^`g<ZO}Gp8;9?}2Ri(<$nkxwhQr(G4rntd4g=ra3t|
zr3InJ@<N$dWHEzb*2iE-mt#$w>vH4uBxIzeD~*mPw22*T=qs|fMYDumvV#W%1n?bY
z<4ZC~?{!6+n(AM<!Z9>FERorpo{<3o{MGYo?W*tuLVTBV%zO8^QR3|{OB@}Fh`YBW
z_$Y5!!^A1;OiY_Opbh!d)m@7WCXrOu*47FzXE7KIa9c0t>sLb0Tp+sG>Q0w4K<S^0
zo$yN>_ep4Xq}bPVcXqOE+|qP+cXzz-Ahz$09-U>+Xo@4;6Z(m_K+``lD8oQf*U3o&
zi#!2~-U}$hBF|=-xVpJXC@Y_kq#j*eT?JQuCpkh<<9Ljd@b-RG(}bUz7!QNVbRm<)
z)bn}ls)WFHYk9JJXvnHz=K+8Pgvr9tZF*Z@|2Ctwpa8JY+L7jgYo)YCY)yYKf*ab|
ziSP>u#6fDH@4cA@y0^nLV4r+c%*@T5Jw1;`Mn-Ng(I*v^l#cse$FpV+iY8-L7x6oC
z<hRLP&iC)%FL?SCl9iREM&4GuZz5A<^|LwN0XO^KI5j;TNHU0h^hiulNJx){LCDCk
z+t-}r;^JD_AwL@C#OuN-Kdb(w@sL$#04JN%Z)s<Dx3AAc<8W{Ntb#%U7I_<UHpO@f
zFUSvvrxg`R&(6;3lw&0|HO09*9G#q4<mBYYCSfogQJ~*lFdZ`G0o*2J?d<HFm6OxI
zdi9uzsVOxl=Okfua|qn2qLx-_N(%SU+j{1PVAJDzVRm6bN=}Z8yQ9syuFa1g1T%{9
z-3<jE-$PElVcENEbK9!Cv(BX(bK}On{oO5ng&Zj@ttkBpEk#Ajna5#}s;Vl*y!UE>
zvuF&bA6=C0H}Q6~!X{v@@5I-ZZ~>s!g9)3RpMSf&)#0PkL2O*>l1yWhchWcK>6oK{
zQ)k*$mArnf_591y?AESVVM9xcnNg}3=i-~v(nPWre1EO~Jl5L!-A}gGjUiK%rsh?!
z5JlD%vfA2Dn6}O;)AGIB8X7MN=8cVwBcr2+q*wXE3AFcv7TWurB84<s%(uv`31!W8
zu-5UvNS8xGLM(lK&-Ko&dBSFzzs|c?r*=9k;jmcD_3NUx^4V9bG>%h0corGK!lh5s
zRh5;q%pYs?A|3E}L~@s&udgrG(oz=$R889ara?$$+i3-bR30%k9WV*5C=u0jEn|zt
zs^7w-PJhqK%kv_UvaPMH@gW@@9pL7AJyBNP-g4q<{*>wI>1{|^?$e(0FHh63$nx^?
zq<8P$^(<}<x&M57o68$|urX{g+|z^h&kJw0|J)i8Dr^xN8d~e;<CF66;X`yec5QRV
zP2Q11?r{!U8jHgjwzjr5fY;B+$%%>9l9ltXw<X^*nTd@-FA4Im2L{X~C7p#6va_?x
z==7Xt&z_+rsVm<(Ep@Z5QSY%qSe8CFCJ*FaHVO&~%2U~Qh~Ce7USD4bb+ETLcdvgi
zN^*9N?fNn~39sDR-AAda8Z8Xu7v6Y9qUs=~{yW5?*f*}IpiNAkK6{1~5fhW9e`%Hd
zzPr0SCI|!WrKSeHIQ*Un$G2?#p5U4Zcr}4iQ$yo$I1n<OqtQ1}z_57uimV`1J>rl2
zDei=0HLts8XgA;NtCX<TfO#2nPz(Nn5niV0CwjWM$)qrsw=&xu3+g?X8G5uSb-oD}
zTX_6$38)%3Lg_*^v%f#iq*%|+&JKGr)XR%gAxEx~v9SLA&(ar6#b{Y|b?UkQKEHWV
z-%?*MFjjqoOD<wA%O*Bg@5iIzp`ik+^7NdXZsmneN+m$Sl)ge`T$AS4rD6V|O-YFw
z3UcFc*!%;J^vujSk0+5r;o;%6<359)s3!7GAY-7rH}gzg#Fn4+OZyrleSLkrEy!Pe
z{r#7Ajm^yBt;*x|Xl*MiirG0iQnn^6gu9*Wepep4`1vU)tEdc(j9{_raB*>&ERz!#
zv$s~e;nyrJk5`cW{8C5h@7)Xk`;REJTx^;XwlD+Ygh;$AA}T7Ys+!}?qbgOGE)Bdu
z1NBW!x!}%wh>g|Zn^(=vhq%tS@ZnZKDiMLfO4{3Xt#23_vWIItuGPvnKhwH1pC|wA
z@84U2F9|I{PQnS5)^d#v4VZucrIUk1uAaSUs_!g9kCx5@(?E-hi&w@aq!AQOdZ9#a
z9qw<%v6zR4UyA%Q?twy~4D4%iK-3MFTGYokla}o84(sdd8=t*v>b6s1ntf}$O<?J6
ztE;R3m}-wBql2Q#AP0SOTX5~DM;sg+c)9vhL&U~MA1$q|uY@jtlc^s!v#BP~GBWsu
zm_bZUBaS$U`8*FtM@lMOdmvQ&KzW0YF|Uqxy>JR-*#v+`t7Um_XT7C#@3CgYl)swV
z;$+mWFG^WiLQ_+-qz*jZMOLz4XAtNo1MiDJ17vd`R#sLBp=3JSX9$H#Jx)H@S!mfL
zysf|@$=lx()oyK^J!2(!%tRo$3vFy1gO;9lre68W!kg7%4+3jCId=y<%gJ0P6?6(e
z6jWAngPa#T?(=OeoKw$g$Z2*pY${m&d*I8DeT+^6k$W5<o<i`pAnlkxQfqIXj6U2C
z^+bt)Y^AG^Q~2tY=<c7Tj*6Ps(6nxWbrJ|zP<Q=bO_05|3m|3$C@8_TUzWVxTt7;`
znn>OH7LkTK_`6tB*wmy}`RibR_fwtA5ovx-Z|?>=-6c2}Ribn%AqEuMQKDOT8SO$1
zQU`9kxV}@{)O56docqn>8(DTTSU`Ez7q4H#z^U~~Dwlg_gA+=(^=vSu!(FI(B)+++
zsV7H!FcIk}5h&W()zuCvgQH^G66t1`Xi948^oT5p?eE9yH+2zw2q~$!i`7$?#SXV;
z(sCJ-OQa64r*qxPgG0SC2!U#BSTn|z_nxEGo;R_hPJ&%6-yEf)^1P4vL_012awr72
zaPi_8meT8LM~8^<904tXkBVrE{Y~lq2?|4(oe$R1%W3i4wkkI_w{354ubIh`;IuMo
z<3MX|)vVm>OcE$7FXudfCqo+Sd{>scy1H`TJ$~}!pSy5)J#|HAzSg_;Oh*3_Nxx<c
zGzJ>;!>S{7mxAWa@U}!EQfqsPRr<`CBmK{xKgav(=L_ZZpCCnbPIH0MpOTgaj#-}o
zGznok4zAE7Ct(JIp;J2C?q1*J!%n|Bc?E|%QL#7Om3$V7gv!lW>HLrY>)P=`M_0G~
zVa3h*@q*!>iWe_-D0^7wSZ71#0YchW)6<!ppfkzL%p{k}%8_a+DqO-t;E@~0Q^hZH
zC@^T%)e4pJBaH5M@813=S#!1ei+5lkKRDoYX42xX=G1hLQ0n6;!)o7upGKkBDn>;{
zp(Q0H7#o{J8jV&P*l2ezA%UZ_yF2LbFAL30EdD{e<Iw~0@C1!NpIj_$CW(#z%#3<|
zDs%6=mLQ(&>KcDBwxYVa1k79+^~*g`)wiEVK7Pz#E)-r4{f!|KiFlG{U|_~c)=yA8
z`9=~IjHX{Hq|MLI*CtgT*hlTSnTK7@5aThz-<7|7IS-T=ydxSs>*p2gaY@wNYc8iV
zy{-n2efRH75dZ}$zA<_sKNKHHM2XlR^^v>gq9kK<?~2su$VhG2-Me?o3Jc@NT9eI`
zjPY?>q`dqr&NDJn)5Bz7dFy6)AZmVNdt^i~a{aw(@ZSwD^`Lp~MmoLQb&WhSJlv5d
zJ006DoDlB$b5(mO#y}cms%K?o2motkrS~N2udJ=S&_EXb%M$NWOeZq3!z06_IAesU
z3|a!;-s>@F4W=J`cx~;%@?$z){-2c~HmZN78L^yF*+W0$Y73&37Y(X8`T6niB(nDQ
z_M$B;c;9;D-5#8tnUUa6N>5L3g9h$JY0ob#1nmC}A#Y8D{`mDP-o9ob#DwM1Cx(<P
zFHD14!PC<0%pwlzNG)C-Az4&hEOF^lct=|C$H0Ia3MawSA9b+fL1+%<ym8}3Zhrop
zw=)F8;YhkD1ZaeLjKMz{IajxVh;kv3gur!xMwmZ|4fOrjosWV3ZE^FhbDd*Ym@sHm
zwm}8?FgeLgM$EK(f0zOMs=R!a23$niZicNut}*7KnGA*_kqEs~c)Y*AzdbaP`jKz(
zn(doO-kg5+`tg*yI;D+`jj6S{{-#@-NDy2NO|F~eKG9}BR@G0sUf0gHFZSIhL}k6$
zJR(3H7>b5$o60jP#vWqM#^dFA+<m_KsS*@y{2hWE!^o~|D;yN~3U86`{s*k9;LCH`
sc{32)ft%K&uYaBl`0b{Z(lz(byAz+5#3&^<fPaL5v7xy^wVq?_|Bkz_6#xJL

diff --git a/icon7.png b/icon7.png
deleted file mode 100644
index 2ab0a74575987a4c80691b874da7a731f50b1a9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2485
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

diff --git a/icon7_gold3.png b/icon7_gold3.png
deleted file mode 100644
index 2176237da8b22f624160374a4f9e7d6767ca98cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3161
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

diff --git a/icon8_burned_sky.png b/icon8_burned_sky.png
deleted file mode 100644
index 8a63e0f08a243579a5038b0fcad29e409e862135..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4254
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
AJ^%m!

diff --git a/icon8c.png b/icon8c.png
deleted file mode 100644
index d3cf8b86ade1e428041e6effc0b5a91e7245eb17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4458
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

diff --git a/linetolinemap.py b/linetolinemap.py
index b9d8473..a15d4ea 100644
--- a/linetolinemap.py
+++ b/linetolinemap.py
@@ -2,7 +2,7 @@ import os
 import tempfile
 from typing import Optional
 
-from int2intmap import Int2IntMap
+from raven.util.int2intmap import Int2IntMap
 
 
 class LineToLineMap:
diff --git a/logFileModel.py b/logFileModel.py
index cc8fb12..8b00311 100644
--- a/logFileModel.py
+++ b/logFileModel.py
@@ -6,7 +6,7 @@ from highlight_regex import HighlightRegex
 from highlighting import Highlighting
 from line import Line
 import os
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class LogFileModel:
diff --git a/raven/i18n.py b/raven/i18n.py
index eefb20e..cd1c098 100644
--- a/raven/i18n.py
+++ b/raven/i18n.py
@@ -3,7 +3,7 @@ import os
 from pathlib import Path
 
 from raven.pluginregistry import PluginRegistry
-from settingsstore import SettingsStore
+from raven.settings.settingsstore import SettingsStore
 
 settings = SettingsStore.load()
 locale = os.environ['LANG'] if os.environ['LANG'] else "en"
diff --git a/raven/mainwindow.py b/raven/mainwindow.py
index e567ab5..e0ab304 100644
--- a/raven/mainwindow.py
+++ b/raven/mainwindow.py
@@ -5,16 +5,16 @@ from PySide6.QtWidgets import *
 from PySide6.QtGui import *
 from PySide6.QtCore import Qt
 
-import urlutils
-from cutesettings import CuteSettings
+from raven.util import urlutils
+from raven.settings.cutesettings import CuteSettings
 from raven.pluginregistry import PluginRegistry
 from raven.plugins.domain.menucontribution import MenuContribution, sort_menu_contributions
 from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
-from settingsstore import SettingsStore
+from raven.settings.settingsstore import SettingsStore
 from highlightingdialog import HighlightingDialog
 from raven.ui.tabs import Tabs
-from urlutils import url_is_file
+from raven.util.urlutils import url_is_file
 from functools import reduce
 
 from raven.i18n import _
diff --git a/raven/plugins/logfileplugin.py b/raven/plugins/logfileplugin.py
index 3e71d0c..7571304 100644
--- a/raven/plugins/logfileplugin.py
+++ b/raven/plugins/logfileplugin.py
@@ -1,5 +1,5 @@
 import os.path
-from typing import Callable, Optional
+from typing import Optional
 
 from PySide6.QtWidgets import QMessageBox
 
@@ -7,7 +7,7 @@ from fulltabwidget import FullTabWidget
 from logFileModel import LogFileModel
 from raven.pluginbase import PluginBase
 from raven.plugins.ravenlog.Tab import Tab
-from settings import Settings
+from raven.settings.settings import Settings
 
 from raven.i18n import _
 
diff --git a/raven/plugins/openfileplugin.py b/raven/plugins/openfileplugin.py
index 32570ab..92efeae 100644
--- a/raven/plugins/openfileplugin.py
+++ b/raven/plugins/openfileplugin.py
@@ -1,8 +1,6 @@
 import os
-from typing import Callable
 from pathlib import Path
 
-from PySide6.QtCore import QObject
 from PySide6.QtWidgets import QFileDialog
 
 from raven.pluginbase import PluginBase
@@ -10,7 +8,7 @@ from raven.pluginregistry import PluginRegistry
 from raven.plugins.domain.menucontribution import MenuContribution
 from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
-from settings import Settings
+from raven.settings.settings import Settings
 
 from raven.i18n import _
 
diff --git a/raven/plugins/ravenlogplugin.py b/raven/plugins/ravenlogplugin.py
index c88723c..aef2cd2 100644
--- a/raven/plugins/ravenlogplugin.py
+++ b/raven/plugins/ravenlogplugin.py
@@ -13,7 +13,7 @@ from raven.plugins.domain.raction import RAction
 from raven.plugins.domain.rmenu import RMenu
 from raven.plugins.ravenlog.Tab import Tab
 from raven.i18n import _, locale
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class RavenLogPlugin(PluginBase):
diff --git a/raven/settings/__init__.py b/raven/settings/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/cutesettings.py b/raven/settings/cutesettings.py
similarity index 100%
rename from cutesettings.py
rename to raven/settings/cutesettings.py
diff --git a/settings.py b/raven/settings/settings.py
similarity index 100%
rename from settings.py
rename to raven/settings/settings.py
diff --git a/settingsstore.py b/raven/settings/settingsstore.py
similarity index 93%
rename from settingsstore.py
rename to raven/settings/settingsstore.py
index baf35c8..ac5e605 100644
--- a/settingsstore.py
+++ b/raven/settings/settingsstore.py
@@ -1,12 +1,11 @@
 import os
 import sys
-from typing import Callable
-
-from settings import Settings
 from pathlib import Path
-from os.path import join, isfile
+from os.path import join
 from configparser import ConfigParser
 
+from raven.settings.settings import Settings
+
 
 class SettingsStore():
     def __init__(self):
diff --git a/raven/ui/tabs.py b/raven/ui/tabs.py
index e2bb6f7..a7759fa 100644
--- a/raven/ui/tabs.py
+++ b/raven/ui/tabs.py
@@ -4,7 +4,7 @@ from PySide6.QtWidgets import QWidget, QTabWidget, QVBoxLayout
 
 from raven.pluginregistry import PluginRegistry
 from raven.plugins.ravenlog.Tab import Tab
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class Tabs(QWidget):
diff --git a/raven/util/__init__.py b/raven/util/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/conversion.py b/raven/util/conversion.py
similarity index 100%
rename from conversion.py
rename to raven/util/conversion.py
diff --git a/int2intmap.py b/raven/util/int2intmap.py
similarity index 100%
rename from int2intmap.py
rename to raven/util/int2intmap.py
diff --git a/testint2intmaplike.py b/raven/util/testint2intmaplike.py
similarity index 98%
rename from testint2intmaplike.py
rename to raven/util/testint2intmaplike.py
index fa7cfc5..d2a17ba 100644
--- a/testint2intmaplike.py
+++ b/raven/util/testint2intmaplike.py
@@ -2,7 +2,7 @@ import tempfile
 import unittest
 from os.path import join
 
-from int2intmap import Int2IntMap
+from raven.util.int2intmap import Int2IntMap
 
 
 class Int2IntMapLike(unittest.TestCase):
diff --git a/urlutils.py b/raven/util/urlutils.py
similarity index 100%
rename from urlutils.py
rename to raven/util/urlutils.py
diff --git a/testlogfilemodel.py b/testlogfilemodel.py
index 4612dad..e97b964 100644
--- a/testlogfilemodel.py
+++ b/testlogfilemodel.py
@@ -4,7 +4,7 @@ from configparser import ConfigParser
 from os.path import join
 
 from logFileModel import LogFileModel
-from settings import Settings
+from raven.settings.settings import Settings
 
 
 class TestLogFileModel(unittest.TestCase):