diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64ee2af83..028eba917 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -342,7 +342,7 @@ fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE)
 configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY)
 configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY)
 if(APPLE)
-    configure_file(src/util/impl/apple/Info.plist.in Info.plist @ONLY)
+    configure_file(src/common/impl/apple/Info.plist.in Info.plist @ONLY)
 endif()
 
 ####################
@@ -364,6 +364,33 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}")
 #######################
 
 set(LIBFASTFETCH_SRC
+    src/common/impl/commandoption.c
+    src/common/impl/duration.c
+    src/common/impl/font.c
+    src/common/impl/format.c
+    src/common/impl/frequency.c
+    src/common/impl/init.c
+    src/common/impl/jsonconfig.c
+    src/common/impl/library.c
+    src/common/impl/netif.c
+    src/common/impl/networking_common.c
+    src/common/impl/option.c
+    src/common/impl/parsing.c
+    src/common/impl/percent.c
+    src/common/impl/printing.c
+    src/common/impl/properties.c
+    src/common/impl/settings.c
+    src/common/impl/size.c
+    src/common/impl/temps.c
+    src/common/impl/time.c
+    src/common/impl/edidHelper.c
+    src/common/impl/base64.c
+    src/common/impl/FFlist.c
+    src/common/impl/FFstrbuf.c
+    src/common/impl/kmod.c
+    src/common/impl/path.c
+    src/common/impl/FFPlatform.c
+    src/common/impl/smbiosHelper.c
     src/detection/bluetoothradio/bluetoothradio.c
     src/detection/bootmgr/bootmgr.c
     src/detection/chassis/chassis.c
@@ -473,37 +500,17 @@ set(LIBFASTFETCH_SRC
     src/options/display.c
     src/options/logo.c
     src/options/general.c
-    src/util/impl/commandoption.c
-    src/util/impl/duration.c
-    src/util/impl/font.c
-    src/util/impl/format.c
-    src/util/impl/frequency.c
-    src/util/impl/init.c
-    src/util/impl/jsonconfig.c
-    src/util/impl/library.c
-    src/util/impl/netif.c
-    src/util/impl/networking_common.c
-    src/util/impl/option.c
-    src/util/impl/parsing.c
-    src/util/impl/percent.c
-    src/util/impl/printing.c
-    src/util/impl/properties.c
-    src/util/impl/settings.c
-    src/util/impl/size.c
-    src/util/impl/temps.c
-    src/util/impl/time.c
-    src/util/impl/edidHelper.c
-    src/util/impl/base64.c
-    src/util/impl/FFlist.c
-    src/util/impl/FFstrbuf.c
-    src/util/impl/kmod.c
-    src/util/impl/path.c
-    src/util/impl/FFPlatform.c
-    src/util/impl/smbiosHelper.c
 )
 
 if(LINUX)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_linux.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_linux.c
         src/detection/bios/bios_linux.c
         src/detection/board/board_linux.c
@@ -578,16 +585,16 @@ if(LINUX)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_linux.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_linux.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_android.c
         src/detection/bios/bios_android.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -651,16 +658,17 @@ elseif(ANDROID)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_android.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_linux.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(FreeBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_bsd.c
         src/detection/bios/bios_bsd.c
         src/detection/bluetoothradio/bluetoothradio_nosupport.c
@@ -732,14 +740,6 @@ elseif(FreeBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
     if(DragonFly)
         list(APPEND LIBFASTFETCH_SRC
@@ -754,6 +754,14 @@ elseif(FreeBSD)
     endif()
 elseif(NetBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nbsd.c
         src/detection/bios/bios_nbsd.c
         src/detection/bluetooth/bluetooth_bsd.c
@@ -825,17 +833,18 @@ elseif(NetBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(OpenBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
+        src/common/impl/smbiosHelper.c
         src/detection/battery/battery_obsd.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -907,18 +916,19 @@ elseif(OpenBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
-        src/util/impl/smbiosHelper.c
     )
 elseif(APPLE)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/io_unix.c
+        src/common/impl/netif_apple.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/apple/cf_helpers.c
+        src/common/impl/apple/osascript.m
+        src/common/impl/apple/smc_temps.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_apple.c
         src/detection/battery/battery_apple.c
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
@@ -977,19 +987,22 @@ elseif(APPLE)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_apple.m
         src/detection/camera/camera_apple.m
-        src/util/impl/io_unix.c
-        src/util/impl/netif_apple.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/apple/cf_helpers.c
-        src/util/impl/apple/osascript.m
-        src/util/impl/apple/smc_temps.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_apple.c
     )
 elseif(WIN32)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/io_windows.c
+        src/common/impl/netif_windows.c
+        src/common/impl/networking_windows.c
+        src/common/impl/processing_windows.c
+        src/common/impl/windows/getline.c
+        src/common/impl/windows/com.cpp
+        src/common/impl/windows/registry.c
+        src/common/impl/windows/unicode.c
+        src/common/impl/windows/wmi.cpp
+        src/common/impl/windows/version.c
+        src/common/impl/FFPlatform_windows.c
+        src/common/impl/binary_windows.c
+        src/common/impl/debug_windows.c
         src/detection/battery/battery_windows.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
@@ -1047,22 +1060,16 @@ elseif(WIN32)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_windows.c
         src/detection/camera/camera_windows.cpp
-        src/util/impl/io_windows.c
-        src/util/impl/netif_windows.c
-        src/util/impl/networking_windows.c
-        src/util/impl/processing_windows.c
-        src/util/impl/windows/getline.c
-        src/util/impl/windows/com.cpp
-        src/util/impl/windows/registry.c
-        src/util/impl/windows/unicode.c
-        src/util/impl/windows/wmi.cpp
-        src/util/impl/windows/version.c
-        src/util/impl/FFPlatform_windows.c
-        src/util/impl/binary_windows.c
-        src/util/impl/debug_windows.c
     )
 elseif(SunOS)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_apple.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1134,16 +1141,17 @@ elseif(SunOS)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_apple.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(Haiku)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_haiku.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
+        src/common/impl/haiku/version.cpp
         src/detection/battery/battery_haiku.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1202,17 +1210,16 @@ elseif(Haiku)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_nosupport.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_haiku.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
-        src/util/impl/haiku/version.cpp
     )
 elseif(GNU)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_gnu.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_nosupport.c
         src/detection/board/board_nosupport.c
@@ -1281,13 +1288,6 @@ elseif(GNU)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_gnu.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
    )
 endif()
 
@@ -1308,7 +1308,7 @@ endif()
 include(CheckFunctionExists)
 check_function_exists(wcwidth HAVE_WCWIDTH)
 if(NOT HAVE_WCWIDTH)
-    list(APPEND LIBFASTFETCH_SRC src/util/impl/wcwidth.c)
+    list(APPEND LIBFASTFETCH_SRC src/common/impl/wcwidth.c)
 endif()
 if(NOT WIN32)
     check_function_exists(pipe2 HAVE_PIPE2)
@@ -1881,7 +1881,7 @@ set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
 
 if(WIN32)
     target_sources(fastfetch
-        PRIVATE src/util/impl/windows/version.rc
+        PRIVATE src/common/impl/windows/version.rc
     )
 elseif(APPLE)
     target_link_options(fastfetch
@@ -1909,7 +1909,7 @@ if (BUILD_FLASHFETCH)
 
     if(WIN32)
         target_sources(flashfetch
-            PRIVATE src/util/impl/windows/version.rc
+            PRIVATE src/common/impl/windows/version.rc
         )
     elseif(APPLE)
         target_link_options(flashfetch
diff --git a/src/util/FFPlatform.h b/src/common/FFPlatform.h
similarity index 92%
rename from src/util/FFPlatform.h
rename to src/common/FFPlatform.h
index 2afd730f7..bf3af7856 100644
--- a/src/util/FFPlatform.h
+++ b/src/common/FFPlatform.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 typedef struct FFPlatformSysinfo
 {
diff --git a/src/util/FFcheckmacros.h b/src/common/FFcheckmacros.h
similarity index 100%
rename from src/util/FFcheckmacros.h
rename to src/common/FFcheckmacros.h
diff --git a/src/util/FFlist.h b/src/common/FFlist.h
similarity index 100%
rename from src/util/FFlist.h
rename to src/common/FFlist.h
diff --git a/src/util/FFstrbuf.h b/src/common/FFstrbuf.h
similarity index 100%
rename from src/util/FFstrbuf.h
rename to src/common/FFstrbuf.h
diff --git a/src/util/apple/Info.plist.in b/src/common/apple/Info.plist.in
similarity index 100%
rename from src/util/apple/Info.plist.in
rename to src/common/apple/Info.plist.in
diff --git a/src/util/apple/cf_helpers.c b/src/common/apple/cf_helpers.c
similarity index 100%
rename from src/util/apple/cf_helpers.c
rename to src/common/apple/cf_helpers.c
diff --git a/src/util/apple/cf_helpers.h b/src/common/apple/cf_helpers.h
similarity index 100%
rename from src/util/apple/cf_helpers.h
rename to src/common/apple/cf_helpers.h
diff --git a/src/util/apple/osascript.h b/src/common/apple/osascript.h
similarity index 100%
rename from src/util/apple/osascript.h
rename to src/common/apple/osascript.h
diff --git a/src/util/apple/osascript.m b/src/common/apple/osascript.m
similarity index 100%
rename from src/util/apple/osascript.m
rename to src/common/apple/osascript.m
diff --git a/src/util/apple/smc_temps.c b/src/common/apple/smc_temps.c
similarity index 99%
rename from src/util/apple/smc_temps.c
rename to src/common/apple/smc_temps.c
index bd89b0138..708ae7437 100644
--- a/src/util/apple/smc_temps.c
+++ b/src/common/apple/smc_temps.c
@@ -1,6 +1,6 @@
 #include "smc_temps.h"
-#include "util/apple/cf_helpers.h"
-#include "util/stringUtils.h"
+#include "common/apple/cf_helpers.h"
+#include "common/stringUtils.h"
 
 #include <stdint.h>
 #include <math.h>
diff --git a/src/util/apple/smc_temps.h b/src/common/apple/smc_temps.h
similarity index 100%
rename from src/util/apple/smc_temps.h
rename to src/common/apple/smc_temps.h
diff --git a/src/util/arrayUtils.h b/src/common/arrayUtils.h
similarity index 100%
rename from src/util/arrayUtils.h
rename to src/common/arrayUtils.h
diff --git a/src/util/base64.h b/src/common/base64.h
similarity index 100%
rename from src/util/base64.h
rename to src/common/base64.h
diff --git a/src/util/binary.h b/src/common/binary.h
similarity index 100%
rename from src/util/binary.h
rename to src/common/binary.h
diff --git a/src/util/color.h b/src/common/color.h
similarity index 100%
rename from src/util/color.h
rename to src/common/color.h
diff --git a/src/util/commandoption.h b/src/common/commandoption.h
similarity index 100%
rename from src/util/commandoption.h
rename to src/common/commandoption.h
diff --git a/src/util/dbus.h b/src/common/dbus.h
similarity index 97%
rename from src/util/dbus.h
rename to src/common/dbus.h
index 50cffdcee..ee5eb432c 100644
--- a/src/util/dbus.h
+++ b/src/common/dbus.h
@@ -3,8 +3,8 @@
 #ifdef FF_HAVE_DBUS
 #include <dbus/dbus.h>
 
-#include "util/FFstrbuf.h"
-#include "util/library.h"
+#include "common/FFstrbuf.h"
+#include "common/library.h"
 
 typedef struct FFDBusLibrary
 {
diff --git a/src/util/debug.h b/src/common/debug.h
similarity index 97%
rename from src/util/debug.h
rename to src/common/debug.h
index 2b0047e5f..770fd7133 100644
--- a/src/util/debug.h
+++ b/src/common/debug.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/time.h"
+#include "common/time.h"
 
 static inline const char* ffFindFileName(const char* file)
 {
diff --git a/src/util/duration.h b/src/common/duration.h
similarity index 100%
rename from src/util/duration.h
rename to src/common/duration.h
diff --git a/src/util/edidHelper.h b/src/common/edidHelper.h
similarity index 95%
rename from src/util/edidHelper.h
rename to src/common/edidHelper.h
index cad9e6ce9..d36793772 100644
--- a/src/util/edidHelper.h
+++ b/src/common/edidHelper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 void ffEdidGetVendorAndModel(const uint8_t edid[128], FFstrbuf* result);
 bool ffEdidGetName(const uint8_t edid[128], FFstrbuf* name);
diff --git a/src/util/font.h b/src/common/font.h
similarity index 92%
rename from src/util/font.h
rename to src/common/font.h
index ac6932c8b..e10817eec 100644
--- a/src/util/font.h
+++ b/src/common/font.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 typedef struct FFfont
 {
diff --git a/src/util/format.h b/src/common/format.h
similarity index 98%
rename from src/util/format.h
rename to src/common/format.h
index d4ded993b..70fa4a15e 100644
--- a/src/util/format.h
+++ b/src/common/format.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 typedef enum __attribute__((__packed__)) FFformatArgType
 {
diff --git a/src/util/frequency.h b/src/common/frequency.h
similarity index 100%
rename from src/util/frequency.h
rename to src/common/frequency.h
diff --git a/src/util/haiku/version.cpp b/src/common/haiku/version.cpp
similarity index 100%
rename from src/util/haiku/version.cpp
rename to src/common/haiku/version.cpp
diff --git a/src/util/haiku/version.h b/src/common/haiku/version.h
similarity index 69%
rename from src/util/haiku/version.h
rename to src/common/haiku/version.h
index 829801a88..4f047a218 100644
--- a/src/util/haiku/version.h
+++ b/src/common/haiku/version.h
@@ -1,3 +1,3 @@
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 bool ffGetFileVersion(const char* filePath, FFstrbuf* version);
diff --git a/src/util/impl/FFPlatform.c b/src/common/impl/FFPlatform.c
similarity index 97%
rename from src/util/impl/FFPlatform.c
rename to src/common/impl/FFPlatform.c
index 37c23cb1f..399559799 100644
--- a/src/util/impl/FFPlatform.c
+++ b/src/common/impl/FFPlatform.c
@@ -1,6 +1,6 @@
 #include "FFPlatform_private.h"
-#include "util/stringUtils.h"
-#include "util/io.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "detection/version/version.h"
 
 void ffPlatformInit(FFPlatform* platform)
diff --git a/src/util/impl/FFPlatform_private.h b/src/common/impl/FFPlatform_private.h
similarity index 87%
rename from src/util/impl/FFPlatform_private.h
rename to src/common/impl/FFPlatform_private.h
index 8c6842f8b..e9dfd7163 100644
--- a/src/util/impl/FFPlatform_private.h
+++ b/src/common/impl/FFPlatform_private.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFPlatform.h"
+#include "common/FFPlatform.h"
 
 void ffPlatformInitImpl(FFPlatform* platform);
 
diff --git a/src/util/impl/FFPlatform_unix.c b/src/common/impl/FFPlatform_unix.c
similarity index 98%
rename from src/util/impl/FFPlatform_unix.c
rename to src/common/impl/FFPlatform_unix.c
index 4827df273..6b25bd537 100644
--- a/src/util/impl/FFPlatform_unix.c
+++ b/src/common/impl/FFPlatform_unix.c
@@ -1,7 +1,7 @@
 #include "FFPlatform_private.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
-#include "util/io.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "fastfetch_config.h"
 
 #include <unistd.h>
diff --git a/src/util/impl/FFPlatform_windows.c b/src/common/impl/FFPlatform_windows.c
similarity index 98%
rename from src/util/impl/FFPlatform_windows.c
rename to src/common/impl/FFPlatform_windows.c
index dc22900b1..d5b7433e6 100644
--- a/src/util/impl/FFPlatform_windows.c
+++ b/src/common/impl/FFPlatform_windows.c
@@ -1,10 +1,10 @@
 #include "FFPlatform_private.h"
-#include "util/io.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/windows/unicode.h"
-#include "util/windows/registry.h"
-#include "util/windows/nt.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/windows/nt.h"
 
 #include <windows.h>
 #include <shlobj.h>
diff --git a/src/util/impl/FFlist.c b/src/common/impl/FFlist.c
similarity index 97%
rename from src/util/impl/FFlist.c
rename to src/common/impl/FFlist.c
index b03e3fca5..55dc28671 100644
--- a/src/util/impl/FFlist.c
+++ b/src/common/impl/FFlist.c
@@ -1,4 +1,4 @@
-#include "util/FFlist.h"
+#include "common/FFlist.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/util/impl/FFstrbuf.c b/src/common/impl/FFstrbuf.c
similarity index 99%
rename from src/util/impl/FFstrbuf.c
rename to src/common/impl/FFstrbuf.c
index b2941afe9..d65902108 100644
--- a/src/util/impl/FFstrbuf.c
+++ b/src/common/impl/FFstrbuf.c
@@ -1,5 +1,5 @@
-#include "util/FFstrbuf.h"
-#include "util/mallocHelper.h"
+#include "common/FFstrbuf.h"
+#include "common/mallocHelper.h"
 
 #include <ctype.h>
 #include <inttypes.h>
diff --git a/src/util/impl/base64.c b/src/common/impl/base64.c
similarity index 99%
rename from src/util/impl/base64.c
rename to src/common/impl/base64.c
index 7c424684d..0567b75ed 100644
--- a/src/util/impl/base64.c
+++ b/src/common/impl/base64.c
@@ -1,4 +1,4 @@
-#include "util/base64.h"
+#include "common/base64.h"
 
 // https://github.com/kostya/benchmarks/blob/master/base64/test-nolib.c#L145
 void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output)
diff --git a/src/util/impl/binary_apple.c b/src/common/impl/binary_apple.c
similarity index 98%
rename from src/util/impl/binary_apple.c
rename to src/common/impl/binary_apple.c
index fdbeb77bd..dee65b6a6 100644
--- a/src/util/impl/binary_apple.c
+++ b/src/common/impl/binary_apple.c
@@ -1,7 +1,7 @@
-#include "util/binary.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/util/impl/binary_linux.c b/src/common/impl/binary_linux.c
similarity index 97%
rename from src/util/impl/binary_linux.c
rename to src/common/impl/binary_linux.c
index c418a93d3..d6ecf15b5 100644
--- a/src/util/impl/binary_linux.c
+++ b/src/common/impl/binary_linux.c
@@ -1,10 +1,10 @@
-#include "util/binary.h"
+#include "common/binary.h"
 
 #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__)
 
-#include "util/io.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
 
 #include <libelf.h> // #1254
 #include <fcntl.h>
diff --git a/src/util/impl/binary_windows.c b/src/common/impl/binary_windows.c
similarity index 94%
rename from src/util/impl/binary_windows.c
rename to src/common/impl/binary_windows.c
index feeead17e..b6f0bb1fa 100644
--- a/src/util/impl/binary_windows.c
+++ b/src/common/impl/binary_windows.c
@@ -1,7 +1,7 @@
-#include "util/binary.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <windows.h>
 #include <imagehlp.h>
diff --git a/src/util/impl/commandoption.c b/src/common/impl/commandoption.c
similarity index 97%
rename from src/util/impl/commandoption.c
rename to src/common/impl/commandoption.c
index d6c9301b4..e19be4edc 100644
--- a/src/util/impl/commandoption.c
+++ b/src/common/impl/commandoption.c
@@ -1,9 +1,9 @@
-#include "util/commandoption.h"
-#include "util/color.h"
-#include "util/printing.h"
-#include "util/time.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/commandoption.h"
+#include "common/color.h"
+#include "common/printing.h"
+#include "common/time.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "fastfetch_datatext.h"
 #include "modules/modules.h"
 
diff --git a/src/util/impl/dbus.c b/src/common/impl/dbus.c
similarity index 99%
rename from src/util/impl/dbus.c
rename to src/common/impl/dbus.c
index 1455f3735..87aacdf85 100644
--- a/src/util/impl/dbus.c
+++ b/src/common/impl/dbus.c
@@ -1,9 +1,9 @@
-#include "util/dbus.h"
+#include "common/dbus.h"
 
 #ifdef FF_HAVE_DBUS
 
-#include "util/thread.h"
-#include "util/stringUtils.h"
+#include "common/thread.h"
+#include "common/stringUtils.h"
 
 static bool loadLibSymbols(FFDBusLibrary* lib)
 {
diff --git a/src/util/impl/debug_windows.c b/src/common/impl/debug_windows.c
similarity index 96%
rename from src/util/impl/debug_windows.c
rename to src/common/impl/debug_windows.c
index b1a1fbc40..c1eb2c1b2 100644
--- a/src/util/impl/debug_windows.c
+++ b/src/common/impl/debug_windows.c
@@ -1,4 +1,4 @@
-#include "util/debug.h"
+#include "common/debug.h"
 
 #include <windows.h>
 
diff --git a/src/util/impl/duration.c b/src/common/impl/duration.c
similarity index 98%
rename from src/util/impl/duration.c
rename to src/common/impl/duration.c
index 1449bf13d..a767ca386 100644
--- a/src/util/impl/duration.c
+++ b/src/common/impl/duration.c
@@ -1,4 +1,4 @@
-#include "util/duration.h"
+#include "common/duration.h"
 
 void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result)
 {
diff --git a/src/util/impl/edidHelper.c b/src/common/impl/edidHelper.c
similarity index 99%
rename from src/util/impl/edidHelper.c
rename to src/common/impl/edidHelper.c
index 2bb8cad36..240d714e8 100644
--- a/src/util/impl/edidHelper.c
+++ b/src/common/impl/edidHelper.c
@@ -1,4 +1,4 @@
-#include "util/edidHelper.h"
+#include "common/edidHelper.h"
 
 void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint32_t* height)
 {
diff --git a/src/util/impl/font.c b/src/common/impl/font.c
similarity index 99%
rename from src/util/impl/font.c
rename to src/common/impl/font.c
index e506f6376..7548ab2de 100644
--- a/src/util/impl/font.c
+++ b/src/common/impl/font.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/FFlist.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
-#include "util/font.h"
+#include "common/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
+#include "common/font.h"
 
 #include <string.h>
 #include <ctype.h>
diff --git a/src/util/impl/format.c b/src/common/impl/format.c
similarity index 99%
rename from src/util/impl/format.c
rename to src/common/impl/format.c
index 132ad32d9..469aceed4 100644
--- a/src/util/impl/format.c
+++ b/src/common/impl/format.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/format.h"
-#include "util/parsing.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/format.h"
+#include "common/parsing.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 #include <inttypes.h>
 
diff --git a/src/util/impl/frequency.c b/src/common/impl/frequency.c
similarity index 95%
rename from src/util/impl/frequency.c
rename to src/common/impl/frequency.c
index 41bbf7246..3e5185be4 100644
--- a/src/util/impl/frequency.c
+++ b/src/common/impl/frequency.c
@@ -1,4 +1,4 @@
-#include "util/frequency.h"
+#include "common/frequency.h"
 
 bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result)
 {
diff --git a/src/util/impl/init.c b/src/common/impl/init.c
similarity index 97%
rename from src/util/impl/init.c
rename to src/common/impl/init.c
index e0f3f80be..0e38be713 100644
--- a/src/util/impl/init.c
+++ b/src/common/impl/init.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/init.h"
-#include "util/parsing.h"
-#include "util/thread.h"
-#include "util/textModifier.h"
+#include "common/init.h"
+#include "common/parsing.h"
+#include "common/thread.h"
+#include "common/textModifier.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "logo/logo.h"
@@ -12,7 +12,7 @@
 #include <locale.h>
 #ifdef _WIN32
     #include <windows.h>
-    #include "util/windows/unicode.h"
+    #include "common/windows/unicode.h"
 #else
     #include <signal.h>
 #endif
diff --git a/src/util/impl/io_unix.c b/src/common/impl/io_unix.c
similarity index 99%
rename from src/util/impl/io_unix.c
rename to src/common/impl/io_unix.c
index 8d59ba698..63fc81e4d 100644
--- a/src/util/impl/io_unix.c
+++ b/src/common/impl/io_unix.c
@@ -1,7 +1,7 @@
-#include "util/io.h"
+#include "common/io.h"
 #include "fastfetch.h"
-#include "util/stringUtils.h"
-#include "util/time.h"
+#include "common/stringUtils.h"
+#include "common/time.h"
 
 #include <fcntl.h>
 #include <termios.h>
diff --git a/src/util/impl/io_windows.c b/src/common/impl/io_windows.c
similarity index 99%
rename from src/util/impl/io_windows.c
rename to src/common/impl/io_windows.c
index e894d4808..bdaaea198 100644
--- a/src/util/impl/io_windows.c
+++ b/src/common/impl/io_windows.c
@@ -1,9 +1,9 @@
-#include "util/io.h"
+#include "common/io.h"
 #include "fastfetch.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <windows.h>
-#include "util/windows/nt.h"
+#include "common/windows/nt.h"
 #include <ntstatus.h>
 
 static void createSubfolders(const char* fileName)
diff --git a/src/util/impl/jsonconfig.c b/src/common/impl/jsonconfig.c
similarity index 98%
rename from src/util/impl/jsonconfig.c
rename to src/common/impl/jsonconfig.c
index 3c9334c5d..f1e270b48 100644
--- a/src/util/impl/jsonconfig.c
+++ b/src/common/impl/jsonconfig.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/color.h"
-#include "util/jsonconfig.h"
-#include "util/printing.h"
-#include "util/io.h"
-#include "util/time.h"
-#include "util/stringUtils.h"
+#include "common/color.h"
+#include "common/jsonconfig.h"
+#include "common/printing.h"
+#include "common/io.h"
+#include "common/time.h"
+#include "common/stringUtils.h"
 #include "detection/version/version.h"
 #include "modules/modules.h"
 
diff --git a/src/util/impl/kmod.c b/src/common/impl/kmod.c
similarity index 95%
rename from src/util/impl/kmod.c
rename to src/common/impl/kmod.c
index 46d0b6353..145c6ab78 100644
--- a/src/util/impl/kmod.c
+++ b/src/common/impl/kmod.c
@@ -1,7 +1,7 @@
-#include "util/kmod.h"
+#include "common/kmod.h"
 
 #if __linux__
-#include "util/io.h"
+#include "common/io.h"
 
 bool ffKmodLoaded(const char* modName)
 {
@@ -32,7 +32,7 @@ bool ffKmodLoaded(const char* modName)
     return modfind(modName) >= 0;
 }
 #elif __NetBSD__
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <sys/module.h>
 #include <sys/param.h>
@@ -75,7 +75,7 @@ bool ffKmodLoaded(const char* modName)
     return false;
 }
 #elif __APPLE__
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 #include <IOKit/kext/KextManager.h>
 #include <CoreFoundation/CoreFoundation.h>
 
diff --git a/src/util/impl/library.c b/src/common/impl/library.c
similarity index 98%
rename from src/util/impl/library.c
rename to src/common/impl/library.c
index 1ff1c02c2..8a47a1039 100644
--- a/src/util/impl/library.c
+++ b/src/common/impl/library.c
@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #ifndef FF_DISABLE_DLOPEN
 
diff --git a/src/util/impl/netif.c b/src/common/impl/netif.c
similarity index 96%
rename from src/util/impl/netif.c
rename to src/common/impl/netif.c
index 466e990f9..708399bfa 100644
--- a/src/util/impl/netif.c
+++ b/src/common/impl/netif.c
@@ -1,4 +1,4 @@
-#include "util/netif.h"
+#include "common/netif.h"
 
 #ifndef _WIN32
     #include <net/if.h>
diff --git a/src/util/impl/netif_apple.c b/src/common/impl/netif_apple.c
similarity index 98%
rename from src/util/impl/netif_apple.c
rename to src/common/impl/netif_apple.c
index 1ce541317..54128ec9c 100644
--- a/src/util/impl/netif_apple.c
+++ b/src/common/impl/netif_apple.c
@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/src/util/impl/netif_bsd.c b/src/common/impl/netif_bsd.c
similarity index 98%
rename from src/util/impl/netif_bsd.c
rename to src/common/impl/netif_bsd.c
index bd85c5ea6..a5b240c00 100644
--- a/src/util/impl/netif_bsd.c
+++ b/src/common/impl/netif_bsd.c
@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/src/util/impl/netif_gnu.c b/src/common/impl/netif_gnu.c
similarity index 94%
rename from src/util/impl/netif_gnu.c
rename to src/common/impl/netif_gnu.c
index 9cc6acb21..219bbebab 100644
--- a/src/util/impl/netif_gnu.c
+++ b/src/common/impl/netif_gnu.c
@@ -1,5 +1,5 @@
-#include "util/netif.h"
-#include "util/io.h"
+#include "common/netif.h"
+#include "common/io.h"
 
 #include <net/if.h>
 #include <stdio.h>
diff --git a/src/util/impl/netif_haiku.c b/src/common/impl/netif_haiku.c
similarity index 97%
rename from src/util/impl/netif_haiku.c
rename to src/common/impl/netif_haiku.c
index 3e39290e0..faa3ee876 100644
--- a/src/util/impl/netif_haiku.c
+++ b/src/common/impl/netif_haiku.c
@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <arpa/inet.h>
 #include <net/if.h>
diff --git a/src/util/impl/netif_linux.c b/src/common/impl/netif_linux.c
similarity index 99%
rename from src/util/impl/netif_linux.c
rename to src/common/impl/netif_linux.c
index 493fd4e11..03ade7d9d 100644
--- a/src/util/impl/netif_linux.c
+++ b/src/common/impl/netif_linux.c
@@ -1,7 +1,7 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
diff --git a/src/util/impl/netif_windows.c b/src/common/impl/netif_windows.c
similarity index 98%
rename from src/util/impl/netif_windows.c
rename to src/common/impl/netif_windows.c
index 0eeba1ce3..a78bbfba0 100644
--- a/src/util/impl/netif_windows.c
+++ b/src/common/impl/netif_windows.c
@@ -1,5 +1,5 @@
-#include "util/netif.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
 
 #include <ws2tcpip.h> // AF_INET6, IN6_IS_ADDR_UNSPECIFIED
 #include <iphlpapi.h>
diff --git a/src/util/impl/networking_common.c b/src/common/impl/networking_common.c
similarity index 98%
rename from src/util/impl/networking_common.c
rename to src/common/impl/networking_common.c
index d799566eb..7cb1bc4ad 100644
--- a/src/util/impl/networking_common.c
+++ b/src/common/impl/networking_common.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/library.h"
-#include "util/networking.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/library.h"
+#include "common/networking.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 #ifdef FF_HAVE_ZLIB
 #include <zlib.h>
diff --git a/src/util/impl/networking_linux.c b/src/common/impl/networking_linux.c
similarity index 99%
rename from src/util/impl/networking_linux.c
rename to src/common/impl/networking_linux.c
index f407d133a..e90e243d4 100644
--- a/src/util/impl/networking_linux.c
+++ b/src/common/impl/networking_linux.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/networking.h"
-#include "util/time.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/networking.h"
+#include "common/time.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 #include <unistd.h>
 #include <poll.h>
diff --git a/src/util/impl/networking_windows.c b/src/common/impl/networking_windows.c
similarity index 99%
rename from src/util/impl/networking_windows.c
rename to src/common/impl/networking_windows.c
index 7f0d70699..3131e770b 100644
--- a/src/util/impl/networking_windows.c
+++ b/src/common/impl/networking_windows.c
@@ -3,9 +3,9 @@
 
 //Must be included after <mswsock.h>
 #include "fastfetch.h"
-#include "util/networking.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/networking.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 static LPFN_CONNECTEX ConnectEx;
 
diff --git a/src/util/impl/option.c b/src/common/impl/option.c
similarity index 98%
rename from src/util/impl/option.c
rename to src/common/impl/option.c
index 3a808986d..d5a5fabaf 100644
--- a/src/util/impl/option.c
+++ b/src/common/impl/option.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/option.h"
-#include "util/color.h"
-#include "util/stringUtils.h"
+#include "common/option.h"
+#include "common/color.h"
+#include "common/stringUtils.h"
 
 // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise
 const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName)
diff --git a/src/util/impl/parsing.c b/src/common/impl/parsing.c
similarity index 99%
rename from src/util/impl/parsing.c
rename to src/common/impl/parsing.c
index fbd7f1208..668a28773 100644
--- a/src/util/impl/parsing.c
+++ b/src/common/impl/parsing.c
@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "util/parsing.h"
+#include "common/parsing.h"
 
 #include <ctype.h>
 
diff --git a/src/util/impl/path.c b/src/common/impl/path.c
similarity index 94%
rename from src/util/impl/path.c
rename to src/common/impl/path.c
index 7d2aa032c..7a960c1ad 100644
--- a/src/util/impl/path.c
+++ b/src/common/impl/path.c
@@ -1,6 +1,6 @@
-#include "util/path.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/path.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #if !_WIN32
 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result)
diff --git a/src/util/impl/percent.c b/src/common/impl/percent.c
similarity index 98%
rename from src/util/impl/percent.c
rename to src/common/impl/percent.c
index 7f7d5e222..1ab0c1e57 100644
--- a/src/util/impl/percent.c
+++ b/src/common/impl/percent.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/percent.h"
-#include "util/color.h"
-#include "util/option.h"
-#include "util/jsonconfig.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/color.h"
+#include "common/option.h"
+#include "common/jsonconfig.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 static void appendOutputColor(FFstrbuf* buffer, const FFModuleArgs* module)
 {
diff --git a/src/util/impl/printing.c b/src/common/impl/printing.c
similarity index 98%
rename from src/util/impl/printing.c
rename to src/common/impl/printing.c
index a3e0595eb..b851864b5 100644
--- a/src/util/impl/printing.c
+++ b/src/common/impl/printing.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/printing.h"
-#include "util/textModifier.h"
+#include "common/printing.h"
+#include "common/textModifier.h"
 #include "logo/logo.h"
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)
diff --git a/src/util/impl/processing_linux.c b/src/common/impl/processing_linux.c
similarity index 99%
rename from src/util/impl/processing_linux.c
rename to src/common/impl/processing_linux.c
index 64e549066..c270ab01a 100644
--- a/src/util/impl/processing_linux.c
+++ b/src/common/impl/processing_linux.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/processing.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/processing.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/util/impl/processing_windows.c b/src/common/impl/processing_windows.c
similarity index 99%
rename from src/util/impl/processing_windows.c
rename to src/common/impl/processing_windows.c
index 142005224..4a5ec4373 100644
--- a/src/util/impl/processing_windows.c
+++ b/src/common/impl/processing_windows.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/processing.h"
-#include "util/io.h"
+#include "common/processing.h"
+#include "common/io.h"
 
 #include <windows.h>
 #include <ntstatus.h>
diff --git a/src/util/impl/properties.c b/src/common/impl/properties.c
similarity index 97%
rename from src/util/impl/properties.c
rename to src/common/impl/properties.c
index 2b36b3dbe..8b7859bdb 100644
--- a/src/util/impl/properties.c
+++ b/src/common/impl/properties.c
@@ -1,12 +1,12 @@
 #include "fastfetch.h"
-#include "util/properties.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/properties.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <ctype.h>
 #ifdef _WIN32
-    #include "util/windows/getline.h"
+    #include "common/windows/getline.h"
 #endif
 
 bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
diff --git a/src/util/impl/settings.c b/src/common/impl/settings.c
similarity index 99%
rename from src/util/impl/settings.c
rename to src/common/impl/settings.c
index b6cf9e398..bb7d820cf 100644
--- a/src/util/impl/settings.c
+++ b/src/common/impl/settings.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/settings.h"
-#include "util/library.h"
-#include "util/thread.h"
-#include "util/io.h"
+#include "common/settings.h"
+#include "common/library.h"
+#include "common/thread.h"
+#include "common/io.h"
 
 #include <string.h>
 
@@ -197,7 +197,7 @@ FFvariant ffSettingsGetGnome(const char* dconfKey, const char* gsettingsSchemaNa
 }
 
 #ifdef FF_HAVE_DBUS
-#include "util/dbus.h"
+#include "common/dbus.h"
 
 FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
 {
diff --git a/src/util/impl/size.c b/src/common/impl/size.c
similarity index 98%
rename from src/util/impl/size.c
rename to src/common/impl/size.c
index 6e29ad535..89e7e0551 100644
--- a/src/util/impl/size.c
+++ b/src/common/impl/size.c
@@ -1,4 +1,4 @@
-#include "util/size.h"
+#include "common/size.h"
 
 #include <inttypes.h>
 
diff --git a/src/util/impl/smbiosHelper.c b/src/common/impl/smbiosHelper.c
similarity index 98%
rename from src/util/impl/smbiosHelper.c
rename to src/common/impl/smbiosHelper.c
index 19c02e658..ba573b181 100644
--- a/src/util/impl/smbiosHelper.c
+++ b/src/common/impl/smbiosHelper.c
@@ -1,8 +1,8 @@
-#include "util/smbiosHelper.h"
-#include "util/io.h"
-#include "util/unused.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/smbiosHelper.h"
+#include "common/io.h"
+#include "common/unused.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 bool ffIsSmbiosValueSet(FFstrbuf* value)
 {
@@ -60,14 +60,14 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header)
 #include <stddef.h>
 
 #ifdef __linux__
-    #include "util/properties.h"
+    #include "common/properties.h"
 #elif defined(__FreeBSD__)
-    #include "util/settings.h"
+    #include "common/settings.h"
     #define loff_t off_t // FreeBSD doesn't have loff_t
 #elif defined(__sun)
     #define loff_t off_t
 #elif defined(__NetBSD__)
-    #include "util/sysctl.h"
+    #include "common/sysctl.h"
     #define loff_t off_t
 #endif
 
diff --git a/src/util/impl/sysctl.c b/src/common/impl/sysctl.c
similarity index 98%
rename from src/util/impl/sysctl.c
rename to src/common/impl/sysctl.c
index 6683c5c9a..9b1c52d11 100644
--- a/src/util/impl/sysctl.c
+++ b/src/common/impl/sysctl.c
@@ -1,4 +1,4 @@
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 #include <stdlib.h>
 
diff --git a/src/util/impl/temps.c b/src/common/impl/temps.c
similarity index 98%
rename from src/util/impl/temps.c
rename to src/common/impl/temps.c
index dd237a649..c3c6f47f3 100644
--- a/src/util/impl/temps.c
+++ b/src/common/impl/temps.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/temps.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/temps.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module)
 {
diff --git a/src/util/impl/time.c b/src/common/impl/time.c
similarity index 98%
rename from src/util/impl/time.c
rename to src/common/impl/time.c
index e596f729f..b49dd0aee 100644
--- a/src/util/impl/time.c
+++ b/src/common/impl/time.c
@@ -1,4 +1,4 @@
-#include "util/time.h"
+#include "common/time.h"
 
 #include <stdio.h>
 
diff --git a/src/util/impl/wcwidth.c b/src/common/impl/wcwidth.c
similarity index 100%
rename from src/util/impl/wcwidth.c
rename to src/common/impl/wcwidth.c
diff --git a/src/util/init.h b/src/common/init.h
similarity index 100%
rename from src/util/init.h
rename to src/common/init.h
diff --git a/src/util/io.h b/src/common/io.h
similarity index 99%
rename from src/util/io.h
rename to src/common/io.h
index 9e3f44d30..340ccff60 100644
--- a/src/util/io.h
+++ b/src/common/io.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 #ifdef _WIN32
     #include <fileapi.h>
diff --git a/src/util/jsonconfig.h b/src/common/jsonconfig.h
similarity index 100%
rename from src/util/jsonconfig.h
rename to src/common/jsonconfig.h
diff --git a/src/util/kmod.h b/src/common/kmod.h
similarity index 100%
rename from src/util/kmod.h
rename to src/common/kmod.h
diff --git a/src/util/library.h b/src/common/library.h
similarity index 99%
rename from src/util/library.h
rename to src/common/library.h
index 2a3b30008..a1197c331 100644
--- a/src/util/library.h
+++ b/src/common/library.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/FFcheckmacros.h"
+#include "common/FFcheckmacros.h"
 
 #ifndef FF_DISABLE_DLOPEN
 
diff --git a/src/util/mallocHelper.h b/src/common/mallocHelper.h
similarity index 100%
rename from src/util/mallocHelper.h
rename to src/common/mallocHelper.h
diff --git a/src/util/netif.h b/src/common/netif.h
similarity index 100%
rename from src/util/netif.h
rename to src/common/netif.h
diff --git a/src/util/networking.h b/src/common/networking.h
similarity index 94%
rename from src/util/networking.h
rename to src/common/networking.h
index 39cf41762..d3285e2aa 100644
--- a/src/util/networking.h
+++ b/src/common/networking.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/thread.h"
-#include "util/FFstrbuf.h"
+#include "common/thread.h"
+#include "common/FFstrbuf.h"
 
 #ifdef _WIN32
     #include <minwindef.h>
diff --git a/src/util/option.h b/src/common/option.h
similarity index 99%
rename from src/util/option.h
rename to src/common/option.h
index 713e5ba53..00a082361 100644
--- a/src/util/option.h
+++ b/src/common/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 struct yyjson_val;
 struct yyjson_mut_doc;
diff --git a/src/util/parsing.h b/src/common/parsing.h
similarity index 95%
rename from src/util/parsing.h
rename to src/common/parsing.h
index f18987906..f870fd185 100644
--- a/src/util/parsing.h
+++ b/src/common/parsing.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 #include <stdint.h>
 
diff --git a/src/util/path.h b/src/common/path.h
similarity index 86%
rename from src/util/path.h
rename to src/common/path.h
index adaad7a36..bec304150 100644
--- a/src/util/path.h
+++ b/src/common/path.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
 
 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result);
 static inline bool ffIsAbsolutePath(const char* path)
diff --git a/src/util/percent.h b/src/common/percent.h
similarity index 95%
rename from src/util/percent.h
rename to src/common/percent.h
index 028d64404..4ce3c2f0b 100644
--- a/src/util/percent.h
+++ b/src/common/percent.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/parsing.h"
-#include "util/option.h"
+#include "common/FFstrbuf.h"
+#include "common/parsing.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFPercentageTypeFlags
 {
diff --git a/src/util/printing.h b/src/common/printing.h
similarity index 97%
rename from src/util/printing.h
rename to src/common/printing.h
index cd6e4e4ae..1ee79d540 100644
--- a/src/util/printing.h
+++ b/src/common/printing.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/format.h"
+#include "common/format.h"
 
 typedef enum __attribute__((__packed__)) FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,
diff --git a/src/util/processing.h b/src/common/processing.h
similarity index 98%
rename from src/util/processing.h
rename to src/common/processing.h
index 7b9f373fd..c62235ca2 100644
--- a/src/util/processing.h
+++ b/src/common/processing.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 #ifndef _WIN32
 #include <sys/types.h> // pid_t
diff --git a/src/util/properties.h b/src/common/properties.h
similarity index 100%
rename from src/util/properties.h
rename to src/common/properties.h
diff --git a/src/util/settings.h b/src/common/settings.h
similarity index 100%
rename from src/util/settings.h
rename to src/common/settings.h
diff --git a/src/util/size.h b/src/common/size.h
similarity index 100%
rename from src/util/size.h
rename to src/common/size.h
diff --git a/src/util/smbiosHelper.h b/src/common/smbiosHelper.h
similarity index 99%
rename from src/util/smbiosHelper.h
rename to src/common/smbiosHelper.h
index 1bce70b48..9518e47cd 100644
--- a/src/util/smbiosHelper.h
+++ b/src/common/smbiosHelper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 bool ffIsSmbiosValueSet(FFstrbuf* value);
 static inline void ffCleanUpSmbiosValue(FFstrbuf* value)
diff --git a/src/util/stringUtils.h b/src/common/stringUtils.h
similarity index 100%
rename from src/util/stringUtils.h
rename to src/common/stringUtils.h
diff --git a/src/util/sysctl.h b/src/common/sysctl.h
similarity index 95%
rename from src/util/sysctl.h
rename to src/common/sysctl.h
index 1d5cc503a..3442c4e91 100644
--- a/src/util/sysctl.h
+++ b/src/common/sysctl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/FFcheckmacros.h"
+#include "common/FFcheckmacros.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/src/util/temps.h b/src/common/temps.h
similarity index 89%
rename from src/util/temps.h
rename to src/common/temps.h
index 1a4cecc7d..f2f8eda89 100644
--- a/src/util/temps.h
+++ b/src/common/temps.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/parsing.h"
-#include "util/option.h"
+#include "common/parsing.h"
+#include "common/option.h"
 
 void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module);
 bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* value, bool* useTemp, FFColorRangeConfig* config);
diff --git a/src/util/textModifier.h b/src/common/textModifier.h
similarity index 100%
rename from src/util/textModifier.h
rename to src/common/textModifier.h
diff --git a/src/util/thread.h b/src/common/thread.h
similarity index 100%
rename from src/util/thread.h
rename to src/common/thread.h
diff --git a/src/util/time.h b/src/common/time.h
similarity index 98%
rename from src/util/time.h
rename to src/common/time.h
index adc3e5f92..cdb345d3c 100644
--- a/src/util/time.h
+++ b/src/common/time.h
@@ -10,7 +10,7 @@
     #include <OS.h>
 #endif
 
-#include "util/arrayUtils.h"
+#include "common/arrayUtils.h"
 
 static inline double ffTimeGetTick(void) //In msec
 {
diff --git a/src/util/unused.h b/src/common/unused.h
similarity index 100%
rename from src/util/unused.h
rename to src/common/unused.h
diff --git a/src/util/wcwidth.h b/src/common/wcwidth.h
similarity index 100%
rename from src/util/wcwidth.h
rename to src/common/wcwidth.h
diff --git a/src/util/windows/c-logo.sh b/src/common/windows/c-logo.sh
similarity index 100%
rename from src/util/windows/c-logo.sh
rename to src/common/windows/c-logo.sh
diff --git a/src/util/windows/com.cpp b/src/common/windows/com.cpp
similarity index 100%
rename from src/util/windows/com.cpp
rename to src/common/windows/com.cpp
diff --git a/src/util/windows/com.hpp b/src/common/windows/com.hpp
similarity index 100%
rename from src/util/windows/com.hpp
rename to src/common/windows/com.hpp
diff --git a/src/util/windows/getline.c b/src/common/windows/getline.c
similarity index 100%
rename from src/util/windows/getline.c
rename to src/common/windows/getline.c
diff --git a/src/util/windows/getline.h b/src/common/windows/getline.h
similarity index 100%
rename from src/util/windows/getline.h
rename to src/common/windows/getline.h
diff --git a/src/util/windows/logo.ico b/src/common/windows/logo.ico
similarity index 100%
rename from src/util/windows/logo.ico
rename to src/common/windows/logo.ico
diff --git a/src/util/windows/logo.svg b/src/common/windows/logo.svg
similarity index 100%
rename from src/util/windows/logo.svg
rename to src/common/windows/logo.svg
diff --git a/src/util/windows/manifest.xml b/src/common/windows/manifest.xml
similarity index 100%
rename from src/util/windows/manifest.xml
rename to src/common/windows/manifest.xml
diff --git a/src/util/windows/nt.h b/src/common/windows/nt.h
similarity index 100%
rename from src/util/windows/nt.h
rename to src/common/windows/nt.h
diff --git a/src/util/windows/perflib_.h b/src/common/windows/perflib_.h
similarity index 100%
rename from src/util/windows/perflib_.h
rename to src/common/windows/perflib_.h
diff --git a/src/util/windows/registry.c b/src/common/windows/registry.c
similarity index 99%
rename from src/util/windows/registry.c
rename to src/common/windows/registry.c
index a324527cd..02aeffb06 100644
--- a/src/util/windows/registry.c
+++ b/src/common/windows/registry.c
@@ -1,6 +1,6 @@
 #include "registry.h"
 #include "unicode.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 static const char* hKey2Str(HKEY hKey)
 {
diff --git a/src/util/windows/registry.h b/src/common/windows/registry.h
similarity index 100%
rename from src/util/windows/registry.h
rename to src/common/windows/registry.h
diff --git a/src/util/windows/unicode.c b/src/common/windows/unicode.c
similarity index 100%
rename from src/util/windows/unicode.c
rename to src/common/windows/unicode.c
diff --git a/src/util/windows/unicode.h b/src/common/windows/unicode.h
similarity index 97%
rename from src/util/windows/unicode.h
rename to src/common/windows/unicode.h
index 9c7cfc01d..8a3162432 100644
--- a/src/util/windows/unicode.h
+++ b/src/common/windows/unicode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 #include <wchar.h>
 
 void ffStrbufSetNWS(FFstrbuf* result, uint32_t length, const wchar_t* source);
diff --git a/src/util/windows/unicode.hpp b/src/common/windows/unicode.hpp
similarity index 100%
rename from src/util/windows/unicode.hpp
rename to src/common/windows/unicode.hpp
diff --git a/src/util/windows/variant.hpp b/src/common/windows/variant.hpp
similarity index 100%
rename from src/util/windows/variant.hpp
rename to src/common/windows/variant.hpp
diff --git a/src/util/windows/version.c b/src/common/windows/version.c
similarity index 95%
rename from src/util/windows/version.c
rename to src/common/windows/version.c
index 684a4fcce..4019edb84 100644
--- a/src/util/windows/version.c
+++ b/src/common/windows/version.c
@@ -1,6 +1,6 @@
-#include "util/windows/version.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/windows/version.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 
diff --git a/src/util/windows/version.h b/src/common/windows/version.h
similarity index 100%
rename from src/util/windows/version.h
rename to src/common/windows/version.h
diff --git a/src/util/windows/version.rc b/src/common/windows/version.rc
similarity index 100%
rename from src/util/windows/version.rc
rename to src/common/windows/version.rc
diff --git a/src/util/windows/wmi.cpp b/src/common/windows/wmi.cpp
similarity index 99%
rename from src/util/windows/wmi.cpp
rename to src/common/windows/wmi.cpp
index 68d560013..74dbb3f19 100644
--- a/src/util/windows/wmi.cpp
+++ b/src/common/windows/wmi.cpp
@@ -1,6 +1,6 @@
 #include "wmi.hpp"
-#include "util/windows/com.hpp"
-#include "util/windows/unicode.hpp"
+#include "common/windows/com.hpp"
+#include "common/windows/unicode.hpp"
 
 #include <synchapi.h>
 #include <wchar.h>
diff --git a/src/util/windows/wmi.hpp b/src/common/windows/wmi.hpp
similarity index 100%
rename from src/util/windows/wmi.hpp
rename to src/common/windows/wmi.hpp
diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c
index fc7f3fcdb..9425dbd19 100644
--- a/src/detection/battery/battery_android.c
+++ b/src/detection/battery/battery_android.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "util/stringUtils.h"
-#include "util/processing.h"
-#include "util/properties.h"
+#include "common/stringUtils.h"
+#include "common/processing.h"
+#include "common/properties.h"
 
 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "BatteryStatus"
diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c
index 3d7ac45c8..d4935de2f 100644
--- a/src/detection/battery/battery_apple.c
+++ b/src/detection/battery/battery_apple.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "util/apple/cf_helpers.h"
-#include "util/apple/smc_temps.h"
+#include "common/apple/cf_helpers.h"
+#include "common/apple/smc_temps.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/pwr_mgt/IOPM.h>
diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c
index 2ce220780..d8ccd97f6 100644
--- a/src/detection/battery/battery_bsd.c
+++ b/src/detection/battery/battery_bsd.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/sysctl.h"
-#include "util/io.h"
+#include "common/sysctl.h"
+#include "common/io.h"
 #include "battery.h"
 
 #include <dev/acpica/acpiio.h>
diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c
index ea3a4515b..54d5978ee 100644
--- a/src/detection/battery/battery_haiku.c
+++ b/src/detection/battery/battery_haiku.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <private/device/power_managment.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c
index 9dc5aa138..d750dc61e 100644
--- a/src/detection/battery/battery_linux.c
+++ b/src/detection/battery/battery_linux.c
@@ -1,6 +1,6 @@
 #include "battery.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <dirent.h>
 #include <unistd.h>
diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
index e142050be..37ef64966 100644
--- a/src/detection/battery/battery_nbsd.c
+++ b/src/detection/battery/battery_nbsd.c
@@ -1,7 +1,7 @@
 #include "battery.h"
-#include "util/io.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
 
 #include <prop/prop_array.h>
 #include <prop/prop_bool.h>
diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c
index ea40c6f2a..2cd5c9e4a 100644
--- a/src/detection/battery/battery_obsd.c
+++ b/src/detection/battery/battery_obsd.c
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <machine/apmvar.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c
index bc9b2c227..ba0111d3a 100644
--- a/src/detection/battery/battery_windows.c
+++ b/src/detection/battery/battery_windows.c
@@ -1,10 +1,10 @@
 #include "battery.h"
 
-#include "util/io.h"
-#include "util/windows/nt.h"
-#include "util/windows/unicode.h"
-#include "util/mallocHelper.h"
-#include "util/smbiosHelper.h"
+#include "common/io.h"
+#include "common/windows/nt.h"
+#include "common/windows/unicode.h"
+#include "common/mallocHelper.h"
+#include "common/smbiosHelper.h"
 
 #undef WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/detection/bios/bios_android.c b/src/detection/bios/bios_android.c
index 256d6d830..b2b20aaf9 100644
--- a/src/detection/bios/bios_android.c
+++ b/src/detection/bios/bios_android.c
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "util/settings.h"
+#include "common/settings.h"
 
 const char* ffDetectBios(FFBiosResult* bios)
 {
diff --git a/src/detection/bios/bios_apple.c b/src/detection/bios/bios_apple.c
index 66815464e..16ef31843 100644
--- a/src/detection/bios/bios_apple.c
+++ b/src/detection/bios/bios_apple.c
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 
diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c
index 6ea271cb7..35f371ab7 100644
--- a/src/detection/bios/bios_bsd.c
+++ b/src/detection/bios/bios_bsd.c
@@ -1,9 +1,9 @@
 #include "bios.h"
 
-#include "util/settings.h"
-#include "util/sysctl.h"
-#include "util/io.h"
-#include "util/smbiosHelper.h"
+#include "common/settings.h"
+#include "common/sysctl.h"
+#include "common/io.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectBios(FFBiosResult* result)
 {
diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c
index f7fd2ddc3..91267a210 100644
--- a/src/detection/bios/bios_linux.c
+++ b/src/detection/bios/bios_linux.c
@@ -1,6 +1,6 @@
 #include "bios.h"
-#include "util/io.h"
-#include "util/smbiosHelper.h"
+#include "common/io.h"
+#include "common/smbiosHelper.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/bios/bios_nbsd.c b/src/detection/bios/bios_nbsd.c
index a1e920b77..10b326dd1 100644
--- a/src/detection/bios/bios_nbsd.c
+++ b/src/detection/bios/bios_nbsd.c
@@ -1,6 +1,6 @@
 #include "bios.h"
-#include "util/sysctl.h"
-#include "util/smbiosHelper.h"
+#include "common/sysctl.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectBios(FFBiosResult* bios)
 {
diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c
index 31dd51e39..059ebce46 100644
--- a/src/detection/bios/bios_windows.c
+++ b/src/detection/bios/bios_windows.c
@@ -1,8 +1,8 @@
 #include "bios.h"
-#include "util/smbiosHelper.h"
+#include "common/smbiosHelper.h"
 
 #ifdef _WIN32
-#include "util/windows/registry.h"
+#include "common/windows/registry.h"
 
 #include <ntstatus.h>
 #include <winternl.h>
@@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
     };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
 #elif __OpenBSD__
-#include "util/io.h"
+#include "common/io.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/detection/bluetooth/bluetooth_haiku.cpp b/src/detection/bluetooth/bluetooth_haiku.cpp
index 6c7280840..188d2a845 100644
--- a/src/detection/bluetooth/bluetooth_haiku.cpp
+++ b/src/detection/bluetooth/bluetooth_haiku.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "bluetooth.h"
-#include "util/io.h"
+#include "common/io.h"
 }
 
 #include <bluetooth/LocalDevice.h>
diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c
index 42fed40cf..162e60a51 100644
--- a/src/detection/bluetooth/bluetooth_linux.c
+++ b/src/detection/bluetooth/bluetooth_linux.c
@@ -1,9 +1,9 @@
 #include "bluetooth.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #ifdef FF_HAVE_DBUS
-#include "util/dbus.h"
-#include "util/io.h"
+#include "common/dbus.h"
+#include "common/io.h"
 
 /* Example dbus reply, striped to only the relevant parts:
 array [                                                     //root
diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c
index 841695668..050929fee 100644
--- a/src/detection/bluetooth/bluetooth_windows.c
+++ b/src/detection/bluetooth/bluetooth_windows.c
@@ -1,6 +1,6 @@
 #include "bluetooth.h"
-#include "util/library.h"
-#include "util/windows/unicode.h"
+#include "common/library.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <bluetoothapis.h>
diff --git a/src/detection/bluetooth/bluetooth_windows.cpp b/src/detection/bluetooth/bluetooth_windows.cpp
index e995d2376..069084b24 100644
--- a/src/detection/bluetooth/bluetooth_windows.cpp
+++ b/src/detection/bluetooth/bluetooth_windows.cpp
@@ -2,8 +2,8 @@ extern "C"
 {
 #include "bluetooth.h"
 }
-#include "util/windows/wmi.hpp"
-#include "util/windows/unicode.hpp"
+#include "common/windows/wmi.hpp"
+#include "common/windows/unicode.hpp"
 
 STDAPI InitVariantFromStringArray(_In_reads_(cElems) PCWSTR *prgsz, _In_ ULONG cElems, _Out_ VARIANT *pvar);
 
diff --git a/src/detection/bluetoothradio/bluetoothradio_apple.m b/src/detection/bluetoothradio/bluetoothradio_apple.m
index 0e9ceb0e9..63af39d9c 100644
--- a/src/detection/bluetoothradio/bluetoothradio_apple.m
+++ b/src/detection/bluetoothradio/bluetoothradio_apple.m
@@ -1,5 +1,5 @@
 #include "bluetoothradio.h"
-#include "util/processing.h"
+#include "common/processing.h"
 
 #import <IOBluetooth/IOBluetooth.h>
 
diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c
index 1b3ec4ed5..f7f3971ba 100644
--- a/src/detection/bluetoothradio/bluetoothradio_linux.c
+++ b/src/detection/bluetoothradio/bluetoothradio_linux.c
@@ -1,9 +1,9 @@
 #include "bluetoothradio.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #ifdef FF_HAVE_DBUS
-#include "util/dbus.h"
-#include "util/io.h"
+#include "common/dbus.h"
+#include "common/io.h"
 
 /* Example dbus reply:
 array [
diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c
index 610602444..057bf2933 100644
--- a/src/detection/bluetoothradio/bluetoothradio_windows.c
+++ b/src/detection/bluetoothradio/bluetoothradio_windows.c
@@ -1,7 +1,7 @@
 #include "bluetoothradio.h"
-#include "util/library.h"
-#include "util/io.h"
-#include "util/windows/unicode.h"
+#include "common/library.h"
+#include "common/io.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <bluetoothapis.h>
diff --git a/src/detection/board/board_android.c b/src/detection/board/board_android.c
index c1d504062..64e917e6a 100644
--- a/src/detection/board/board_android.c
+++ b/src/detection/board/board_android.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "util/settings.h"
+#include "common/settings.h"
 
 const char* ffDetectBoard(FFBoardResult* board)
 {
diff --git a/src/detection/board/board_apple.c b/src/detection/board/board_apple.c
index 1a760fd8b..6e93165b1 100644
--- a/src/detection/board/board_apple.c
+++ b/src/detection/board/board_apple.c
@@ -1,6 +1,6 @@
 #include "board.h"
 
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 const char* ffDetectBoard(FFBoardResult* result)
 {
diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c
index 4f138286e..537ca35ad 100644
--- a/src/detection/board/board_bsd.c
+++ b/src/detection/board/board_bsd.c
@@ -1,6 +1,6 @@
 #include "board.h"
-#include "util/settings.h"
-#include "util/smbiosHelper.h"
+#include "common/settings.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectBoard(FFBoardResult* result)
 {
diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c
index 1afeeef21..1a10ea3eb 100644
--- a/src/detection/board/board_linux.c
+++ b/src/detection/board/board_linux.c
@@ -1,6 +1,6 @@
 #include "board.h"
-#include "util/io.h"
-#include "util/smbiosHelper.h"
+#include "common/io.h"
+#include "common/smbiosHelper.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c
index bcb713f5d..bfe419020 100644
--- a/src/detection/board/board_nbsd.c
+++ b/src/detection/board/board_nbsd.c
@@ -1,6 +1,6 @@
 #include "board.h"
-#include "util/sysctl.h"
-#include "util/smbiosHelper.h"
+#include "common/sysctl.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectBoard(FFBoardResult* board)
 {
diff --git a/src/detection/board/board_windows.c b/src/detection/board/board_windows.c
index bec6192e7..aeb7176c6 100644
--- a/src/detection/board/board_windows.c
+++ b/src/detection/board/board_windows.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "util/smbiosHelper.h"
+#include "common/smbiosHelper.h"
 
 typedef struct FFSmbiosBaseboard
 {
diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c
index 3bedb95cc..c7e1bde73 100644
--- a/src/detection/bootmgr/bootmgr_apple.c
+++ b/src/detection/bootmgr/bootmgr_apple.c
@@ -1,6 +1,6 @@
 #include "bootmgr.h"
-#include "util/io.h"
-#include "util/apple/cf_helpers.h"
+#include "common/io.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 
diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c
index c16773a73..ce9663b61 100644
--- a/src/detection/bootmgr/bootmgr_bsd.c
+++ b/src/detection/bootmgr/bootmgr_bsd.c
@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #ifdef __OpenBSD__
     #include <dev/efi/efiio.h>
diff --git a/src/detection/bootmgr/bootmgr_linux.c b/src/detection/bootmgr/bootmgr_linux.c
index e29fc0794..aef323ad6 100644
--- a/src/detection/bootmgr/bootmgr_linux.c
+++ b/src/detection/bootmgr/bootmgr_linux.c
@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "util/io.h"
+#include "common/io.h"
 #include "efi_helper.h"
 
 #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/"
diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c
index 21d527cc8..cb6a974b3 100644
--- a/src/detection/bootmgr/bootmgr_windows.c
+++ b/src/detection/bootmgr/bootmgr_windows.c
@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <windows.h>
 
diff --git a/src/detection/brightness/brightness_apple.c b/src/detection/brightness/brightness_apple.c
index a6a77b2af..2ea39afd0 100644
--- a/src/detection/brightness/brightness_apple.c
+++ b/src/detection/brightness/brightness_apple.c
@@ -1,7 +1,7 @@
 #include "brightness.h"
 #include "detection/displayserver/displayserver.h"
-#include "util/apple/cf_helpers.h"
-#include "util/edidHelper.h"
+#include "common/apple/cf_helpers.h"
+#include "common/edidHelper.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 
diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c
index de5d585a7..fb574e46e 100644
--- a/src/detection/brightness/brightness_bsd.c
+++ b/src/detection/brightness/brightness_bsd.c
@@ -2,7 +2,7 @@
 
 #if __has_include(<sys/backlight.h>)
 
-#include "util/io.h"
+#include "common/io.h"
 
 #include <sys/backlight.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c
index c52e36ff6..2afbec184 100644
--- a/src/detection/brightness/brightness_linux.c
+++ b/src/detection/brightness/brightness_linux.c
@@ -1,7 +1,7 @@
 #include "brightness.h"
-#include "util/io.h"
-#include "util/edidHelper.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/edidHelper.h"
+#include "common/stringUtils.h"
 
 #include <dirent.h>
 #include <limits.h>
@@ -87,8 +87,8 @@ static const char* detectWithBacklight(FFlist* result)
 
 #ifdef FF_HAVE_DDCUTIL
 #include "detection/displayserver/displayserver.h"
-#include "util/library.h"
-#include "util/mallocHelper.h"
+#include "common/library.h"
+#include "common/mallocHelper.h"
 
 #include <ddcutil_macros.h>
 #include <ddcutil_c_api.h>
diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c
index 3e5b629b2..67464772e 100644
--- a/src/detection/brightness/brightness_nbsd.c
+++ b/src/detection/brightness/brightness_nbsd.c
@@ -1,6 +1,6 @@
 #include "brightness.h"
 
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
 {
diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c
index 95a3ac83d..9dbb65afc 100644
--- a/src/detection/brightness/brightness_obsd.c
+++ b/src/detection/brightness/brightness_obsd.c
@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <dev/wscons/wsconsio.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/brightness/brightness_windows.cpp b/src/detection/brightness/brightness_windows.cpp
index 8cddd3b76..a7b4332a2 100644
--- a/src/detection/brightness/brightness_windows.cpp
+++ b/src/detection/brightness/brightness_windows.cpp
@@ -2,10 +2,10 @@ extern "C"
 {
 #include "brightness.h"
 #include "detection/displayserver/displayserver.h"
-#include "util/library.h"
+#include "common/library.h"
 }
-#include "util/windows/wmi.hpp"
-#include "util/windows/unicode.hpp"
+#include "common/windows/wmi.hpp"
+#include "common/windows/unicode.hpp"
 
 #include <highlevelmonitorconfigurationapi.h>
 #include <physicalmonitorenumerationapi.h>
diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c
index 41dc90e0c..369e38371 100644
--- a/src/detection/btrfs/btrfs_linux.c
+++ b/src/detection/btrfs/btrfs_linux.c
@@ -1,6 +1,6 @@
 #include "btrfs.h"
 
-#include "util/io.h"
+#include "common/io.h"
 #include <fcntl.h>
 
 enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") };
diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c
index 804e2ead8..7f5f24447 100644
--- a/src/detection/camera/camera_android.c
+++ b/src/detection/camera/camera_android.c
@@ -1,7 +1,7 @@
 #include "camera.h"
 
-#include "util/processing.h"
-#include "util/properties.h"
+#include "common/processing.h"
+#include "common/properties.h"
 
 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "CameraInfo"
diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m
index 64d714d16..4e3e60070 100644
--- a/src/detection/camera/camera_apple.m
+++ b/src/detection/camera/camera_apple.m
@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #import <AVFoundation/AVCaptureDevice.h>
 
diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c
index fe93414a6..52e1ea136 100644
--- a/src/detection/camera/camera_linux.c
+++ b/src/detection/camera/camera_linux.c
@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/detection/camera/camera_windows.cpp b/src/detection/camera/camera_windows.cpp
index f185cc131..a1b9f9763 100644
--- a/src/detection/camera/camera_windows.cpp
+++ b/src/detection/camera/camera_windows.cpp
@@ -1,9 +1,9 @@
 extern "C" {
 #include "camera.h"
-#include "util/library.h"
+#include "common/library.h"
 }
-#include "util/windows/com.hpp"
-#include "util/windows/unicode.hpp"
+#include "common/windows/com.hpp"
+#include "common/windows/unicode.hpp"
 
 #include <initguid.h>
 #include <mfapi.h>
diff --git a/src/detection/chassis/chassis_bsd.c b/src/detection/chassis/chassis_bsd.c
index d660d668e..dd050f3c5 100644
--- a/src/detection/chassis/chassis_bsd.c
+++ b/src/detection/chassis/chassis_bsd.c
@@ -1,6 +1,6 @@
 #include "chassis.h"
-#include "util/settings.h"
-#include "util/smbiosHelper.h"
+#include "common/settings.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectChassis(FFChassisResult* result)
 {
diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c
index 013fbca96..d44d9bddf 100644
--- a/src/detection/chassis/chassis_linux.c
+++ b/src/detection/chassis/chassis_linux.c
@@ -1,6 +1,6 @@
 #include "chassis.h"
-#include "util/io.h"
-#include "util/smbiosHelper.h"
+#include "common/io.h"
+#include "common/smbiosHelper.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c
index b9786cee4..5b9bb23fa 100644
--- a/src/detection/chassis/chassis_nbsd.c
+++ b/src/detection/chassis/chassis_nbsd.c
@@ -1,6 +1,6 @@
 #include "chassis.h"
-#include "util/sysctl.h"
-#include "util/smbiosHelper.h"
+#include "common/sysctl.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectChassis(FFChassisResult* chassis)
 {
diff --git a/src/detection/chassis/chassis_windows.c b/src/detection/chassis/chassis_windows.c
index a9f4aeedb..f50eaf9e0 100644
--- a/src/detection/chassis/chassis_windows.c
+++ b/src/detection/chassis/chassis_windows.c
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "util/smbiosHelper.h"
+#include "common/smbiosHelper.h"
 
 // 7.4
 typedef struct FFSmbiosSystemEnclosure
diff --git a/src/detection/command/command.c b/src/detection/command/command.c
index d6263eed7..982b66fa4 100644
--- a/src/detection/command/command.c
+++ b/src/detection/command/command.c
@@ -1,6 +1,6 @@
 #include "detection/command/command.h"
-#include "util/processing.h"
-#include "util/FFstrbuf.h"
+#include "common/processing.h"
+#include "common/FFstrbuf.h"
 
 typedef struct FFCommandResultBundle
 {
diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c
index ee4ce360e..9bfa7e7fd 100644
--- a/src/detection/cpu/cpu.c
+++ b/src/detection/cpu/cpu.c
@@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu)
 // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5)
 
 #ifdef __linux__
-#include "util/io.h"
+#include "common/io.h"
 #include <elf.h>
 // #include <asm/hwcap.h>
 
diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
index f046a2e45..c141a7284 100644
--- a/src/detection/cpu/cpu_apple.c
+++ b/src/detection/cpu/cpu_apple.c
@@ -1,7 +1,7 @@
 #include "cpu.h"
-#include "util/sysctl.h"
-#include "util/apple/smc_temps.h"
-#include "util/stringUtils.h"
+#include "common/sysctl.h"
+#include "common/apple/smc_temps.h"
+#include "common/stringUtils.h"
 
 static double detectCpuTemp(const FFCPUOptions* options, const FFstrbuf* cpuName)
 {
@@ -37,7 +37,7 @@ static double detectCpuTemp(const FFCPUOptions* options, const FFstrbuf* cpuName
 }
 
 #ifdef __aarch64__
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 
diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c
index 9bc0605a1..c8401dde1 100644
--- a/src/detection/cpu/cpu_bsd.c
+++ b/src/detection/cpu/cpu_bsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "util/sysctl.h"
-#include "util/stringUtils.h"
+#include "common/sysctl.h"
+#include "common/stringUtils.h"
 
 #include <sys/param.h>
 #if __has_include(<sys/cpuset.h>)
diff --git a/src/detection/cpu/cpu_haiku.c b/src/detection/cpu/cpu_haiku.c
index 2c604d4be..7e38f31f6 100644
--- a/src/detection/cpu/cpu_haiku.c
+++ b/src/detection/cpu/cpu_haiku.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <OS.h>
 #include <private/shared/cpu_type.h>
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
index 4b3847244..b6cb7b054 100644
--- a/src/detection/cpu/cpu_linux.c
+++ b/src/detection/cpu/cpu_linux.c
@@ -1,10 +1,10 @@
 #include "cpu.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/properties.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
-#include "util/path.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/properties.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/path.h"
 
 #include <sys/sysinfo.h>
 #include <stdlib.h>
@@ -200,7 +200,7 @@ static void detectNumaNodes(FFCPUResult* cpu)
 }
 
 #ifdef __ANDROID__
-#include "util/settings.h"
+#include "common/settings.h"
 
 static void detectQualcomm(FFCPUResult* cpu)
 {
diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
index 8a773f849..104b02e4d 100644
--- a/src/detection/cpu/cpu_nbsd.c
+++ b/src/detection/cpu/cpu_nbsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "util/sysctl.h"
-#include "util/io.h"
+#include "common/sysctl.h"
+#include "common/io.h"
 
 #include <sys/envsys.h>
 #include <prop/proplib.h>
diff --git a/src/detection/cpu/cpu_obsd.c b/src/detection/cpu/cpu_obsd.c
index cc1638002..16ffd5cc0 100644
--- a/src/detection/cpu/cpu_obsd.c
+++ b/src/detection/cpu/cpu_obsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "util/sysctl.h"
-#include "util/stringUtils.h"
+#include "common/sysctl.h"
+#include "common/stringUtils.h"
 
 #include <errno.h>
 #include <sys/time.h>
diff --git a/src/detection/cpu/cpu_sunos.c b/src/detection/cpu/cpu_sunos.c
index 0f9bb994f..fec93a486 100644
--- a/src/detection/cpu/cpu_sunos.c
+++ b/src/detection/cpu/cpu_sunos.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 #include <kstat.h>
 
 static const char* detectCPUTempByKstat(const FFCPUOptions* options, kstat_ctl_t* kc, FFCPUResult* cpu)
diff --git a/src/detection/cpu/cpu_windows.c b/src/detection/cpu/cpu_windows.c
index c83687769..1e1333d9c 100644
--- a/src/detection/cpu/cpu_windows.c
+++ b/src/detection/cpu/cpu_windows.c
@@ -1,11 +1,11 @@
 #include "cpu.h"
-#include "util/windows/registry.h"
-#include "util/windows/nt.h"
-#include "util/mallocHelper.h"
-#include "util/smbiosHelper.h"
+#include "common/windows/registry.h"
+#include "common/windows/nt.h"
+#include "common/mallocHelper.h"
+#include "common/smbiosHelper.h"
 
 #include <windows.h>
-#include "util/windows/perflib_.h"
+#include "common/windows/perflib_.h"
 #include <wchar.h>
 
 static inline void ffPerfCloseQueryHandle(HANDLE* phQuery)
diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c
index 9496d4261..09e890c28 100644
--- a/src/detection/cpucache/cpucache_apple.c
+++ b/src/detection/cpucache/cpucache_apple.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
-#include "util/sysctl.h"
-#include "util/stringUtils.h"
+#include "common/sysctl.h"
+#include "common/stringUtils.h"
 
 const char* ffDetectCPUCache(FFCPUCacheResult* result)
 {
diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c
index 844c6fd1e..bf15b1586 100644
--- a/src/detection/cpucache/cpucache_linux.c
+++ b/src/detection/cpucache/cpucache_linux.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)
 {
diff --git a/src/detection/cpucache/cpucache_shared.c b/src/detection/cpucache/cpucache_shared.c
index abf0e9474..c1379eedc 100644
--- a/src/detection/cpucache/cpucache_shared.c
+++ b/src/detection/cpucache/cpucache_shared.c
@@ -1,6 +1,6 @@
 #include "cpucache.h"
-#include "util/smbiosHelper.h"
-#include "util/stringUtils.h"
+#include "common/smbiosHelper.h"
+#include "common/stringUtils.h"
 
 typedef struct FFSmbiosCacheInfo
 {
diff --git a/src/detection/cpucache/cpucache_windows.c b/src/detection/cpucache/cpucache_windows.c
index f68c902d2..e04f276e0 100644
--- a/src/detection/cpucache/cpucache_windows.c
+++ b/src/detection/cpucache/cpucache_windows.c
@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <windows.h>
 
diff --git a/src/detection/cpuusage/cpuusage.c b/src/detection/cpuusage/cpuusage.c
index a90c00225..40e569528 100644
--- a/src/detection/cpuusage/cpuusage.c
+++ b/src/detection/cpuusage/cpuusage.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "util/time.h"
+#include "common/time.h"
 
 #include <stdint.h>
 
diff --git a/src/detection/cpuusage/cpuusage_bsd.c b/src/detection/cpuusage/cpuusage_bsd.c
index 4ed135eab..eee4ac20d 100644
--- a/src/detection/cpuusage/cpuusage_bsd.c
+++ b/src/detection/cpuusage/cpuusage_bsd.c
@@ -1,5 +1,5 @@
 #include "detection/cpuusage/cpuusage.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
diff --git a/src/detection/cpuusage/cpuusage_haiku.c b/src/detection/cpuusage/cpuusage_haiku.c
index 88a734ee2..f946ecbf4 100644
--- a/src/detection/cpuusage/cpuusage_haiku.c
+++ b/src/detection/cpuusage/cpuusage_haiku.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <OS.h>
 
diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c
index 7c42d86c9..355fb2d12 100644
--- a/src/detection/cpuusage/cpuusage_linux.c
+++ b/src/detection/cpuusage/cpuusage_linux.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <stdio.h>
 #include <inttypes.h>
diff --git a/src/detection/cpuusage/cpuusage_windows.c b/src/detection/cpuusage/cpuusage_windows.c
index f88e0928b..1679350d4 100644
--- a/src/detection/cpuusage/cpuusage_windows.c
+++ b/src/detection/cpuusage/cpuusage_windows.c
@@ -1,13 +1,13 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
 
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <ntstatus.h>
 #include <winternl.h>
 #include <windows.h>
 #include <wchar.h>
-#include "util/windows/perflib_.h"
+#include "common/windows/perflib_.h"
 
 static const char* getInfoByNqsi(FFlist* cpuTimes)
 {
diff --git a/src/detection/cursor/cursor_linux.c b/src/detection/cursor/cursor_linux.c
index 5258afbd9..4cccd721d 100644
--- a/src/detection/cursor/cursor_linux.c
+++ b/src/detection/cursor/cursor_linux.c
@@ -2,10 +2,10 @@
 
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
-#include "util/properties.h"
-#include "util/parsing.h"
-#include "util/settings.h"
-#include "util/stringUtils.h"
+#include "common/properties.h"
+#include "common/parsing.h"
+#include "common/settings.h"
+#include "common/stringUtils.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/cursor/cursor_windows.c b/src/detection/cursor/cursor_windows.c
index d992ff83c..1856ad04d 100644
--- a/src/detection/cursor/cursor_windows.c
+++ b/src/detection/cursor/cursor_windows.c
@@ -1,6 +1,6 @@
 #include "cursor.h"
 
-#include "util/windows/registry.h"
+#include "common/windows/registry.h"
 
 void ffDetectCursor(FFCursorResult* result)
 {
diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c
index 84d0b234f..b4d4e4eb9 100644
--- a/src/detection/de/de_linux.c
+++ b/src/detection/de/de_linux.c
@@ -1,13 +1,13 @@
 #include "de.h"
 
-#include "util/dbus.h"
-#include "util/io.h"
-#include "util/library.h"
-#include "util/parsing.h"
-#include "util/properties.h"
-#include "util/processing.h"
-#include "util/binary.h"
-#include "util/path.h"
+#include "common/dbus.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/parsing.h"
+#include "common/properties.h"
+#include "common/processing.h"
+#include "common/binary.h"
+#include "common/path.h"
 #include "detection/displayserver/displayserver.h"
 
 #include <ctype.h>
diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c
index 35386b8bb..8781fd107 100644
--- a/src/detection/disk/disk_bsd.c
+++ b/src/detection/disk/disk_bsd.c
@@ -1,6 +1,6 @@
 #include "disk.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
 
 #include <sys/mount.h>
 #include <sys/stat.h>
@@ -76,7 +76,7 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
     detectFsLabel(fs, disk);
 }
 #elif __APPLE__
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <sys/attr.h>
 #include <unistd.h>
diff --git a/src/detection/disk/disk_haiku.cpp b/src/detection/disk/disk_haiku.cpp
index 70479667e..267e75845 100644
--- a/src/detection/disk/disk_haiku.cpp
+++ b/src/detection/disk/disk_haiku.cpp
@@ -1,7 +1,7 @@
 extern "C"
 {
 #include "disk.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 }
 #include <fs_info.h>
 #include <Directory.h>
diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c
index 92a2e0527..5bdf83644 100644
--- a/src/detection/disk/disk_linux.c
+++ b/src/detection/disk/disk_linux.c
@@ -1,7 +1,7 @@
 #include "disk.h"
 
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <limits.h>
 #include <ctype.h>
diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c
index d35ae18a6..aa201c6c7 100644
--- a/src/detection/disk/disk_sunos.c
+++ b/src/detection/disk/disk_sunos.c
@@ -1,6 +1,6 @@
 #include "disk.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <sys/mntent.h>
 #include <sys/stat.h>
diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c
index 8fa5b9bdb..e13cec90a 100644
--- a/src/detection/disk/disk_windows.c
+++ b/src/detection/disk/disk_windows.c
@@ -1,7 +1,7 @@
 #include "disk.h"
-#include "util/io.h"
-#include "util/thread.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/thread.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <winioctl.h>
diff --git a/src/detection/diskio/diskio.c b/src/detection/diskio/diskio.c
index decd7d4d3..9413a7125 100644
--- a/src/detection/diskio/diskio.c
+++ b/src/detection/diskio/diskio.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
 
-#include "util/time.h"
+#include "common/time.h"
 
 const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options);
 
diff --git a/src/detection/diskio/diskio_apple.c b/src/detection/diskio/diskio_apple.c
index 2e202f3d9..4cf2ec2aa 100644
--- a/src/detection/diskio/diskio_apple.c
+++ b/src/detection/diskio/diskio_apple.c
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
diff --git a/src/detection/diskio/diskio_bsd.c b/src/detection/diskio/diskio_bsd.c
index abd339e6f..563baa4fa 100644
--- a/src/detection/diskio/diskio_bsd.c
+++ b/src/detection/diskio/diskio_bsd.c
@@ -2,7 +2,7 @@
 
 #if __has_include(<libgeom.h>)
 
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <devstat.h>
 #include <memory.h>
diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c
index e32c31c57..1855115ac 100644
--- a/src/detection/diskio/diskio_linux.c
+++ b/src/detection/diskio/diskio_linux.c
@@ -1,7 +1,7 @@
 #include "diskio.h"
-#include "util/io.h"
-#include "util/properties.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "common/stringUtils.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/src/detection/diskio/diskio_nbsd.c b/src/detection/diskio/diskio_nbsd.c
index 340cd856c..8e015fc4e 100644
--- a/src/detection/diskio/diskio_nbsd.c
+++ b/src/detection/diskio/diskio_nbsd.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <sys/iostat.h>
 #include <sys/sysctl.h>
diff --git a/src/detection/diskio/diskio_obsd.c b/src/detection/diskio/diskio_obsd.c
index 5dbfcd228..9411e030f 100644
--- a/src/detection/diskio/diskio_obsd.c
+++ b/src/detection/diskio/diskio_obsd.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <sys/disk.h>
 #include <sys/sysctl.h>
diff --git a/src/detection/diskio/diskio_sunos.c b/src/detection/diskio/diskio_sunos.c
index 8cc6810bb..5147b21b2 100644
--- a/src/detection/diskio/diskio_sunos.c
+++ b/src/detection/diskio/diskio_sunos.c
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 #include <kstat.h>
 
 static inline void kstatFreeWrap(kstat_ctl_t** pkc)
diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c
index f2e0f07fa..7622e99f9 100644
--- a/src/detection/diskio/diskio_windows.c
+++ b/src/detection/diskio/diskio_windows.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
-#include "util/io.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <winioctl.h>
diff --git a/src/detection/displayserver/displayserver_android.c b/src/detection/displayserver/displayserver_android.c
index 137b290e5..76e152de4 100644
--- a/src/detection/displayserver/displayserver_android.c
+++ b/src/detection/displayserver/displayserver_android.c
@@ -1,6 +1,6 @@
 #include "displayserver.h"
-#include "util/settings.h"
-#include "util/processing.h"
+#include "common/settings.h"
+#include "common/processing.h"
 #include "linux/displayserver_linux.h"
 
 #include <math.h>
diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c
index 7cf41204d..7f34bfb73 100644
--- a/src/detection/displayserver/displayserver_apple.c
+++ b/src/detection/displayserver/displayserver_apple.c
@@ -1,7 +1,7 @@
 #include "displayserver.h"
-#include "util/apple/cf_helpers.h"
-#include "util/stringUtils.h"
-#include "util/edidHelper.h"
+#include "common/apple/cf_helpers.h"
+#include "common/stringUtils.h"
+#include "common/edidHelper.h"
 #include "detection/os/os.h"
 
 #include <stdlib.h>
diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c
index c5917f857..b72a81b99 100644
--- a/src/detection/displayserver/displayserver_windows.c
+++ b/src/detection/displayserver/displayserver_windows.c
@@ -1,6 +1,6 @@
 #include "displayserver.h"
-#include "util/windows/unicode.h"
-#include "util/edidHelper.h"
+#include "common/windows/unicode.h"
+#include "common/edidHelper.h"
 
 #include <dwmapi.h>
 #include <winuser.h>
diff --git a/src/detection/displayserver/linux/common.c b/src/detection/displayserver/linux/common.c
index 71abee2b9..ead84a112 100644
--- a/src/detection/displayserver/linux/common.c
+++ b/src/detection/displayserver/linux/common.c
@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 FFDisplayType ffdsGetDisplayType(const char* name)
 {
diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c
index 66977a1e7..d54eab452 100644
--- a/src/detection/displayserver/linux/displayserver_linux.c
+++ b/src/detection/displayserver/linux/displayserver_linux.c
@@ -1,9 +1,9 @@
 #include "displayserver_linux.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #ifdef __FreeBSD__
-    #include "util/settings.h"
+    #include "common/settings.h"
 #endif
 
 static void getWMProtocolNameFromEnv(FFDisplayServerResult* result)
diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c
index b79513bc7..90f784bf1 100644
--- a/src/detection/displayserver/linux/drm.c
+++ b/src/detection/displayserver/linux/drm.c
@@ -1,7 +1,7 @@
 #include "displayserver_linux.h"
-#include "util/io.h"
-#include "util/edidHelper.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/edidHelper.h"
+#include "common/stringUtils.h"
 
 #ifdef __linux__
 #include <dirent.h>
@@ -110,7 +110,7 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)
 
 #ifdef FF_HAVE_DRM
 
-#include "util/library.h"
+#include "common/library.h"
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/src/detection/displayserver/linux/wayland/global-output.c b/src/detection/displayserver/linux/wayland/global-output.c
index 36a9ff22d..4f2889c92 100644
--- a/src/detection/displayserver/linux/wayland/global-output.c
+++ b/src/detection/displayserver/linux/wayland/global-output.c
@@ -1,7 +1,7 @@
 #ifdef FF_HAVE_WAYLAND
 
 #include "wayland.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
 static void waylandOutputModeListener(void* data, FF_MAYBE_UNUSED struct wl_output* output, uint32_t flags, int32_t width, int32_t height, int32_t refreshRate)
diff --git a/src/detection/displayserver/linux/wayland/kde-output.c b/src/detection/displayserver/linux/wayland/kde-output.c
index c541e4ed8..afdfcf193 100644
--- a/src/detection/displayserver/linux/wayland/kde-output.c
+++ b/src/detection/displayserver/linux/wayland/kde-output.c
@@ -3,8 +3,8 @@
 #include "wayland.h"
 #include "kde-output-device-v2-client-protocol.h"
 #include "kde-output-order-v1-client-protocol.h"
-#include "util/edidHelper.h"
-#include "util/base64.h"
+#include "common/edidHelper.h"
+#include "common/base64.h"
 
 typedef struct WaylandKdeMode
 {
diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c
index 1938ca49f..15198067d 100644
--- a/src/detection/displayserver/linux/wayland/wayland.c
+++ b/src/detection/displayserver/linux/wayland/wayland.c
@@ -1,7 +1,7 @@
 #include "../displayserver_linux.h"
-#include "util/io.h"
-#include "util/edidHelper.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/edidHelper.h"
+#include "common/stringUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -10,7 +10,7 @@
 
 #include <sys/socket.h>
 
-#include "util/properties.h"
+#include "common/properties.h"
 
 #include "wayland.h"
 #include "wlr-output-management-unstable-v1-client-protocol.h"
diff --git a/src/detection/displayserver/linux/wayland/wayland.h b/src/detection/displayserver/linux/wayland/wayland.h
index 79ed73a53..8d87f230a 100644
--- a/src/detection/displayserver/linux/wayland/wayland.h
+++ b/src/detection/displayserver/linux/wayland/wayland.h
@@ -2,8 +2,8 @@
 
 #ifdef FF_HAVE_WAYLAND
 
-#include "util/library.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
 
 #include <wayland-client.h>
 
diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c
index f7dae2f95..58c66fba9 100644
--- a/src/detection/displayserver/linux/wmde.c
+++ b/src/detection/displayserver/linux/wmde.c
@@ -1,8 +1,8 @@
 #include "displayserver_linux.h"
-#include "util/io.h"
-#include "util/properties.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c
index 81f0e76d8..3cc8a9953 100644
--- a/src/detection/displayserver/linux/xcb.c
+++ b/src/detection/displayserver/linux/xcb.c
@@ -2,11 +2,11 @@
 
 #ifdef FF_HAVE_XCB_RANDR
 
-#include "util/library.h"
-#include "util/properties.h"
-#include "util/edidHelper.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/properties.h"
+#include "common/edidHelper.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c
index 25fab64d9..6dd06bf17 100644
--- a/src/detection/displayserver/linux/xlib.c
+++ b/src/detection/displayserver/linux/xlib.c
@@ -2,10 +2,10 @@
 
 #ifdef FF_HAVE_XRANDR
 
-#include "util/library.h"
-#include "util/properties.h"
-#include "util/edidHelper.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/properties.h"
+#include "common/edidHelper.h"
+#include "common/stringUtils.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c
index a0831deef..5b717edd2 100644
--- a/src/detection/dns/dns_apple.c
+++ b/src/detection/dns/dns_apple.c
@@ -1,10 +1,10 @@
 #include "detection/dns/dns.h"
 
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
-#include "util/apple/cf_helpers.h"
-#include "util/debug.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/apple/cf_helpers.h"
+#include "common/debug.h"
 
 #include <SystemConfiguration/SystemConfiguration.h>
 
diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c
index 51c36370c..b4c205cf6 100644
--- a/src/detection/dns/dns_linux.c
+++ b/src/detection/dns/dns_linux.c
@@ -1,9 +1,9 @@
 #include "detection/dns/dns.h"
 
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 #ifdef __HAIKU__
 #define RESOLV_CONF "/system/settings/network/resolv.conf"
diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c
index 9b96b3700..2bcc240dd 100644
--- a/src/detection/dns/dns_windows.c
+++ b/src/detection/dns/dns_windows.c
@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"
-#include "util/netif.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
 
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c
index bdae1d1e3..d8221f42f 100644
--- a/src/detection/editor/editor.c
+++ b/src/detection/editor/editor.c
@@ -1,9 +1,9 @@
 #include "editor.h"
-#include "util/processing.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/path.h"
-#include "util/binary.h"
+#include "common/processing.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/path.h"
+#include "common/binary.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m
index 533afb940..e8aff3c5f 100644
--- a/src/detection/font/font_apple.m
+++ b/src/detection/font/font_apple.m
@@ -1,5 +1,5 @@
-#include "util/font.h"
-#include "util/io.h"
+#include "common/font.h"
+#include "common/io.h"
 #include "font.h"
 
 #import <AppKit/NSFont.h>
diff --git a/src/detection/font/font_linux.c b/src/detection/font/font_linux.c
index f823b226d..e3253379c 100644
--- a/src/detection/font/font_linux.c
+++ b/src/detection/font/font_linux.c
@@ -1,5 +1,5 @@
-#include "util/font.h"
-#include "util/parsing.h"
+#include "common/font.h"
+#include "common/parsing.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "font.h"
diff --git a/src/detection/font/font_windows.c b/src/detection/font/font_windows.c
index eb5446006..765dbc30e 100644
--- a/src/detection/font/font_windows.c
+++ b/src/detection/font/font_windows.c
@@ -1,5 +1,5 @@
 #include "font.h"
-#include "util/windows/unicode.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 
diff --git a/src/detection/gamepad/gamepad_apple.c b/src/detection/gamepad/gamepad_apple.c
index bfeb65ed0..3651717f4 100644
--- a/src/detection/gamepad/gamepad_apple.c
+++ b/src/detection/gamepad/gamepad_apple.c
@@ -1,6 +1,6 @@
 #include "gamepad.h"
-#include "util/apple/cf_helpers.h"
-#include "util/mallocHelper.h"
+#include "common/apple/cf_helpers.h"
+#include "common/mallocHelper.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hid/IOHIDLib.h>
diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c
index 0a6f760a5..469e49e03 100644
--- a/src/detection/gamepad/gamepad_bsd.c
+++ b/src/detection/gamepad/gamepad_bsd.c
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c
index 0d211b46d..1fd44e89b 100644
--- a/src/detection/gamepad/gamepad_linux.c
+++ b/src/detection/gamepad/gamepad_linux.c
@@ -1,6 +1,6 @@
 #include "gamepad.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path)
 {
diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c
index 8bbc3cd03..68d5c01d7 100644
--- a/src/detection/gamepad/gamepad_windows.c
+++ b/src/detection/gamepad/gamepad_windows.c
@@ -1,7 +1,7 @@
 #include "gamepad.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <winternl.h>
 #include <windows.h>
diff --git a/src/detection/gpu/gpu_amd.c b/src/detection/gpu/gpu_amd.c
index 8ad5eb94d..428367944 100644
--- a/src/detection/gpu/gpu_amd.c
+++ b/src/detection/gpu/gpu_amd.c
@@ -1,9 +1,9 @@
 #include "gpu_driver_specific.h"
 
 #include "adl.h"
-#include "util/library.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/library.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 // Helper function to convert ADL status code to string
 FF_MAYBE_UNUSED static const char* ffAdlStatusToString(int status) {
diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c
index 1537fa5c1..029649f44 100644
--- a/src/detection/gpu/gpu_android.c
+++ b/src/detection/gpu/gpu_android.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <fcntl.h>
 
diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c
index 32d00cc49..24bba84e2 100644
--- a/src/detection/gpu/gpu_apple.c
+++ b/src/detection/gpu/gpu_apple.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "util/apple/cf_helpers.h"
-#include "util/apple/smc_temps.h"
+#include "common/apple/cf_helpers.h"
+#include "common/apple/smc_temps.h"
 
 #include <IOKit/graphics/IOGraphicsLib.h>
 
@@ -38,7 +38,7 @@ static double detectGpuTemp(const FFstrbuf* gpuName)
 }
 
 #ifdef __aarch64__
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 
diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c
index c7f534ab0..99737cac1 100644
--- a/src/detection/gpu/gpu_bsd.c
+++ b/src/detection/gpu/gpu_bsd.c
@@ -1,7 +1,7 @@
 #include "gpu_driver_specific.h"
 
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <sys/pciio.h>
 #include <fcntl.h>
@@ -36,8 +36,8 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu)
 }
 
 #if FF_HAVE_DRM
-#include "util/library.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
 
 #include <xf86drm.h>
 
diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c
index c80e818d1..4e0477440 100644
--- a/src/detection/gpu/gpu_drm.c
+++ b/src/detection/gpu/gpu_drm.c
@@ -5,10 +5,10 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "util/io.h"
-#include "util/library.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
 
 #include "intel_drm.h"
 #include "asahi_drm.h"
diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c
index 8ed7d5175..6fcb6829b 100644
--- a/src/detection/gpu/gpu_general.c
+++ b/src/detection/gpu/gpu_general.c
@@ -2,8 +2,8 @@
 
 #ifdef FF_HAVE_PCIACCESS
 
-#include "util/io.h"
-#include "util/library.h"
+#include "common/io.h"
+#include "common/library.h"
 
 #include <pciaccess.h>
 
diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c
index 86f029016..dd7a449c9 100644
--- a/src/detection/gpu/gpu_haiku.c
+++ b/src/detection/gpu/gpu_haiku.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <private/drivers/poke.h>
 
diff --git a/src/detection/gpu/gpu_intel.c b/src/detection/gpu/gpu_intel.c
index 334ad58ea..a255a160c 100644
--- a/src/detection/gpu/gpu_intel.c
+++ b/src/detection/gpu/gpu_intel.c
@@ -1,7 +1,7 @@
 #include "gpu_driver_specific.h"
 
-#include "util/library.h"
-#include "util/mallocHelper.h"
+#include "common/library.h"
+#include "common/mallocHelper.h"
 #include "igcl.h"
 
 struct FFIgclData {
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
index f116ff4be..26a6529a7 100644
--- a/src/detection/gpu/gpu_linux.c
+++ b/src/detection/gpu/gpu_linux.c
@@ -2,11 +2,11 @@
 #include "detection/vulkan/vulkan.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
-#include "util/io.h"
-#include "util/library.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 #include "modules/gpu/option.h"
 
 #include <inttypes.h>
diff --git a/src/detection/gpu/gpu_mthreads.c b/src/detection/gpu/gpu_mthreads.c
index 7ae7a622d..ff1347851 100644
--- a/src/detection/gpu/gpu_mthreads.c
+++ b/src/detection/gpu/gpu_mthreads.c
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"
 
-#include "util/library.h"
+#include "common/library.h"
 #include "mtml.h"
 
 struct FFMtmlData
diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c
index 7e42f67bb..aed284925 100644
--- a/src/detection/gpu/gpu_nbsd.c
+++ b/src/detection/gpu/gpu_nbsd.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/gpu/gpu_nvidia.c b/src/detection/gpu/gpu_nvidia.c
index 3e8e85fed..983fb326c 100644
--- a/src/detection/gpu/gpu_nvidia.c
+++ b/src/detection/gpu/gpu_nvidia.c
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"
 
-#include "util/library.h"
+#include "common/library.h"
 #include "nvml.h"
 
 struct FFNvmlData {
diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c
index 50b9a8743..95e1dff31 100644
--- a/src/detection/gpu/gpu_obsd.c
+++ b/src/detection/gpu/gpu_obsd.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c
index 3116790a9..02923a286 100644
--- a/src/detection/gpu/gpu_pci.c
+++ b/src/detection/gpu/gpu_pci.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "util/io.h"
-#include "util/properties.h"
+#include "common/io.h"
+#include "common/properties.h"
 
 #include <stdlib.h>
 #ifdef __FreeBSD__
diff --git a/src/detection/gpu/gpu_sunos.c b/src/detection/gpu/gpu_sunos.c
index 6802ee099..da2bcd0ba 100644
--- a/src/detection/gpu/gpu_sunos.c
+++ b/src/detection/gpu/gpu_sunos.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <libdevinfo.h>
 
diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c
index 1f562031c..abaf843c7 100644
--- a/src/detection/gpu/gpu_windows.c
+++ b/src/detection/gpu/gpu_windows.c
@@ -1,11 +1,11 @@
 #include "gpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
-#include "util/library.h"
-#include "util/windows/unicode.h"
-#include "util/windows/registry.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
-#include "util/windows/nt.h"
+#include "common/library.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
+#include "common/windows/nt.h"
 
 #include <cfgmgr32.h>
 
diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp
index 6ed6dec7c..f2351a9e0 100644
--- a/src/detection/gpu/gpu_wsl.cpp
+++ b/src/detection/gpu/gpu_wsl.cpp
@@ -2,7 +2,7 @@
 
 #define INITGUID
 extern "C" {
-#include "util/library.h"
+#include "common/library.h"
 #include "detection/gpu/gpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
 }
diff --git a/src/detection/gtk_qt/gtk.c b/src/detection/gtk_qt/gtk.c
index c0e49d14a..0f5e344cc 100644
--- a/src/detection/gtk_qt/gtk.c
+++ b/src/detection/gtk_qt/gtk.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/properties.h"
-#include "util/thread.h"
-#include "util/settings.h"
+#include "common/properties.h"
+#include "common/thread.h"
+#include "common/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/gtk_qt/qt.c b/src/detection/gtk_qt/qt.c
index 29854f62b..3683b534b 100644
--- a/src/detection/gtk_qt/qt.c
+++ b/src/detection/gtk_qt/qt.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/properties.h"
-#include "util/thread.h"
-#include "util/stringUtils.h"
+#include "common/properties.h"
+#include "common/thread.h"
+#include "common/stringUtils.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/host/host_android.c b/src/detection/host/host_android.c
index f0f476a04..186d467e4 100644
--- a/src/detection/host/host_android.c
+++ b/src/detection/host/host_android.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "util/settings.h"
+#include "common/settings.h"
 
 #include <ctype.h>
 
diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c
index 32db81c85..a340ab35f 100644
--- a/src/detection/host/host_apple.c
+++ b/src/detection/host/host_apple.c
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "util/sysctl.h"
-#include "util/apple/cf_helpers.h"
+#include "common/sysctl.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 
diff --git a/src/detection/host/host_bsd.c b/src/detection/host/host_bsd.c
index 6c0b72f4b..86ca7664f 100644
--- a/src/detection/host/host_bsd.c
+++ b/src/detection/host/host_bsd.c
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "util/settings.h"
-#include "util/smbiosHelper.h"
+#include "common/settings.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
 {
diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c
index 90536e746..1ce20ccee 100644
--- a/src/detection/host/host_linux.c
+++ b/src/detection/host/host_linux.c
@@ -1,7 +1,7 @@
 #include "host.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/smbiosHelper.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/smbiosHelper.h"
 
 #include <stdlib.h>
 
diff --git a/src/detection/host/host_mac.c b/src/detection/host/host_mac.c
index a2c8d3e73..7851c6d9e 100644
--- a/src/detection/host/host_mac.c
+++ b/src/detection/host/host_mac.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel)
 {
diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c
index b9bea191f..6a1de3216 100644
--- a/src/detection/host/host_nbsd.c
+++ b/src/detection/host/host_nbsd.c
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "util/sysctl.h"
-#include "util/smbiosHelper.h"
+#include "common/sysctl.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
 {
diff --git a/src/detection/host/host_obsd.c b/src/detection/host/host_obsd.c
index f5eb28d65..79ef15b62 100644
--- a/src/detection/host/host_obsd.c
+++ b/src/detection/host/host_obsd.c
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "util/sysctl.h"
-#include "util/smbiosHelper.h"
+#include "common/sysctl.h"
+#include "common/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
 {
diff --git a/src/detection/host/host_windows.c b/src/detection/host/host_windows.c
index 05db2a041..3fa07fd75 100644
--- a/src/detection/host/host_windows.c
+++ b/src/detection/host/host_windows.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "util/smbiosHelper.h"
+#include "common/smbiosHelper.h"
 
 typedef struct FFSmbiosSystemInfo
 {
diff --git a/src/detection/icons/icons_linux.c b/src/detection/icons/icons_linux.c
index 05968465b..e5727b195 100644
--- a/src/detection/icons/icons_linux.c
+++ b/src/detection/icons/icons_linux.c
@@ -1,5 +1,5 @@
 #include "icons.h"
-#include "util/parsing.h"
+#include "common/parsing.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/icons/icons_windows.c b/src/detection/icons/icons_windows.c
index d7d9684e2..44c8b9630 100644
--- a/src/detection/icons/icons_windows.c
+++ b/src/detection/icons/icons_windows.c
@@ -1,5 +1,5 @@
 #include "icons.h"
-#include "util/windows/registry.h"
+#include "common/windows/registry.h"
 
 const char* ffDetectIcons(FFIconsResult* result)
 {
diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c
index 1206b7927..f3f367c09 100644
--- a/src/detection/initsystem/initsystem_haiku.c
+++ b/src/detection/initsystem/initsystem_haiku.c
@@ -1,7 +1,7 @@
 #include "initsystem.h"
-#include "util/stringUtils.h"
-#include "util/haiku/version.h"
-#include "util/io.h"
+#include "common/stringUtils.h"
+#include "common/haiku/version.h"
+#include "common/io.h"
 
 #include <OS.h>
 #include <unistd.h>
diff --git a/src/detection/initsystem/initsystem_linux.c b/src/detection/initsystem/initsystem_linux.c
index 6ec5d942a..408becbcf 100644
--- a/src/detection/initsystem/initsystem_linux.c
+++ b/src/detection/initsystem/initsystem_linux.c
@@ -1,7 +1,7 @@
 #include "initsystem.h"
-#include "util/processing.h"
-#include "util/binary.h"
-#include "util/stringUtils.h"
+#include "common/processing.h"
+#include "common/binary.h"
+#include "common/stringUtils.h"
 
 #include <libgen.h>
 #include <unistd.h>
diff --git a/src/detection/keyboard/keyboard_apple.c b/src/detection/keyboard/keyboard_apple.c
index 46278c5aa..152fc18e2 100644
--- a/src/detection/keyboard/keyboard_apple.c
+++ b/src/detection/keyboard/keyboard_apple.c
@@ -1,6 +1,6 @@
 #include "keyboard.h"
-#include "util/apple/cf_helpers.h"
-#include "util/mallocHelper.h"
+#include "common/apple/cf_helpers.h"
+#include "common/mallocHelper.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hid/IOHIDLib.h>
diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c
index e77534ba6..4e792b672 100644
--- a/src/detection/keyboard/keyboard_bsd.c
+++ b/src/detection/keyboard/keyboard_bsd.c
@@ -1,5 +1,5 @@
 #include "keyboard.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c
index d339360b2..8d1c9ed20 100644
--- a/src/detection/keyboard/keyboard_linux.c
+++ b/src/detection/keyboard/keyboard_linux.c
@@ -1,6 +1,6 @@
 #include "keyboard.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */)
 {
diff --git a/src/detection/keyboard/keyboard_windows.c b/src/detection/keyboard/keyboard_windows.c
index 777b64bf5..c02d1f5a1 100644
--- a/src/detection/keyboard/keyboard_windows.c
+++ b/src/detection/keyboard/keyboard_windows.c
@@ -1,9 +1,9 @@
 #define INITGUID
 
 #include "keyboard.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <winternl.h>
 #include <windows.h>
diff --git a/src/detection/lm/lm_linux.c b/src/detection/lm/lm_linux.c
index 0e270ad17..c336e5796 100644
--- a/src/detection/lm/lm_linux.c
+++ b/src/detection/lm/lm_linux.c
@@ -1,7 +1,7 @@
 #include "lm.h"
-#include "util/properties.h"
-#include "util/dbus.h"
-#include "util/processing.h"
+#include "common/properties.h"
+#include "common/dbus.h"
+#include "common/processing.h"
 #include "detection/displayserver/displayserver.h"
 
 #include <unistd.h>
@@ -48,7 +48,7 @@ static const char* getSshdVersion(FFstrbuf* version)
 }
 
 #ifdef FF_HAVE_ZLIB
-#include "util/library.h"
+#include "common/library.h"
 #include <stdlib.h>
 #include <zlib.h>
 
diff --git a/src/detection/loadavg/loadavg_linux.c b/src/detection/loadavg/loadavg_linux.c
index 8e8c9a7c4..556a87bbe 100644
--- a/src/detection/loadavg/loadavg_linux.c
+++ b/src/detection/loadavg/loadavg_linux.c
@@ -1,5 +1,5 @@
 #include "detection/loadavg/loadavg.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <sys/sysinfo.h>
 
diff --git a/src/detection/locale/locale_windows.c b/src/detection/locale/locale_windows.c
index c14732ffb..410aaf3f8 100644
--- a/src/detection/locale/locale_windows.c
+++ b/src/detection/locale/locale_windows.c
@@ -1,5 +1,5 @@
 #include "detection/locale/locale.h"
-#include "util/windows/unicode.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <locale.h>
diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c
index 18251b89e..07138a4d6 100644
--- a/src/detection/localip/localip_linux.c
+++ b/src/detection/localip/localip_linux.c
@@ -1,8 +1,8 @@
 #include "localip.h"
-#include "util/io.h"
-#include "util/netif.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/io.h"
+#include "common/netif.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 #include <string.h>
 #include <ctype.h>
diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c
index 399129410..35e502bbc 100644
--- a/src/detection/localip/localip_windows.c
+++ b/src/detection/localip/localip_windows.c
@@ -1,10 +1,10 @@
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
 
-#include "util/netif.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
-#include "util/debug.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
+#include "common/debug.h"
 #include "localip.h"
 
 #define FF_LOCALIP_NIFLAG(name) { IP_ADAPTER_##name, #name }
diff --git a/src/detection/media/media.c b/src/detection/media/media.c
index cb98ef51c..3a6e4ed22 100644
--- a/src/detection/media/media.c
+++ b/src/detection/media/media.c
@@ -1,5 +1,5 @@
 #include "media.h"
-#include "util/io.h"
+#include "common/io.h"
 
 void ffDetectMediaImpl(FFMediaResult* media, bool saveCover);
 
diff --git a/src/detection/media/media_apple.m b/src/detection/media/media_apple.m
index b69e4f92d..93144a5b7 100644
--- a/src/detection/media/media_apple.m
+++ b/src/detection/media/media_apple.m
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/processing.h"
-#include "util/apple/cf_helpers.h"
+#include "common/processing.h"
+#include "common/apple/cf_helpers.h"
 #include "detection/media/media.h"
 
 #import <Foundation/Foundation.h>
diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index c965b154f..e46d77e87 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 #include "detection/media/media.h"
 
 #include <string.h>
@@ -8,7 +8,7 @@
 #define FF_DBUS_MPRIS_PREFIX "org.mpris.MediaPlayer2."
 
 #ifdef FF_HAVE_DBUS
-#include "util/dbus.h"
+#include "common/dbus.h"
 
 #define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
     { \
diff --git a/src/detection/media/media_windows.c b/src/detection/media/media_windows.c
index 52846607c..eb165177b 100644
--- a/src/detection/media/media_windows.c
+++ b/src/detection/media/media_windows.c
@@ -1,5 +1,5 @@
-#include "util/library.h"
-#include "util/windows/unicode.h"
+#include "common/library.h"
+#include "common/windows/unicode.h"
 #include "media.h"
 #include "media_windows.dll.h"
 
diff --git a/src/detection/memory/memory_bsd.c b/src/detection/memory/memory_bsd.c
index 699d22416..0db20527a 100644
--- a/src/detection/memory/memory_bsd.c
+++ b/src/detection/memory/memory_bsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 const char* ffDetectMemory(FFMemoryResult* ram)
 {
diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c
index f2f80581f..66a679d10 100644
--- a/src/detection/memory/memory_linux.c
+++ b/src/detection/memory/memory_linux.c
@@ -1,6 +1,6 @@
 #include "memory.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/memory/memory_nbsd.c b/src/detection/memory/memory_nbsd.c
index 112d9c16b..651058686 100644
--- a/src/detection/memory/memory_nbsd.c
+++ b/src/detection/memory/memory_nbsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
diff --git a/src/detection/memory/memory_obsd.c b/src/detection/memory/memory_obsd.c
index 2ca8b1ca4..e58bf0d37 100644
--- a/src/detection/memory/memory_obsd.c
+++ b/src/detection/memory/memory_obsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
diff --git a/src/detection/mouse/mouse_apple.c b/src/detection/mouse/mouse_apple.c
index feadff649..f7377d364 100644
--- a/src/detection/mouse/mouse_apple.c
+++ b/src/detection/mouse/mouse_apple.c
@@ -1,6 +1,6 @@
 #include "mouse.h"
-#include "util/apple/cf_helpers.h"
-#include "util/mallocHelper.h"
+#include "common/apple/cf_helpers.h"
+#include "common/mallocHelper.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/hid/IOHIDLib.h>
diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c
index e7ef78c3b..3a2977b40 100644
--- a/src/detection/mouse/mouse_bsd.c
+++ b/src/detection/mouse/mouse_bsd.c
@@ -1,5 +1,5 @@
 #include "mouse.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c
index a55fdc3d9..3b2291853 100644
--- a/src/detection/mouse/mouse_linux.c
+++ b/src/detection/mouse/mouse_linux.c
@@ -1,6 +1,6 @@
 #include "mouse.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */)
 {
diff --git a/src/detection/mouse/mouse_windows.c b/src/detection/mouse/mouse_windows.c
index 6d4105f7f..73c6c7955 100644
--- a/src/detection/mouse/mouse_windows.c
+++ b/src/detection/mouse/mouse_windows.c
@@ -1,9 +1,9 @@
 #define INITGUID
 
 #include "mouse.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <winternl.h>
 #include <windows.h>
diff --git a/src/detection/netio/netio.c b/src/detection/netio/netio.c
index 7ffa73783..666321c99 100644
--- a/src/detection/netio/netio.c
+++ b/src/detection/netio/netio.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "util/time.h"
+#include "common/time.h"
 
 static FFlist ioCounters1;
 static uint64_t time1;
diff --git a/src/detection/netio/netio_apple.c b/src/detection/netio/netio_apple.c
index d9bf8e7eb..4be331815 100644
--- a/src/detection/netio/netio_apple.c
+++ b/src/detection/netio/netio_apple.c
@@ -1,7 +1,7 @@
 #include "netio.h"
 
-#include "util/netif.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_mib.h>
diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c
index 58234a1ea..acea26b72 100644
--- a/src/detection/netio/netio_bsd.c
+++ b/src/detection/netio/netio_bsd.c
@@ -1,7 +1,7 @@
 #include "netio.h"
 
-#include "util/netif.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp
index 824652050..e415a9b21 100644
--- a/src/detection/netio/netio_haiku.cpp
+++ b/src/detection/netio/netio_haiku.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "netio.h"
-#include "util/netif.h"
+#include "common/netif.h"
 }
 
 #include <NetworkInterface.h>
diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c
index 48631d54a..60a2f6993 100644
--- a/src/detection/netio/netio_linux.c
+++ b/src/detection/netio/netio_linux.c
@@ -1,8 +1,8 @@
 #include "netio.h"
 
-#include "util/io.h"
-#include "util/netif.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/netif.h"
+#include "common/stringUtils.h"
 
 #include <fcntl.h>
 #include <net/if.h>
diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c
index ca41b8e79..461e69c2e 100644
--- a/src/detection/netio/netio_sunos.c
+++ b/src/detection/netio/netio_sunos.c
@@ -1,6 +1,6 @@
 #include "netio.h"
-#include "util/netif.h"
-#include "util/stringUtils.h"
+#include "common/netif.h"
+#include "common/stringUtils.h"
 
 #include <kstat.h>
 
diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c
index 196c6a086..ff592a90f 100644
--- a/src/detection/netio/netio_windows.c
+++ b/src/detection/netio/netio_windows.c
@@ -1,8 +1,8 @@
 #include "netio.h"
 
-#include "util/netif.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c
index 5ebc92190..da67587d5 100644
--- a/src/detection/opencl/opencl.c
+++ b/src/detection/opencl/opencl.c
@@ -7,9 +7,9 @@
 
 #ifdef FF_HAVE_OPENCL
 
-#include "util/library.h"
-#include "util/parsing.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/parsing.h"
+#include "common/stringUtils.h"
 #include <string.h>
 
 #define CL_TARGET_OPENCL_VERSION 110
diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp
index 679993d42..c7301786f 100644
--- a/src/detection/opengl/opengl_haiku.cpp
+++ b/src/detection/opengl/opengl_haiku.cpp
@@ -2,7 +2,7 @@
 
 extern "C" {
 #include "opengl.h"
-#include "util/io.h"
+#include "common/io.h"
 #if FF_HAVE_EGL
 const char* ffOpenGLDetectByEGL(FFOpenGLResult* result);
 #endif
diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c
index 0e7a10631..8222a8034 100644
--- a/src/detection/opengl/opengl_linux.c
+++ b/src/detection/opengl/opengl_linux.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "opengl.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <string.h>
 
@@ -14,7 +14,7 @@
 #if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX)
 #define FF_HAVE_GL 1
 
-#include "util/library.h"
+#include "common/library.h"
 
 #include <GL/gl.h>
 
diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c
index b5f4c7703..db72fb80d 100644
--- a/src/detection/opengl/opengl_shared.c
+++ b/src/detection/opengl/opengl_shared.c
@@ -1,5 +1,5 @@
 #include "opengl.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #if __has_include(<GL/gl.h>)
 #include <GL/gl.h>
@@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG
 }
 
 #if defined(FF_HAVE_EGL) || __has_include(<EGL/egl.h>)
-#include "util/io.h"
+#include "common/io.h"
 
 #define EGL_EGL_PROTOTYPES 1
 #define EGL_EGLEXT_PROTOTYPES 1
diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c
index b75acc4d0..50e0e88da 100644
--- a/src/detection/opengl/opengl_windows.c
+++ b/src/detection/opengl/opengl_windows.c
@@ -1,6 +1,6 @@
 #include "opengl.h"
-#include "util/library.h"
-#include "util/printing.h"
+#include "common/library.h"
+#include "common/printing.h"
 
 #include <windows.h>
 #include <GL/gl.h>
diff --git a/src/detection/os/os_android.c b/src/detection/os/os_android.c
index 986ce6da2..7d39954d6 100644
--- a/src/detection/os/os_android.c
+++ b/src/detection/os/os_android.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "util/settings.h"
+#include "common/settings.h"
 
 void ffDetectOSImpl(FFOSResult* os)
 {
diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m
index b73d1cdef..e3201908c 100644
--- a/src/detection/os/os_apple.m
+++ b/src/detection/os/os_apple.m
@@ -1,8 +1,8 @@
 #include "os.h"
-#include "util/io.h"
-#include "util/sysctl.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/sysctl.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
index 20e3d9789..3377ec2a1 100644
--- a/src/detection/os/os_linux.c
+++ b/src/detection/os/os_linux.c
@@ -1,9 +1,9 @@
 #include "os.h"
-#include "util/properties.h"
-#include "util/parsing.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/properties.h"
+#include "common/parsing.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c
index d81101b28..1708e2f14 100644
--- a/src/detection/os/os_sunos.c
+++ b/src/detection/os/os_sunos.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "util/io.h"
+#include "common/io.h"
 
 void ffDetectOSImpl(FFOSResult* os)
 {
diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp
index 14025ec8e..71b1163ae 100644
--- a/src/detection/os/os_windows.cpp
+++ b/src/detection/os/os_windows.cpp
@@ -1,11 +1,11 @@
 extern "C" {
 #include "os.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/windows/registry.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/windows/registry.h"
 }
-#include "util/windows/unicode.hpp"
-#include "util/windows/wmi.hpp"
+#include "common/windows/unicode.hpp"
+#include "common/windows/wmi.hpp"
 
 static const char* getOsNameByWmi(FFstrbuf* osName)
 {
diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c
index e358e89d4..4e58b506d 100644
--- a/src/detection/packages/packages.c
+++ b/src/detection/packages/packages.c
@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <inttypes.h>
 #include <stddef.h>
diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c
index 141c46bc2..245b3d6b7 100644
--- a/src/detection/packages/packages_apple.c
+++ b/src/detection/packages/packages_apple.c
@@ -1,8 +1,8 @@
 #include "packages.h"
-#include "util/io.h"
-#include "util/parsing.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/parsing.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 
 static void countBrewPackages(FFstrbuf* baseDir, FFPackagesResult* result)
 {
diff --git a/src/detection/packages/packages_bsd.c b/src/detection/packages/packages_bsd.c
index 23096e638..4ad2d8b49 100644
--- a/src/detection/packages/packages_bsd.c
+++ b/src/detection/packages/packages_bsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/settings.h"
+#include "common/settings.h"
 
 static uint32_t getSQLite3Int(const char* dbPath, const char* query, const char* packageId)
 {
diff --git a/src/detection/packages/packages_haiku.c b/src/detection/packages/packages_haiku.c
index 1cf739bd9..45770589d 100644
--- a/src/detection/packages/packages_haiku.c
+++ b/src/detection/packages/packages_haiku.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io.h"
+#include "common/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 66560c267..8203f89c4 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -1,9 +1,9 @@
 #include "packages.h"
-#include "util/io.h"
-#include "util/parsing.h"
-#include "util/properties.h"
-#include "util/settings.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/parsing.h"
+#include "common/properties.h"
+#include "common/settings.h"
+#include "common/stringUtils.h"
 #include "detection/os/os.h"
 
 static uint32_t getNumElements(FFstrbuf* baseDir, const char* dirname, bool isdir)
@@ -168,7 +168,7 @@ static uint32_t getSnap(FFstrbuf* baseDir)
 }
 
 #ifdef FF_HAVE_RPM
-#include "util/library.h"
+#include "common/library.h"
 #include <rpm/rpmlib.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>
diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c
index 19c35e82e..a713a2b07 100644
--- a/src/detection/packages/packages_nbsd.c
+++ b/src/detection/packages/packages_nbsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io.h"
+#include "common/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {
diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c
index b2fc99640..1d9a21df7 100644
--- a/src/detection/packages/packages_nix.c
+++ b/src/detection/packages/packages_nix.c
@@ -1,7 +1,7 @@
 #include "packages.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 
 static bool isValidNixPkg(FFstrbuf* pkg)
 {
diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c
index 07c2769f4..2ff2cc737 100644
--- a/src/detection/packages/packages_obsd.c
+++ b/src/detection/packages/packages_obsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "util/io.h"
+#include "common/io.h"
 
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
 {
diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c
index 40ee6227c..e981f50ae 100644
--- a/src/detection/packages/packages_windows.c
+++ b/src/detection/packages/packages_windows.c
@@ -1,13 +1,13 @@
 #include "packages.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
-#include "util/path.h"
-#include "util/windows/unicode.h"
-#include "util/mallocHelper.h"
-#include "util/io.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
+#include "common/path.h"
+#include "common/windows/unicode.h"
+#include "common/mallocHelper.h"
+#include "common/io.h"
 
 #include <windows.h>
-#include "util/windows/nt.h"
+#include "common/windows/nt.h"
 #include <ntstatus.h>
 
 static uint32_t getNumElements(const char* searchPath, DWORD type, const wchar_t* ignore)
diff --git a/src/detection/physicaldisk/physicaldisk_apple.c b/src/detection/physicaldisk/physicaldisk_apple.c
index ce125533d..860d33999 100644
--- a/src/detection/physicaldisk/physicaldisk_apple.c
+++ b/src/detection/physicaldisk/physicaldisk_apple.c
@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/IOBSD.h>
diff --git a/src/detection/physicaldisk/physicaldisk_bsd.c b/src/detection/physicaldisk/physicaldisk_bsd.c
index 9bb4669dd..4878d7805 100644
--- a/src/detection/physicaldisk/physicaldisk_bsd.c
+++ b/src/detection/physicaldisk/physicaldisk_bsd.c
@@ -2,7 +2,7 @@
 
 #if __has_include(<libgeom.h>)
 
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <devstat.h>
 #include <memory.h>
diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c
index 2c024d72a..deed69653 100644
--- a/src/detection/physicaldisk/physicaldisk_haiku.c
+++ b/src/detection/physicaldisk/physicaldisk_haiku.c
@@ -1,7 +1,7 @@
 #include "physicaldisk.h"
 
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <OS.h>
 #include <StorageDefs.h>
diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c
index e0d4bc532..33019d7bc 100644
--- a/src/detection/physicaldisk/physicaldisk_linux.c
+++ b/src/detection/physicaldisk/physicaldisk_linux.c
@@ -1,7 +1,7 @@
 #include "physicaldisk.h"
-#include "util/io.h"
-#include "util/properties.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "common/stringUtils.h"
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/src/detection/physicaldisk/physicaldisk_sunos.c b/src/detection/physicaldisk/physicaldisk_sunos.c
index fb14c889e..aeb5ff27e 100644
--- a/src/detection/physicaldisk/physicaldisk_sunos.c
+++ b/src/detection/physicaldisk/physicaldisk_sunos.c
@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 #include "sys/scsi/generic/inquiry.h"
 
 #include <libdevinfo.h>
diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c
index ed56b4a0f..8d90f01ea 100644
--- a/src/detection/physicaldisk/physicaldisk_windows.c
+++ b/src/detection/physicaldisk/physicaldisk_windows.c
@@ -1,6 +1,6 @@
 #include "physicaldisk.h"
-#include "util/io.h"
-#include "util/windows/unicode.h"
+#include "common/io.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <winioctl.h>
diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m
index 550d94c74..2812f7707 100644
--- a/src/detection/physicalmemory/physicalmemory_apple.m
+++ b/src/detection/physicalmemory/physicalmemory_apple.m
@@ -1,8 +1,8 @@
 #include "physicalmemory.h"
-#include "util/processing.h"
-#include "util/smbiosHelper.h"
-#include "util/stringUtils.h"
-#include "util/apple/cf_helpers.h"
+#include "common/processing.h"
+#include "common/smbiosHelper.h"
+#include "common/stringUtils.h"
+#include "common/apple/cf_helpers.h"
 
 #import <Foundation/Foundation.h>
 
diff --git a/src/detection/physicalmemory/physicalmemory_linux.c b/src/detection/physicalmemory/physicalmemory_linux.c
index 8fdea2812..8d09fb87a 100644
--- a/src/detection/physicalmemory/physicalmemory_linux.c
+++ b/src/detection/physicalmemory/physicalmemory_linux.c
@@ -1,5 +1,5 @@
 #include "physicalmemory.h"
-#include "util/smbiosHelper.h"
+#include "common/smbiosHelper.h"
 
 // 7.18
 typedef struct FFSmbiosMemoryDevice
diff --git a/src/detection/poweradapter/poweradapter_apple.c b/src/detection/poweradapter/poweradapter_apple.c
index 35cba4d5a..bee95e967 100644
--- a/src/detection/poweradapter/poweradapter_apple.c
+++ b/src/detection/poweradapter/poweradapter_apple.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "poweradapter.h"
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <IOKit/ps/IOPowerSources.h>
 #include <IOKit/ps/IOPSKeys.h>
diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c
index 28cffe315..4e0576490 100644
--- a/src/detection/poweradapter/poweradapter_linux.c
+++ b/src/detection/poweradapter/poweradapter_linux.c
@@ -1,6 +1,6 @@
 #include "poweradapter.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <dirent.h>
 #include <unistd.h>
diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c
index e8e69ad36..397961e11 100644
--- a/src/detection/processes/processes_linux.c
+++ b/src/detection/processes/processes_linux.c
@@ -1,7 +1,7 @@
 #include "processes.h"
 
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 const char* ffDetectProcesses(uint32_t* result)
 {
diff --git a/src/detection/processes/processes_windows.c b/src/detection/processes/processes_windows.c
index fb29cd210..3267cff38 100644
--- a/src/detection/processes/processes_windows.c
+++ b/src/detection/processes/processes_windows.c
@@ -1,5 +1,5 @@
 #include "processes.h"
-#include "util/mallocHelper.h"
+#include "common/mallocHelper.h"
 
 #include <ntstatus.h>
 #include <winternl.h>
diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c
index 27070bfa4..5aa9c1c90 100644
--- a/src/detection/publicip/publicip.c
+++ b/src/detection/publicip/publicip.c
@@ -1,5 +1,5 @@
 #include "publicip.h"
-#include "util/networking.h"
+#include "common/networking.h"
 
 #define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState states[2];
diff --git a/src/detection/sound/sound_apple.c b/src/detection/sound/sound_apple.c
index cd21912c0..7f800b372 100644
--- a/src/detection/sound/sound_apple.c
+++ b/src/detection/sound/sound_apple.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 
 #include <CoreAudio/CoreAudio.h>
 #include <AvailabilityMacros.h>
diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c
index bc5abdf4d..68404fa85 100644
--- a/src/detection/sound/sound_bsd.c
+++ b/src/detection/sound/sound_bsd.c
@@ -1,6 +1,6 @@
 #include "sound.h"
-#include "util/io.h"
-#include "util/sysctl.h"
+#include "common/io.h"
+#include "common/sysctl.h"
 
 #include <fcntl.h>
 #include <sys/soundcard.h>
diff --git a/src/detection/sound/sound_haiku.cpp b/src/detection/sound/sound_haiku.cpp
index ba2dd7aeb..9471909e2 100644
--- a/src/detection/sound/sound_haiku.cpp
+++ b/src/detection/sound/sound_haiku.cpp
@@ -1,7 +1,7 @@
 extern "C"
 {
 #include "sound.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 }
 #include <MediaAddOn.h>
 #include <MediaNode.h>
diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c
index ecd074367..ace1d0b08 100644
--- a/src/detection/sound/sound_linux.c
+++ b/src/detection/sound/sound_linux.c
@@ -1,7 +1,7 @@
 #include "sound.h"
 
 #ifdef FF_HAVE_PULSE
-#include "util/library.h"
+#include "common/library.h"
 #include <pulse/pulseaudio.h>
 
 static void paSinkInfoCallback(pa_context *c, const pa_sink_info *i, int eol, void *userdata)
diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c
index 06240dede..396ce4b66 100644
--- a/src/detection/sound/sound_nbsd.c
+++ b/src/detection/sound/sound_nbsd.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/src/detection/sound/sound_obsd.c b/src/detection/sound/sound_obsd.c
index 5b83f9578..7e7554f5d 100644
--- a/src/detection/sound/sound_obsd.c
+++ b/src/detection/sound/sound_obsd.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <fcntl.h>
 #include <sndio.h>
diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c
index 760d1c7fd..dc185c618 100644
--- a/src/detection/sound/sound_sunos.c
+++ b/src/detection/sound/sound_sunos.c
@@ -1,6 +1,6 @@
 #include "sound.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/detection/sound/sound_windows.cpp b/src/detection/sound/sound_windows.cpp
index 4845cac5f..c0cb58d5a 100644
--- a/src/detection/sound/sound_windows.cpp
+++ b/src/detection/sound/sound_windows.cpp
@@ -1,8 +1,8 @@
 extern "C" {
     #include "sound.h"
-    #include "util/windows/unicode.h"
+    #include "common/windows/unicode.h"
 }
-#include "util/windows/com.hpp"
+#include "common/windows/com.hpp"
 
 #include <initguid.h>
 #include <mmdeviceapi.h>
diff --git a/src/detection/swap/swap_bsd.c b/src/detection/swap/swap_bsd.c
index 9fb40d1a6..c3e40b3df 100644
--- a/src/detection/swap/swap_bsd.c
+++ b/src/detection/swap/swap_bsd.c
@@ -1,5 +1,5 @@
 #include "swap.h"
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 #include <vm/vm_param.h>
 #include <sys/stat.h>
diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c
index 5508c2889..da6b2744f 100644
--- a/src/detection/swap/swap_linux.c
+++ b/src/detection/swap/swap_linux.c
@@ -1,7 +1,7 @@
 #include "swap.h"
 
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/swap/swap_obsd.c b/src/detection/swap/swap_obsd.c
index fff233ae3..e262e4c61 100644
--- a/src/detection/swap/swap_obsd.c
+++ b/src/detection/swap/swap_obsd.c
@@ -1,6 +1,6 @@
 #include "swap.h"
-#include "util/FFlist.h"
-#include "util/mallocHelper.h"
+#include "common/FFlist.h"
+#include "common/mallocHelper.h"
 
 #include <sys/types.h>
 #include <sys/swap.h>
diff --git a/src/detection/swap/swap_windows.c b/src/detection/swap/swap_windows.c
index 1bbb8098c..833293b11 100644
--- a/src/detection/swap/swap_windows.c
+++ b/src/detection/swap/swap_windows.c
@@ -1,6 +1,6 @@
 #include "swap.h"
-#include "util/mallocHelper.h"
-#include "util/windows/unicode.h"
+#include "common/mallocHelper.h"
+#include "common/windows/unicode.h"
 
 #include <winternl.h>
 #include <ntstatus.h>
diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c
index 5f320b5a4..0793236c5 100644
--- a/src/detection/terminalfont/terminalfont.c
+++ b/src/detection/terminalfont/terminalfont.c
@@ -1,9 +1,9 @@
 #include "terminalfont.h"
-#include "util/io.h"
-#include "util/properties.h"
-#include "util/processing.h"
-#include "util/debug.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "common/processing.h"
+#include "common/debug.h"
+#include "common/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 
 static void detectAlacritty(FFTerminalFontResult* terminalFont)
diff --git a/src/detection/terminalfont/terminalfont.h b/src/detection/terminalfont/terminalfont.h
index b0b468f2d..03ddad99e 100644
--- a/src/detection/terminalfont/terminalfont.h
+++ b/src/detection/terminalfont/terminalfont.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/font.h"
+#include "common/font.h"
 #include "modules/font/option.h"
 
 typedef struct FFTerminalFontResult
diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c
index 14974080f..ef2ef39ef 100644
--- a/src/detection/terminalfont/terminalfont_android.c
+++ b/src/detection/terminalfont/terminalfont_android.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
 #include "terminalfont.h"
 #include "detection/terminalshell/terminalshell.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #ifdef FF_HAVE_FREETYPE
-    #include "util/library.h"
+    #include "common/library.h"
     #include <ft2build.h>
     #include FT_FREETYPE_H
 #endif
diff --git a/src/detection/terminalfont/terminalfont_apple.m b/src/detection/terminalfont/terminalfont_apple.m
index f9da1fbef..126235f41 100644
--- a/src/detection/terminalfont/terminalfont_apple.m
+++ b/src/detection/terminalfont/terminalfont_apple.m
@@ -1,7 +1,7 @@
 #include "terminalfont.h"
-#include "util/font.h"
+#include "common/font.h"
 #include "detection/terminalshell/terminalshell.h"
-#include "util/apple/osascript.h"
+#include "common/apple/osascript.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c
index 59ecdd2ce..a8c0ddac9 100644
--- a/src/detection/terminalfont/terminalfont_linux.c
+++ b/src/detection/terminalfont/terminalfont_linux.c
@@ -1,13 +1,13 @@
-#include "util/font.h"
+#include "common/font.h"
 #include "terminalfont.h"
-#include "util/settings.h"
-#include "util/properties.h"
-#include "util/parsing.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
-#include "util/binary.h"
+#include "common/settings.h"
+#include "common/properties.h"
+#include "common/parsing.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/binary.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
index a24df94a3..9cf994571 100644
--- a/src/detection/terminalfont/terminalfont_windows.c
+++ b/src/detection/terminalfont/terminalfont_windows.c
@@ -1,10 +1,10 @@
-#include "util/library.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/properties.h"
-#include "util/windows/unicode.h"
-#include "util/windows/registry.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/properties.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "terminalfont.h"
 
diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c
index 96e04fa34..dce77020e 100644
--- a/src/detection/terminalshell/terminalshell.c
+++ b/src/detection/terminalshell/terminalshell.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/properties.h"
-#include "util/path.h"
-#include "util/stringUtils.h"
-#include "util/binary.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/properties.h"
+#include "common/path.h"
+#include "common/stringUtils.h"
+#include "common/binary.h"
 
 #include <ctype.h>
 #include <stdint.h>
@@ -19,7 +19,7 @@
     #define _PATH_LOCALBASE "/usr/pkg"
 #elif _WIN32
 
-#include "util/windows/version.h"
+#include "common/windows/version.h"
 #include <windows.h>
 
 static bool getFileVersion(const FFstrbuf* exePath, const wchar_t* stringName, FFstrbuf* version)
@@ -33,7 +33,7 @@ static bool getFileVersion(const FFstrbuf* exePath, const wchar_t* stringName, F
 }
 
 #elif __HAIKU__
-    #include "util/haiku/version.h"
+    #include "common/haiku/version.h"
 #endif
 
 static bool getExeVersionRaw(FFstrbuf* exe, FFstrbuf* version)
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
index 7912dbb79..79fbbc6e9 100644
--- a/src/detection/terminalshell/terminalshell_linux.c
+++ b/src/detection/terminalshell/terminalshell_linux.c
@@ -1,9 +1,9 @@
 #include "terminalshell.h"
-#include "util/io.h"
-#include "util/parsing.h"
-#include "util/processing.h"
-#include "util/thread.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/parsing.h"
+#include "common/processing.h"
+#include "common/thread.h"
+#include "common/stringUtils.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c
index fe2709785..7dff190e3 100644
--- a/src/detection/terminalshell/terminalshell_windows.c
+++ b/src/detection/terminalshell/terminalshell_windows.c
@@ -1,12 +1,12 @@
 #include "terminalshell.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/thread.h"
-#include "util/mallocHelper.h"
-#include "util/windows/registry.h"
-#include "util/windows/unicode.h"
-#include "util/windows/version.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/thread.h"
+#include "common/mallocHelper.h"
+#include "common/windows/registry.h"
+#include "common/windows/unicode.h"
+#include "common/windows/version.h"
+#include "common/stringUtils.h"
 
 #include <windows.h>
 #include <wchar.h>
diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c
index 183b61875..fce2d5d33 100644
--- a/src/detection/terminalsize/terminalsize_linux.c
+++ b/src/detection/terminalsize/terminalsize_linux.c
@@ -1,5 +1,5 @@
 #include "terminalsize.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <sys/ioctl.h>
 #include <fcntl.h>
diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c
index f884499be..14c0a0af2 100644
--- a/src/detection/terminalsize/terminalsize_windows.c
+++ b/src/detection/terminalsize/terminalsize_windows.c
@@ -1,5 +1,5 @@
 #include "terminalsize.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <windows.h>
 
diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c
index 80b62be3f..552560a1f 100644
--- a/src/detection/terminaltheme/terminaltheme.c
+++ b/src/detection/terminaltheme/terminaltheme.c
@@ -1,6 +1,6 @@
 #include "terminaltheme.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/theme/theme_linux.c b/src/detection/theme/theme_linux.c
index 1e9496823..650130775 100644
--- a/src/detection/theme/theme_linux.c
+++ b/src/detection/theme/theme_linux.c
@@ -1,5 +1,5 @@
 #include "theme.h"
-#include "util/parsing.h"
+#include "common/parsing.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/tpm/tpm_apple.c b/src/detection/tpm/tpm_apple.c
index daef285e9..d95679c55 100644
--- a/src/detection/tpm/tpm_apple.c
+++ b/src/detection/tpm/tpm_apple.c
@@ -1,7 +1,7 @@
 #include "tpm.h"
 
 #ifndef __aarch64__
-    #include "util/apple/cf_helpers.h"
+    #include "common/apple/cf_helpers.h"
     #include <IOKit/IOKitLib.h>
 #endif
 
diff --git a/src/detection/tpm/tpm_bsd.c b/src/detection/tpm/tpm_bsd.c
index 251f13b31..55c1e211c 100644
--- a/src/detection/tpm/tpm_bsd.c
+++ b/src/detection/tpm/tpm_bsd.c
@@ -1,6 +1,6 @@
 #include "tpm.h"
-#include "util/sysctl.h"
-#include "util/kmod.h"
+#include "common/sysctl.h"
+#include "common/kmod.h"
 
 const char* ffDetectTPM(FFTPMResult* result)
 {
diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c
index 4bd8b32c1..b7c6ab412 100644
--- a/src/detection/tpm/tpm_linux.c
+++ b/src/detection/tpm/tpm_linux.c
@@ -1,5 +1,5 @@
 #include "tpm.h"
-#include "util/io.h"
+#include "common/io.h"
 
 const char* ffDetectTPM(FFTPMResult* result)
 {
diff --git a/src/detection/tpm/tpm_windows.c b/src/detection/tpm/tpm_windows.c
index 1d663238c..32ec92da9 100644
--- a/src/detection/tpm/tpm_windows.c
+++ b/src/detection/tpm/tpm_windows.c
@@ -1,5 +1,5 @@
 #include "tpm.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #include <tbs.h>
 #include <winerror.h>
diff --git a/src/detection/uptime/uptime_bsd.c b/src/detection/uptime/uptime_bsd.c
index 3cd4dc56e..57a17b0d7 100644
--- a/src/detection/uptime/uptime_bsd.c
+++ b/src/detection/uptime/uptime_bsd.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "util/time.h"
+#include "common/time.h"
 
 #include <sys/sysctl.h>
 #include <sys/time.h>
diff --git a/src/detection/uptime/uptime_haiku.c b/src/detection/uptime/uptime_haiku.c
index 7b2395406..a2c48a5ec 100644
--- a/src/detection/uptime/uptime_haiku.c
+++ b/src/detection/uptime/uptime_haiku.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "util/time.h"
+#include "common/time.h"
 
 const char* ffDetectUptime(FFUptimeResult* result)
 {
diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c
index 19def70c3..a69d85a27 100644
--- a/src/detection/uptime/uptime_linux.c
+++ b/src/detection/uptime/uptime_linux.c
@@ -1,6 +1,6 @@
 #include "uptime.h"
-#include "util/time.h"
-#include "util/io.h"
+#include "common/time.h"
+#include "common/io.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/uptime/uptime_sunos.c b/src/detection/uptime/uptime_sunos.c
index b0a34f2ef..74ce8b8a7 100644
--- a/src/detection/uptime/uptime_sunos.c
+++ b/src/detection/uptime/uptime_sunos.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "util/time.h"
+#include "common/time.h"
 
 #include <utmpx.h>
 
diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c
index b75187c1d..6978a1163 100644
--- a/src/detection/uptime/uptime_windows.c
+++ b/src/detection/uptime/uptime_windows.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "util/time.h"
+#include "common/time.h"
 
 #include <sysinfoapi.h>
 
diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c
index 98e506d33..46d8a02e5 100644
--- a/src/detection/users/users_linux.c
+++ b/src/detection/users/users_linux.c
@@ -1,5 +1,5 @@
-#include "util/io.h"
-#include "util/properties.h"
+#include "common/io.h"
+#include "common/properties.h"
 #include "fastfetch.h"
 #include "users.h"
 
diff --git a/src/detection/users/users_obsd.c b/src/detection/users/users_obsd.c
index 6d67afeff..61370392d 100644
--- a/src/detection/users/users_obsd.c
+++ b/src/detection/users/users_obsd.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "users.h"
-#include "util/io.h"
+#include "common/io.h"
 
 #include <utmp.h>
 
diff --git a/src/detection/users/users_windows.c b/src/detection/users/users_windows.c
index c2dd961ec..f8b117b3d 100644
--- a/src/detection/users/users_windows.c
+++ b/src/detection/users/users_windows.c
@@ -1,5 +1,5 @@
 #include "users.h"
-#include "util/windows/unicode.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c
index 7e63a970d..085c7cb64 100644
--- a/src/detection/vulkan/vulkan.c
+++ b/src/detection/vulkan/vulkan.c
@@ -3,10 +3,10 @@
 #include "detection/vulkan/vulkan.h"
 
 #ifdef FF_HAVE_VULKAN
-#include "util/library.h"
-#include "util/io.h"
-#include "util/parsing.h"
-#include "util/stringUtils.h"
+#include "common/library.h"
+#include "common/io.h"
+#include "common/parsing.h"
+#include "common/stringUtils.h"
 
 #include <stdlib.h>
 #include <vulkan/vulkan.h>
diff --git a/src/detection/wallpaper/wallpaper_apple.m b/src/detection/wallpaper/wallpaper_apple.m
index 33fe54488..800aee9ce 100644
--- a/src/detection/wallpaper/wallpaper_apple.m
+++ b/src/detection/wallpaper/wallpaper_apple.m
@@ -1,6 +1,6 @@
 #include "wallpaper.h"
-#include "util/settings.h"
-#include "util/apple/osascript.h"
+#include "common/settings.h"
+#include "common/apple/osascript.h"
 
 #import <Foundation/Foundation.h>
 
diff --git a/src/detection/wallpaper/wallpaper_linux.c b/src/detection/wallpaper/wallpaper_linux.c
index 76b4274f3..d2aa65b6c 100644
--- a/src/detection/wallpaper/wallpaper_linux.c
+++ b/src/detection/wallpaper/wallpaper_linux.c
@@ -1,5 +1,5 @@
 #include "wallpaper.h"
-#include "util/settings.h"
+#include "common/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
 
 const char* ffDetectWallpaper(FFstrbuf* result)
diff --git a/src/detection/wallpaper/wallpaper_windows.c b/src/detection/wallpaper/wallpaper_windows.c
index 7a099cb40..f713e0172 100644
--- a/src/detection/wallpaper/wallpaper_windows.c
+++ b/src/detection/wallpaper/wallpaper_windows.c
@@ -1,14 +1,14 @@
-#include "wallpaper.h"
-#include "util/windows/registry.h"
-
-const char* ffDetectWallpaper(FFstrbuf* result)
-{
-    FF_HKEY_AUTO_DESTROY hKey = NULL;
-    if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Control Panel\\Desktop", &hKey, NULL))
-        return "ffRegOpenKeyForRead(Control Panel\\Desktop) failed";
-
-    if(!ffRegReadStrbuf(hKey, L"WallPaper", result, NULL))
-        return "ffRegReadStrbuf(WallPaper) failed";
-
-    return NULL;
-}
+#include "wallpaper.h"
+#include "common/windows/registry.h"
+
+const char* ffDetectWallpaper(FFstrbuf* result)
+{
+    FF_HKEY_AUTO_DESTROY hKey = NULL;
+    if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Control Panel\\Desktop", &hKey, NULL))
+        return "ffRegOpenKeyForRead(Control Panel\\Desktop) failed";
+
+    if(!ffRegReadStrbuf(hKey, L"WallPaper", result, NULL))
+        return "ffRegReadStrbuf(WallPaper) failed";
+
+    return NULL;
+}
diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c
index 128597f48..150c9e36f 100644
--- a/src/detection/weather/weather.c
+++ b/src/detection/weather/weather.c
@@ -1,5 +1,5 @@
 #include "weather.h"
-#include "util/networking.h"
+#include "common/networking.h"
 
 #define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState state;
diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c
index 6503285e7..e74a96b37 100644
--- a/src/detection/wifi/wifi_android.c
+++ b/src/detection/wifi/wifi_android.c
@@ -1,7 +1,7 @@
 #include "wifi.h"
 
-#include "util/processing.h"
-#include "util/properties.h"
+#include "common/processing.h"
+#include "common/properties.h"
 
 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "WifiConnectionInfo"
diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m
index 2c208e17d..5a2cf1353 100644
--- a/src/detection/wifi/wifi_apple.m
+++ b/src/detection/wifi/wifi_apple.m
@@ -1,6 +1,6 @@
 #include "wifi.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 
 #import <CoreWLAN/CoreWLAN.h>
 
diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c
index 6a0af8b4c..efe05cc95 100644
--- a/src/detection/wifi/wifi_bsd.c
+++ b/src/detection/wifi/wifi_bsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c
index 953233809..62fd01771 100644
--- a/src/detection/wifi/wifi_linux.c
+++ b/src/detection/wifi/wifi_linux.c
@@ -1,10 +1,10 @@
 #include "wifi.h"
-#include "util/dbus.h"
-#include "util/io.h"
-#include "util/processing.h"
-#include "util/properties.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/dbus.h"
+#include "common/io.h"
+#include "common/processing.h"
+#include "common/properties.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 #include <net/if.h>
 
diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c
index e29ebfef0..acab018c9 100644
--- a/src/detection/wifi/wifi_nbsd.c
+++ b/src/detection/wifi/wifi_nbsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #define COMPAT_FREEBSD_NET80211 1
 #include <sys/ioctl.h>
diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c
index 46ee270bf..67c250e28 100644
--- a/src/detection/wifi/wifi_obsd.c
+++ b/src/detection/wifi/wifi_obsd.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c
index 98c40b683..99673b626 100644
--- a/src/detection/wifi/wifi_windows.c
+++ b/src/detection/wifi/wifi_windows.c
@@ -1,6 +1,6 @@
 #include "wifi.h"
-#include "util/library.h"
-#include "util/windows/unicode.h"
+#include "common/library.h"
+#include "common/windows/unicode.h"
 
 #include <windows.h>
 #include <wlanapi.h>
diff --git a/src/detection/wm/wm_apple.m b/src/detection/wm/wm_apple.m
index 1289cb58c..6f595e467 100644
--- a/src/detection/wm/wm_apple.m
+++ b/src/detection/wm/wm_apple.m
@@ -1,8 +1,8 @@
 #include "wm.h"
 
-#include "util/sysctl.h"
-#include "util/mallocHelper.h"
-#include "util/stringUtils.h"
+#include "common/sysctl.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
 
 #include <ctype.h>
 #import <Foundation/Foundation.h>
diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c
index 147f31321..56d8926e8 100644
--- a/src/detection/wm/wm_linux.c
+++ b/src/detection/wm/wm_linux.c
@@ -1,11 +1,11 @@
 #include "wm.h"
 
-#include "util/processing.h"
-#include "util/io.h"
-#include "util/binary.h"
-#include "util/path.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/processing.h"
+#include "common/io.h"
+#include "common/binary.h"
+#include "common/path.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 #include "detection/displayserver/displayserver.h"
 
 const char* ffDetectWMPlugin(FF_MAYBE_UNUSED FFstrbuf* pluginName)
diff --git a/src/detection/wm/wm_windows.cpp b/src/detection/wm/wm_windows.cpp
index 0d9c3335d..793d57d51 100644
--- a/src/detection/wm/wm_windows.cpp
+++ b/src/detection/wm/wm_windows.cpp
@@ -1,12 +1,12 @@
 extern "C"
 {
 #include "wm.h"
-#include "util/io.h"
-#include "util/windows/version.h"
+#include "common/io.h"
+#include "common/windows/version.h"
 #include "detection/terminalshell/terminalshell.h"
 }
 
-#include "util/windows/com.hpp"
+#include "common/windows/com.hpp"
 
 #include <utility>
 #include <windows.h>
diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c
index 738ed9c01..d36bfbaca 100644
--- a/src/detection/wmtheme/wmtheme_linux.c
+++ b/src/detection/wmtheme/wmtheme_linux.c
@@ -1,10 +1,10 @@
 #include "wmtheme.h"
-#include "util/io.h"
-#include "util/properties.h"
-#include "util/parsing.h"
-#include "util/settings.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "common/parsing.h"
+#include "common/settings.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/wmtheme/wmtheme_windows.c b/src/detection/wmtheme/wmtheme_windows.c
index 5e5cc26e1..5584af3e9 100644
--- a/src/detection/wmtheme/wmtheme_windows.c
+++ b/src/detection/wmtheme/wmtheme_windows.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "wmtheme.h"
-#include "util/windows/registry.h"
+#include "common/windows/registry.h"
 
 const char* colorHexToString(DWORD hex)
 {
diff --git a/src/detection/zpool/zpool.c b/src/detection/zpool/zpool.c
index 83c5609fa..ca2c31a28 100644
--- a/src/detection/zpool/zpool.c
+++ b/src/detection/zpool/zpool.c
@@ -2,7 +2,7 @@
 
 #if FF_HAVE_LIBZFS
 
-#include "util/kmod.h"
+#include "common/kmod.h"
 
 #ifdef __sun
 #include <libzfs.h>
@@ -10,7 +10,7 @@
 #include "libzfs_simplified.h"
 #endif
 
-#include "util/library.h"
+#include "common/library.h"
 
 typedef struct FFZfsData
 {
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 59f66b33d..2891010e0 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1,13 +1,13 @@
 #include "fastfetch.h"
 #include "detection/version/version.h"
 #include "logo/logo.h"
-#include "util/commandoption.h"
-#include "util/init.h"
-#include "util/io.h"
-#include "util/jsonconfig.h"
-#include "util/time.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/commandoption.h"
+#include "common/init.h"
+#include "common/io.h"
+#include "common/jsonconfig.h"
+#include "common/time.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 #include "fastfetch_datatext.h"
 
 #include <stdlib.h>
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #ifdef _WIN32
-    #include "util/windows/getline.h"
+    #include "common/windows/getline.h"
 #endif
 
 static void printCommandFormatHelpJson(void)
diff --git a/src/fastfetch.h b/src/fastfetch.h
index eaecdbbc7..612799463 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -15,11 +15,11 @@
     #define __attribute__(x)
 #endif
 
-#include "util/arrayUtils.h"
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
-#include "util/FFPlatform.h"
-#include "util/unused.h"
+#include "common/arrayUtils.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
+#include "common/FFPlatform.h"
+#include "common/unused.h"
 
 #include "options/logo.h"
 #include "options/display.h"
diff --git a/src/flashfetch.c b/src/flashfetch.c
index 100d30b48..e4815686c 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include "util/init.h"
+#include "common/init.h"
 #include "logo/logo.h"
 #include "modules/modules.h"
 
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index 53f526b6a..b646e3d46 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -1,6 +1,6 @@
 #include "logo.h"
 #include "logo_builtin.h"
-#include "util/color.h"
+#include "common/color.h"
 
 const FFlogo ffLogoUnknown = {
     .names = {"unknown"},
diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c
index 3243f847b..4893eeaad 100644
--- a/src/logo/image/im6.c
+++ b/src/logo/image/im6.c
@@ -1,7 +1,7 @@
 #ifdef FF_HAVE_IMAGEMAGICK6
 
 #include "image.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #include <magick/MagickCore.h>
 
diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c
index 8ed0e0c65..b33c0ccf9 100644
--- a/src/logo/image/im7.c
+++ b/src/logo/image/im7.c
@@ -1,7 +1,7 @@
 #ifdef FF_HAVE_IMAGEMAGICK7
 
 #include "image.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #include <MagickCore/MagickCore.h>
 
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index f8b031ae0..2ead988d7 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -1,9 +1,9 @@
 #include "image.h"
-#include "util/io.h"
-#include "util/printing.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
-#include "util/base64.h"
+#include "common/io.h"
+#include "common/printing.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
+#include "common/base64.h"
 #include "detection/terminalsize/terminalsize.h"
 
 #include <limits.h>
@@ -421,7 +421,7 @@ static inline char* realpath(const char* restrict file_name, char* restrict reso
 #endif
 
 #ifdef FF_HAVE_ZLIB
-#include "util/library.h"
+#include "common/library.h"
 #include <stdlib.h>
 #include <zlib.h>
 
diff --git a/src/logo/logo.c b/src/logo/logo.c
index c24311124..0e88d0229 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -1,9 +1,9 @@
 #include "logo/logo.h"
-#include "util/io.h"
-#include "util/printing.h"
-#include "util/processing.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/printing.h"
+#include "common/processing.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 #include "detection/media/media.h"
 #include "detection/os/os.h"
 #include "detection/terminalshell/terminalshell.h"
diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c
index fb22003cb..0da4f12d7 100644
--- a/src/modules/battery/battery.c
+++ b/src/modules/battery/battery.c
@@ -1,9 +1,9 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/duration.h"
-#include "util/temps.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/duration.h"
+#include "common/temps.h"
+#include "common/stringUtils.h"
 #include "detection/battery/battery.h"
 #include "modules/battery/battery.h"
 
diff --git a/src/modules/battery/option.h b/src/modules/battery/option.h
index 93ef0d50f..1ac5b97be 100644
--- a/src/modules/battery/option.h
+++ b/src/modules/battery/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFBatteryOptions
 {
diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c
index 15234f3cd..60472c8a3 100644
--- a/src/modules/bios/bios.c
+++ b/src/modules/bios/bios.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/bios/bios.h"
 #include "modules/bios/bios.h"
 
diff --git a/src/modules/bios/option.h b/src/modules/bios/option.h
index 350afdcc6..000803569 100644
--- a/src/modules/bios/option.h
+++ b/src/modules/bios/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFBiosOptions
 {
diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c
index d26dbe5c7..810a62523 100644
--- a/src/modules/bluetooth/bluetooth.c
+++ b/src/modules/bluetooth/bluetooth.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/bluetooth/bluetooth.h"
 #include "modules/bluetooth/bluetooth.h"
 
diff --git a/src/modules/bluetooth/option.h b/src/modules/bluetooth/option.h
index 7453a1ebd..516c0d8b4 100644
--- a/src/modules/bluetooth/option.h
+++ b/src/modules/bluetooth/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFBluetoothOptions
 {
diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c
index 8adf8e069..37a7e12d2 100644
--- a/src/modules/bluetoothradio/bluetoothradio.c
+++ b/src/modules/bluetoothradio/bluetoothradio.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/bluetoothradio/bluetoothradio.h"
 #include "modules/bluetoothradio/bluetoothradio.h"
 
diff --git a/src/modules/bluetoothradio/option.h b/src/modules/bluetoothradio/option.h
index 55c3090e3..1b718b834 100644
--- a/src/modules/bluetoothradio/option.h
+++ b/src/modules/bluetoothradio/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFBluetoothRadioOptions
 {
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
index ef4174b2c..98f2a6a0d 100644
--- a/src/modules/board/board.c
+++ b/src/modules/board/board.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/board/board.h"
 #include "modules/board/board.h"
 
diff --git a/src/modules/board/option.h b/src/modules/board/option.h
index 79bcd9c52..bcc69adf3 100644
--- a/src/modules/board/option.h
+++ b/src/modules/board/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFBoardOptions
 {
diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c
index 4c0d80305..a0f0b19c0 100644
--- a/src/modules/bootmgr/bootmgr.c
+++ b/src/modules/bootmgr/bootmgr.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/bootmgr/bootmgr.h"
 #include "modules/bootmgr/bootmgr.h"
 
diff --git a/src/modules/bootmgr/option.h b/src/modules/bootmgr/option.h
index b5a62dbbe..e27e71efd 100644
--- a/src/modules/bootmgr/option.h
+++ b/src/modules/bootmgr/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFBootmgrOptions
 {
diff --git a/src/modules/break/break.c b/src/modules/break/break.c
index 8f68af87d..e3b958782 100644
--- a/src/modules/break/break.c
+++ b/src/modules/break/break.c
@@ -1,4 +1,4 @@
-#include "util/printing.h"
+#include "common/printing.h"
 #include "logo/logo.h"
 #include "modules/break/break.h"
 
diff --git a/src/modules/break/option.h b/src/modules/break/option.h
index b768196ee..e5acbf20d 100644
--- a/src/modules/break/option.h
+++ b/src/modules/break/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFBreakOptions
 {
diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c
index 52bd00d80..054ef6e62 100644
--- a/src/modules/brightness/brightness.c
+++ b/src/modules/brightness/brightness.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/brightness/brightness.h"
 #include "modules/brightness/brightness.h"
 
diff --git a/src/modules/brightness/option.h b/src/modules/brightness/option.h
index 41bb5e202..4ff3843e7 100644
--- a/src/modules/brightness/option.h
+++ b/src/modules/brightness/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFBrightnessOptions
 {
diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c
index fed42af5c..115828b27 100644
--- a/src/modules/btrfs/btrfs.c
+++ b/src/modules/btrfs/btrfs.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/btrfs/btrfs.h"
 #include "modules/btrfs/btrfs.h"
 
diff --git a/src/modules/btrfs/option.h b/src/modules/btrfs/option.h
index 052b5a783..019eacb19 100644
--- a/src/modules/btrfs/option.h
+++ b/src/modules/btrfs/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFBtrfsOptions
 {
diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c
index b40fc71ac..108387ef6 100644
--- a/src/modules/camera/camera.c
+++ b/src/modules/camera/camera.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/camera/camera.h"
 #include "modules/camera/camera.h"
diff --git a/src/modules/camera/option.h b/src/modules/camera/option.h
index 7b99bfc42..6a2481fe8 100644
--- a/src/modules/camera/option.h
+++ b/src/modules/camera/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCameraOptions
 {
diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c
index a9111cf9e..eafb068c1 100644
--- a/src/modules/chassis/chassis.c
+++ b/src/modules/chassis/chassis.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/chassis/chassis.h"
 #include "modules/chassis/chassis.h"
 
diff --git a/src/modules/chassis/option.h b/src/modules/chassis/option.h
index fae05cbed..b3100653f 100644
--- a/src/modules/chassis/option.h
+++ b/src/modules/chassis/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFChassisOptions
 {
diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c
index 9527bbb42..e831920e9 100644
--- a/src/modules/colors/colors.c
+++ b/src/modules/colors/colors.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 #include "logo/logo.h"
 #include "modules/colors/colors.h"
 
diff --git a/src/modules/colors/option.h b/src/modules/colors/option.h
index 12d77a7e4..6a0bbb0d4 100644
--- a/src/modules/colors/option.h
+++ b/src/modules/colors/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFColorsSymbol
 {
diff --git a/src/modules/command/command.c b/src/modules/command/command.c
index 0f8b7e430..84ecba557 100644
--- a/src/modules/command/command.c
+++ b/src/modules/command/command.c
@@ -1,5 +1,5 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
 #include "modules/command/command.h"
 #include "detection/command/command.h"
 
diff --git a/src/modules/command/option.h b/src/modules/command/option.h
index 2b3a13545..06f3b05b3 100644
--- a/src/modules/command/option.h
+++ b/src/modules/command/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCommandOptions
 {
diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c
index 65252a899..1e2e75378 100644
--- a/src/modules/cpu/cpu.c
+++ b/src/modules/cpu/cpu.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/parsing.h"
-#include "util/temps.h"
-#include "util/frequency.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/parsing.h"
+#include "common/temps.h"
+#include "common/frequency.h"
 #include "detection/cpu/cpu.h"
 #include "modules/cpu/cpu.h"
 
diff --git a/src/modules/cpu/option.h b/src/modules/cpu/option.h
index 9dae8e4f8..428b40a6b 100644
--- a/src/modules/cpu/option.h
+++ b/src/modules/cpu/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCPUOptions
 {
diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c
index e9d4df261..e3b801c30 100644
--- a/src/modules/cpucache/cpucache.c
+++ b/src/modules/cpucache/cpucache.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/cpucache/cpucache.h"
 #include "modules/cpucache/cpucache.h"
 
diff --git a/src/modules/cpucache/option.h b/src/modules/cpucache/option.h
index 3ac2c5e04..f53acf691 100644
--- a/src/modules/cpucache/option.h
+++ b/src/modules/cpucache/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCPUCacheOptions
 {
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
index eb04341f1..39854b4e4 100644
--- a/src/modules/cpuusage/cpuusage.c
+++ b/src/modules/cpuusage/cpuusage.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/stringUtils.h"
 #include "detection/cpuusage/cpuusage.h"
 #include "modules/cpuusage/cpuusage.h"
 
diff --git a/src/modules/cpuusage/option.h b/src/modules/cpuusage/option.h
index 32ed6d0bc..dc19fbe76 100644
--- a/src/modules/cpuusage/option.h
+++ b/src/modules/cpuusage/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFCPUUsageOptions
 {
diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c
index e2cd83cef..29bc1b51a 100644
--- a/src/modules/cursor/cursor.c
+++ b/src/modules/cursor/cursor.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/cursor/cursor.h"
 #include "modules/cursor/cursor.h"
 
diff --git a/src/modules/cursor/option.h b/src/modules/cursor/option.h
index 5df94b8e0..3f02c567c 100644
--- a/src/modules/cursor/option.h
+++ b/src/modules/cursor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCursorOptions
 {
diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c
index cee7f9874..95a9bd5c0 100644
--- a/src/modules/custom/custom.c
+++ b/src/modules/custom/custom.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 #include "modules/custom/custom.h"
 
 bool ffPrintCustom(FFCustomOptions* options)
diff --git a/src/modules/custom/option.h b/src/modules/custom/option.h
index 89a6044d0..c66ccee7d 100644
--- a/src/modules/custom/option.h
+++ b/src/modules/custom/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFCustomOptions
 {
diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c
index d65458837..4222ec2a4 100644
--- a/src/modules/datetime/datetime.c
+++ b/src/modules/datetime/datetime.c
@@ -1,7 +1,7 @@
-#include "util/time.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/time.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "modules/datetime/datetime.h"
 
 #include <time.h>
diff --git a/src/modules/datetime/option.h b/src/modules/datetime/option.h
index ef6da988d..fffd5dc51 100644
--- a/src/modules/datetime/option.h
+++ b/src/modules/datetime/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFDateTimeOptions
 {
diff --git a/src/modules/de/de.c b/src/modules/de/de.c
index eac9cc524..04f954464 100644
--- a/src/modules/de/de.c
+++ b/src/modules/de/de.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/de/de.h"
 #include "modules/de/de.h"
diff --git a/src/modules/de/option.h b/src/modules/de/option.h
index b442cb2cb..c587a0c96 100644
--- a/src/modules/de/option.h
+++ b/src/modules/de/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFDEOptions
 {
diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c
index f3656483c..947f7482f 100644
--- a/src/modules/disk/disk.c
+++ b/src/modules/disk/disk.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/time.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/time.h"
 #include "detection/disk/disk.h"
 #include "modules/disk/disk.h"
 
diff --git a/src/modules/disk/option.h b/src/modules/disk/option.h
index 76445ecff..f4ec16f93 100644
--- a/src/modules/disk/option.h
+++ b/src/modules/disk/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef enum __attribute__((__packed__)) FFDiskVolumeType
 {
diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
index de15f18fa..f9e113ccf 100644
--- a/src/modules/diskio/diskio.c
+++ b/src/modules/diskio/diskio.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/diskio/diskio.h"
 #include "modules/diskio/diskio.h"
 
diff --git a/src/modules/diskio/option.h b/src/modules/diskio/option.h
index c32db7e75..5de458fa3 100644
--- a/src/modules/diskio/option.h
+++ b/src/modules/diskio/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFDiskIOOptions
 {
diff --git a/src/modules/display/display.c b/src/modules/display/display.c
index 75dd7b424..9a92b361a 100644
--- a/src/modules/display/display.c
+++ b/src/modules/display/display.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/display/display.h"
 
diff --git a/src/modules/display/option.h b/src/modules/display/option.h
index 6735ec319..12ad3c5ec 100644
--- a/src/modules/display/option.h
+++ b/src/modules/display/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFDisplayCompactType
 {
diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c
index 69596473f..4db146543 100644
--- a/src/modules/dns/dns.c
+++ b/src/modules/dns/dns.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/dns/dns.h"
 #include "modules/dns/dns.h"
 
diff --git a/src/modules/dns/option.h b/src/modules/dns/option.h
index b287d0349..bc3bd5690 100644
--- a/src/modules/dns/option.h
+++ b/src/modules/dns/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFDNSShowType {
     FF_DNS_TYPE_IPV4_BIT = 1,
diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c
index 2f0d501af..7fab5145d 100644
--- a/src/modules/editor/editor.c
+++ b/src/modules/editor/editor.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/editor/editor.h"
 #include "modules/editor/editor.h"
diff --git a/src/modules/editor/option.h b/src/modules/editor/option.h
index 93597d908..f7c545f84 100644
--- a/src/modules/editor/option.h
+++ b/src/modules/editor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFEditorOptions
 {
diff --git a/src/modules/font/font.c b/src/modules/font/font.c
index da568a87f..60da087f3 100644
--- a/src/modules/font/font.c
+++ b/src/modules/font/font.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/font/font.h"
 #include "modules/font/font.h"
 
diff --git a/src/modules/font/option.h b/src/modules/font/option.h
index 83c6e338f..6c942e7dd 100644
--- a/src/modules/font/option.h
+++ b/src/modules/font/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFFontOptions
 {
diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c
index dd213abd0..f1f89e269 100644
--- a/src/modules/gamepad/gamepad.c
+++ b/src/modules/gamepad/gamepad.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/gamepad/gamepad.h"
 #include "modules/gamepad/gamepad.h"
 
diff --git a/src/modules/gamepad/option.h b/src/modules/gamepad/option.h
index a977cd8b5..6425bf00f 100644
--- a/src/modules/gamepad/option.h
+++ b/src/modules/gamepad/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/FFlist.h"
+#include "common/option.h"
+#include "common/FFlist.h"
 
 typedef struct FFGamepadOptions
 {
diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c
index d84750cbd..a2293a147 100644
--- a/src/modules/gpu/gpu.c
+++ b/src/modules/gpu/gpu.c
@@ -1,10 +1,10 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/temps.h"
-#include "util/size.h"
-#include "util/frequency.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/temps.h"
+#include "common/size.h"
+#include "common/frequency.h"
+#include "common/stringUtils.h"
 #include "detection/host/host.h"
 #include "detection/gpu/gpu.h"
 #include "modules/gpu/gpu.h"
diff --git a/src/modules/gpu/option.h b/src/modules/gpu/option.h
index e732877d8..0d1d0fac8 100644
--- a/src/modules/gpu/option.h
+++ b/src/modules/gpu/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef enum __attribute__((__packed__)) FFGPUType
 {
diff --git a/src/modules/host/host.c b/src/modules/host/host.c
index d681db453..cb51ed194 100644
--- a/src/modules/host/host.c
+++ b/src/modules/host/host.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/host/host.h"
 #include "modules/host/host.h"
 
diff --git a/src/modules/host/option.h b/src/modules/host/option.h
index 1fc37b2f5..2516f864c 100644
--- a/src/modules/host/option.h
+++ b/src/modules/host/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFHostOptions
 {
diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c
index e1716edcc..b2c8bbfdf 100644
--- a/src/modules/icons/icons.c
+++ b/src/modules/icons/icons.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/icons/icons.h"
 #include "modules/icons/icons.h"
 
diff --git a/src/modules/icons/option.h b/src/modules/icons/option.h
index 7cc423fad..966bba5f5 100644
--- a/src/modules/icons/option.h
+++ b/src/modules/icons/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFIconsOptions
 {
diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c
index e667c7f59..e64274dab 100644
--- a/src/modules/initsystem/initsystem.c
+++ b/src/modules/initsystem/initsystem.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/initsystem/initsystem.h"
 #include "modules/initsystem/initsystem.h"
 
diff --git a/src/modules/initsystem/option.h b/src/modules/initsystem/option.h
index 922d8fbfe..54c10158e 100644
--- a/src/modules/initsystem/option.h
+++ b/src/modules/initsystem/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFInitSystemOptions
 {
diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c
index 5ef2a3369..97406f58a 100644
--- a/src/modules/kernel/kernel.c
+++ b/src/modules/kernel/kernel.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "modules/kernel/kernel.h"
 
 bool ffPrintKernel(FFKernelOptions* options)
diff --git a/src/modules/kernel/option.h b/src/modules/kernel/option.h
index 3f632ba18..2b2b27d7e 100644
--- a/src/modules/kernel/option.h
+++ b/src/modules/kernel/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFKernelOptions
 {
diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c
index f7749034d..f9a33a1ca 100644
--- a/src/modules/keyboard/keyboard.c
+++ b/src/modules/keyboard/keyboard.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/keyboard/keyboard.h"
 #include "modules/keyboard/keyboard.h"
 
diff --git a/src/modules/keyboard/option.h b/src/modules/keyboard/option.h
index 36784a7f0..a454da331 100644
--- a/src/modules/keyboard/option.h
+++ b/src/modules/keyboard/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/FFlist.h"
+#include "common/option.h"
+#include "common/FFlist.h"
 
 typedef struct FFKeyboardOptions
 {
diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c
index ea5ea1781..ad78ae3ef 100644
--- a/src/modules/lm/lm.c
+++ b/src/modules/lm/lm.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/lm/lm.h"
 #include "modules/lm/lm.h"
 
diff --git a/src/modules/lm/option.h b/src/modules/lm/option.h
index c0ccd9147..21a4ad8b7 100644
--- a/src/modules/lm/option.h
+++ b/src/modules/lm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFLMOptions
 {
diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c
index cb7874e24..4dc996737 100644
--- a/src/modules/loadavg/loadavg.c
+++ b/src/modules/loadavg/loadavg.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/stringUtils.h"
 #include "detection/loadavg/loadavg.h"
 #include "detection/cpu/cpu.h"
 #include "modules/loadavg/loadavg.h"
diff --git a/src/modules/loadavg/option.h b/src/modules/loadavg/option.h
index d5b57094f..947b310db 100644
--- a/src/modules/loadavg/option.h
+++ b/src/modules/loadavg/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFLoadavgOptions
 {
diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c
index d2151ed15..e9574773c 100644
--- a/src/modules/locale/locale.c
+++ b/src/modules/locale/locale.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/locale/locale.h"
 #include "modules/locale/locale.h"
 
diff --git a/src/modules/locale/option.h b/src/modules/locale/option.h
index 2f1efd722..236d61ee3 100644
--- a/src/modules/locale/option.h
+++ b/src/modules/locale/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFLocaleOptions
 {
diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c
index 344e0a25b..35d0489bd 100644
--- a/src/modules/localip/localip.c
+++ b/src/modules/localip/localip.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/localip/localip.h"
 #include "modules/localip/localip.h"
 
diff --git a/src/modules/localip/option.h b/src/modules/localip/option.h
index 140d7c1f4..18205263c 100644
--- a/src/modules/localip/option.h
+++ b/src/modules/localip/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFLocalIpType
 {
diff --git a/src/modules/media/media.c b/src/modules/media/media.c
index e667a2ef8..8540a2568 100644
--- a/src/modules/media/media.c
+++ b/src/modules/media/media.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/media/media.h"
 
diff --git a/src/modules/media/option.h b/src/modules/media/option.h
index 6565c94f1..e90ee854f 100644
--- a/src/modules/media/option.h
+++ b/src/modules/media/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFMediaOptions
 {
diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c
index 10a21bc3b..e3e911666 100644
--- a/src/modules/memory/memory.c
+++ b/src/modules/memory/memory.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/memory/memory.h"
 #include "modules/memory/memory.h"
 
diff --git a/src/modules/memory/option.h b/src/modules/memory/option.h
index a73399281..243847f5f 100644
--- a/src/modules/memory/option.h
+++ b/src/modules/memory/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFMemoryOptions
 {
diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c
index f6b98d8dc..708441848 100644
--- a/src/modules/monitor/monitor.c
+++ b/src/modules/monitor/monitor.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/monitor/monitor.h"
 
diff --git a/src/modules/monitor/option.h b/src/modules/monitor/option.h
index 2aff6e649..07905ecba 100644
--- a/src/modules/monitor/option.h
+++ b/src/modules/monitor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFMonitorOptions
 {
diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c
index 83d04b115..8495b1f37 100644
--- a/src/modules/mouse/mouse.c
+++ b/src/modules/mouse/mouse.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/mouse/mouse.h"
 #include "modules/mouse/mouse.h"
 
diff --git a/src/modules/mouse/option.h b/src/modules/mouse/option.h
index 329e3644a..bea872c40 100644
--- a/src/modules/mouse/option.h
+++ b/src/modules/mouse/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/FFlist.h"
+#include "common/option.h"
+#include "common/FFlist.h"
 
 typedef struct FFMouseOptions
 {
diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c
index 668248ba1..393d82013 100644
--- a/src/modules/netio/netio.c
+++ b/src/modules/netio/netio.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/netio/netio.h"
 #include "modules/netio/netio.h"
 
diff --git a/src/modules/netio/option.h b/src/modules/netio/option.h
index ba30d8b08..61ffa37d5 100644
--- a/src/modules/netio/option.h
+++ b/src/modules/netio/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFNetIOOptions
 {
diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c
index 829c98875..19e303cf7 100644
--- a/src/modules/opencl/opencl.c
+++ b/src/modules/opencl/opencl.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/opencl/opencl.h"
 #include "detection/gpu/gpu.h"
 #include "modules/opencl/opencl.h"
diff --git a/src/modules/opencl/option.h b/src/modules/opencl/option.h
index 0c020e140..2fd7dff26 100644
--- a/src/modules/opencl/option.h
+++ b/src/modules/opencl/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFOpenCLOptions
 {
diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c
index 421ff5ef0..47e055af4 100644
--- a/src/modules/opengl/opengl.c
+++ b/src/modules/opengl/opengl.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/opengl/opengl.h"
 #include "modules/opengl/opengl.h"
 
diff --git a/src/modules/opengl/option.h b/src/modules/opengl/option.h
index aabd35262..cc4b6ef46 100644
--- a/src/modules/opengl/option.h
+++ b/src/modules/opengl/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFOpenGLLibrary
 {
diff --git a/src/modules/os/option.h b/src/modules/os/option.h
index 2fff435ca..c7142b237 100644
--- a/src/modules/os/option.h
+++ b/src/modules/os/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFOSOptions
 {
diff --git a/src/modules/os/os.c b/src/modules/os/os.c
index 5e6981194..0b3447ffe 100644
--- a/src/modules/os/os.c
+++ b/src/modules/os/os.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/option.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/option.h"
+#include "common/stringUtils.h"
 #include "detection/os/os.h"
 #include "modules/os/os.h"
 
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
index d7a83b2fa..f39541388 100644
--- a/src/modules/packages/option.h
+++ b/src/modules/packages/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFPackagesFlags
 {
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index 59670ec95..c9d3d5580 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/packages/packages.h"
 #include "modules/packages/packages.h"
 
diff --git a/src/modules/physicaldisk/option.h b/src/modules/physicaldisk/option.h
index 8e65494e1..3951f0610 100644
--- a/src/modules/physicaldisk/option.h
+++ b/src/modules/physicaldisk/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFPhysicalDiskOptions
 {
diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c
index 8f66cebee..83de62739 100644
--- a/src/modules/physicaldisk/physicaldisk.c
+++ b/src/modules/physicaldisk/physicaldisk.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/temps.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/temps.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/physicaldisk/physicaldisk.h"
 #include "modules/physicaldisk/physicaldisk.h"
 
diff --git a/src/modules/physicalmemory/option.h b/src/modules/physicalmemory/option.h
index df41b4d5f..154354b4a 100644
--- a/src/modules/physicalmemory/option.h
+++ b/src/modules/physicalmemory/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFPhysicalMemoryOptions
 {
diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c
index 4798541ae..7f3e58e79 100644
--- a/src/modules/physicalmemory/physicalmemory.c
+++ b/src/modules/physicalmemory/physicalmemory.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/physicalmemory/physicalmemory.h"
 #include "modules/physicalmemory/physicalmemory.h"
 
diff --git a/src/modules/player/option.h b/src/modules/player/option.h
index 152253394..9d55821fd 100644
--- a/src/modules/player/option.h
+++ b/src/modules/player/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFPlayerOptions
 {
diff --git a/src/modules/player/player.c b/src/modules/player/player.c
index 37eca4d96..b79007a0c 100644
--- a/src/modules/player/player.c
+++ b/src/modules/player/player.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/player/player.h"
 
diff --git a/src/modules/poweradapter/option.h b/src/modules/poweradapter/option.h
index 96d37ded1..303bbba73 100644
--- a/src/modules/poweradapter/option.h
+++ b/src/modules/poweradapter/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFPowerAdapterOptions
 {
diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c
index 93117b863..c192f8d06 100644
--- a/src/modules/poweradapter/poweradapter.c
+++ b/src/modules/poweradapter/poweradapter.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/poweradapter/poweradapter.h"
 #include "modules/poweradapter/poweradapter.h"
 
diff --git a/src/modules/processes/option.h b/src/modules/processes/option.h
index 4f11f77f6..0b59f9df3 100644
--- a/src/modules/processes/option.h
+++ b/src/modules/processes/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFProcessesOptions
 {
diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c
index 130bed411..4773f9e24 100644
--- a/src/modules/processes/processes.c
+++ b/src/modules/processes/processes.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/processes/processes.h"
 #include "modules/processes/processes.h"
 
diff --git a/src/modules/publicip/option.h b/src/modules/publicip/option.h
index c02d4450c..e3118cb28 100644
--- a/src/modules/publicip/option.h
+++ b/src/modules/publicip/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFPublicIPOptions
 {
diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c
index 3c842c938..7b6691e98 100644
--- a/src/modules/publicip/publicip.c
+++ b/src/modules/publicip/publicip.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "modules/publicip/publicip.h"
 #include "detection/publicip/publicip.h"
 
diff --git a/src/modules/separator/option.h b/src/modules/separator/option.h
index b905f90fe..a8b31379d 100644
--- a/src/modules/separator/option.h
+++ b/src/modules/separator/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFSeparatorOptions
 {
diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c
index 1b7a898f6..a04ae8c36 100644
--- a/src/modules/separator/separator.c
+++ b/src/modules/separator/separator.c
@@ -1,9 +1,9 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
-#include "util/wcwidth.h"
-#include "util/textModifier.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
+#include "common/wcwidth.h"
+#include "common/textModifier.h"
 #include "logo/logo.h"
 #include "modules/separator/separator.h"
 
diff --git a/src/modules/shell/option.h b/src/modules/shell/option.h
index 5567ca970..49ec83f51 100644
--- a/src/modules/shell/option.h
+++ b/src/modules/shell/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFShellOptions
 {
diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c
index 0e6ef540e..388a2578d 100644
--- a/src/modules/shell/shell.c
+++ b/src/modules/shell/shell.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/shell/shell.h"
 
diff --git a/src/modules/sound/option.h b/src/modules/sound/option.h
index c5f25e5ef..0c9f0fd4f 100644
--- a/src/modules/sound/option.h
+++ b/src/modules/sound/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef enum __attribute__((__packed__)) FFSoundType
 {
diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c
index d5d12e55f..8a92242df 100644
--- a/src/modules/sound/sound.c
+++ b/src/modules/sound/sound.c
@@ -1,7 +1,7 @@
-#include "util/percent.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/sound/sound.h"
 #include "modules/sound/sound.h"
 
diff --git a/src/modules/swap/option.h b/src/modules/swap/option.h
index 61f82935e..2d9691100 100644
--- a/src/modules/swap/option.h
+++ b/src/modules/swap/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFSwapOptions
 {
diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c
index d6a5d06c6..5ad50ff9d 100644
--- a/src/modules/swap/swap.c
+++ b/src/modules/swap/swap.c
@@ -1,8 +1,8 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/stringUtils.h"
 #include "detection/swap/swap.h"
 #include "modules/swap/swap.h"
 
diff --git a/src/modules/terminal/option.h b/src/modules/terminal/option.h
index 744c03a4e..49b005e03 100644
--- a/src/modules/terminal/option.h
+++ b/src/modules/terminal/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTerminalOptions
 {
diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c
index dd8bbdf00..c9b6b0277 100644
--- a/src/modules/terminal/terminal.c
+++ b/src/modules/terminal/terminal.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/terminal/terminal.h"
 
diff --git a/src/modules/terminalfont/option.h b/src/modules/terminalfont/option.h
index 972341123..db652adce 100644
--- a/src/modules/terminalfont/option.h
+++ b/src/modules/terminalfont/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTerminalFontOptions
 {
diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c
index 4cdf30085..808a35146 100644
--- a/src/modules/terminalfont/terminalfont.c
+++ b/src/modules/terminalfont/terminalfont.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/terminalfont/terminalfont.h"
 #include "modules/terminalfont/terminalfont.h"
 
diff --git a/src/modules/terminalsize/option.h b/src/modules/terminalsize/option.h
index ec9f221ff..518856a8c 100644
--- a/src/modules/terminalsize/option.h
+++ b/src/modules/terminalsize/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTerminalSizeOptions
 {
diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c
index ed380e7b4..d0e04af93 100644
--- a/src/modules/terminalsize/terminalsize.c
+++ b/src/modules/terminalsize/terminalsize.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/terminalsize/terminalsize.h"
 #include "modules/terminalsize/terminalsize.h"
 
diff --git a/src/modules/terminaltheme/option.h b/src/modules/terminaltheme/option.h
index d2a55bf20..3d8cdc252 100644
--- a/src/modules/terminaltheme/option.h
+++ b/src/modules/terminaltheme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTerminalThemeOptions
 {
diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c
index 2ffb37ee9..1272d1267 100644
--- a/src/modules/terminaltheme/terminaltheme.c
+++ b/src/modules/terminaltheme/terminaltheme.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "modules/terminaltheme/terminaltheme.h"
 
diff --git a/src/modules/theme/option.h b/src/modules/theme/option.h
index 614c24626..ca232bfb9 100644
--- a/src/modules/theme/option.h
+++ b/src/modules/theme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFThemeOptions
 {
diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c
index 8a31f89b6..470babf22 100644
--- a/src/modules/theme/theme.c
+++ b/src/modules/theme/theme.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/theme/theme.h"
 #include "modules/theme/theme.h"
 
diff --git a/src/modules/title/option.h b/src/modules/title/option.h
index 99b29a2f5..16505d39b 100644
--- a/src/modules/title/option.h
+++ b/src/modules/title/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTitleOptions
 {
diff --git a/src/modules/title/title.c b/src/modules/title/title.c
index 04ad37c37..d846b2817 100644
--- a/src/modules/title/title.c
+++ b/src/modules/title/title.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/textModifier.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/textModifier.h"
 #include "modules/title/title.h"
 
 static void appendText(FFstrbuf* output, const FFstrbuf* text, const FFstrbuf* color)
diff --git a/src/modules/tpm/option.h b/src/modules/tpm/option.h
index a7c0ca7d2..19fb79029 100644
--- a/src/modules/tpm/option.h
+++ b/src/modules/tpm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFTPMOptions
 {
diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c
index 5c5d31960..8ab9e12df 100644
--- a/src/modules/tpm/tpm.c
+++ b/src/modules/tpm/tpm.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/tpm/tpm.h"
 #include "modules/tpm/tpm.h"
 
diff --git a/src/modules/uptime/option.h b/src/modules/uptime/option.h
index ae92d600a..4235995c5 100644
--- a/src/modules/uptime/option.h
+++ b/src/modules/uptime/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFUptimeOptions
 {
diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c
index d3184865a..5d4b5d2e3 100644
--- a/src/modules/uptime/uptime.c
+++ b/src/modules/uptime/uptime.c
@@ -1,8 +1,8 @@
-#include "util/duration.h"
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/time.h"
-#include "util/stringUtils.h"
+#include "common/duration.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/time.h"
+#include "common/stringUtils.h"
 #include "detection/uptime/uptime.h"
 #include "modules/uptime/uptime.h"
 
diff --git a/src/modules/users/option.h b/src/modules/users/option.h
index 151395209..16ea5e88f 100644
--- a/src/modules/users/option.h
+++ b/src/modules/users/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFUsersOptions
 {
diff --git a/src/modules/users/users.c b/src/modules/users/users.c
index a089231ab..7169b7bda 100644
--- a/src/modules/users/users.c
+++ b/src/modules/users/users.c
@@ -1,7 +1,7 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/time.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/time.h"
+#include "common/stringUtils.h"
 #include "detection/users/users.h"
 #include "modules/users/users.h"
 
diff --git a/src/modules/version/option.h b/src/modules/version/option.h
index 8f528ea18..f3b68b4f2 100644
--- a/src/modules/version/option.h
+++ b/src/modules/version/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFVersionOptions
 {
diff --git a/src/modules/version/version.c b/src/modules/version/version.c
index a12e330ba..2e21f8645 100644
--- a/src/modules/version/version.c
+++ b/src/modules/version/version.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/version/version.h"
 #include "modules/version/version.h"
diff --git a/src/modules/vulkan/option.h b/src/modules/vulkan/option.h
index faf22440e..38ec20c99 100644
--- a/src/modules/vulkan/option.h
+++ b/src/modules/vulkan/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFVulkanOptions
 {
diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c
index 2f2629a6a..69d1884ba 100644
--- a/src/modules/vulkan/vulkan.c
+++ b/src/modules/vulkan/vulkan.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/gpu/gpu.h"
 #include "detection/vulkan/vulkan.h"
 #include "modules/vulkan/vulkan.h"
diff --git a/src/modules/wallpaper/option.h b/src/modules/wallpaper/option.h
index b19f06987..621699fa3 100644
--- a/src/modules/wallpaper/option.h
+++ b/src/modules/wallpaper/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFWallpaperOptions
 {
diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c
index e8da5ecfe..76de9577b 100644
--- a/src/modules/wallpaper/wallpaper.c
+++ b/src/modules/wallpaper/wallpaper.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/wallpaper/wallpaper.h"
 #include "modules/wallpaper/wallpaper.h"
 
diff --git a/src/modules/weather/option.h b/src/modules/weather/option.h
index 73089f637..76c3df11b 100644
--- a/src/modules/weather/option.h
+++ b/src/modules/weather/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFWeatherOptions
 {
diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c
index 9f4a9b9ca..3321c7dba 100644
--- a/src/modules/weather/weather.c
+++ b/src/modules/weather/weather.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/weather/weather.h"
 #include "modules/weather/weather.h"
 
diff --git a/src/modules/wifi/option.h b/src/modules/wifi/option.h
index 913980c3e..f74579267 100644
--- a/src/modules/wifi/option.h
+++ b/src/modules/wifi/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFWifiOptions
 {
diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c
index c37d75adf..16df168c5 100644
--- a/src/modules/wifi/wifi.c
+++ b/src/modules/wifi/wifi.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/wifi/wifi.h"
 #include "modules/wifi/wifi.h"
 
diff --git a/src/modules/wm/option.h b/src/modules/wm/option.h
index 0165280f1..d213c9c3a 100644
--- a/src/modules/wm/option.h
+++ b/src/modules/wm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFWMOptions
 {
diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c
index 49b117fb5..fbfa6c10b 100644
--- a/src/modules/wm/wm.c
+++ b/src/modules/wm/wm.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/wm/wm.h"
 #include "modules/wm/wm.h"
diff --git a/src/modules/wmtheme/option.h b/src/modules/wmtheme/option.h
index c1113c26c..b12f9f8b3 100644
--- a/src/modules/wmtheme/option.h
+++ b/src/modules/wmtheme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/option.h"
+#include "common/option.h"
 
 typedef struct FFWMThemeOptions
 {
diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c
index c82a6f30b..0289307dc 100644
--- a/src/modules/wmtheme/wmtheme.c
+++ b/src/modules/wmtheme/wmtheme.c
@@ -1,6 +1,6 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "detection/wmtheme/wmtheme.h"
 #include "modules/wmtheme/wmtheme.h"
 
diff --git a/src/modules/zpool/option.h b/src/modules/zpool/option.h
index 00f57fae8..49522b3be 100644
--- a/src/modules/zpool/option.h
+++ b/src/modules/zpool/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/option.h"
-#include "util/percent.h"
+#include "common/option.h"
+#include "common/percent.h"
 
 typedef struct FFZpoolOptions
 {
diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c
index f615695bf..9c02dfabe 100644
--- a/src/modules/zpool/zpool.c
+++ b/src/modules/zpool/zpool.c
@@ -1,9 +1,9 @@
-#include "util/printing.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/size.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/size.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
 #include "detection/zpool/zpool.h"
 #include "modules/zpool/zpool.h"
 
diff --git a/src/options/display.c b/src/options/display.c
index fb1533319..ef891a589 100644
--- a/src/options/display.c
+++ b/src/options/display.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/color.h"
-#include "util/jsonconfig.h"
-#include "util/percent.h"
-#include "util/stringUtils.h"
+#include "common/color.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "common/stringUtils.h"
 #include "options/display.h"
 
 #include <unistd.h>
diff --git a/src/options/display.h b/src/options/display.h
index 5a98309d9..655ff1110 100644
--- a/src/options/display.h
+++ b/src/options/display.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "util/percent.h"
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/percent.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 typedef enum __attribute__((__packed__)) FFSizeBinaryPrefixType
 {
diff --git a/src/options/general.c b/src/options/general.c
index c1a22e7e1..c6daa4c13 100644
--- a/src/options/general.c
+++ b/src/options/general.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/jsonconfig.h"
-#include "util/processing.h"
-#include "util/stringUtils.h"
+#include "common/jsonconfig.h"
+#include "common/processing.h"
+#include "common/stringUtils.h"
 #include "options/general.h"
 
 #include <unistd.h>
diff --git a/src/options/general.h b/src/options/general.h
index 0edcfeb2d..5eda69e9c 100644
--- a/src/options/general.h
+++ b/src/options/general.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 typedef enum __attribute__((__packed__)) FFDsForceDrmType
 {
diff --git a/src/options/logo.c b/src/options/logo.c
index 5b49e061c..1a5693f29 100644
--- a/src/options/logo.c
+++ b/src/options/logo.c
@@ -1,7 +1,7 @@
 #include "logo/logo.h"
 
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 
 void ffOptionsInitLogo(FFOptionsLogo* options)
 {
diff --git a/src/options/logo.h b/src/options/logo.h
index 94dd2a95b..1d85663b3 100644
--- a/src/options/logo.h
+++ b/src/options/logo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 #define FASTFETCH_LOGO_MAX_NAMES 9
 #define FASTFETCH_LOGO_MAX_COLORS 9 //two digits would make parsing much more complicated (index 1 - 9)
diff --git a/tests/color.c b/tests/color.c
index 430317bb9..d000c2f53 100644
--- a/tests/color.c
+++ b/tests/color.c
@@ -1,5 +1,5 @@
-#include "util/format.h"
-#include "util/textModifier.h"
+#include "common/format.h"
+#include "common/textModifier.h"
 #include "fastfetch.h"
 
 #include <stdlib.h>
diff --git a/tests/duration.c b/tests/duration.c
index 24b3c5fe5..a8f2aacea 100644
--- a/tests/duration.c
+++ b/tests/duration.c
@@ -1,5 +1,5 @@
-#include "util/duration.h"
-#include "util/textModifier.h"
+#include "common/duration.h"
+#include "common/textModifier.h"
 #include "fastfetch.h"
 
 #include <stdlib.h>
diff --git a/tests/format.c b/tests/format.c
index df0b58b4e..1606ba885 100644
--- a/tests/format.c
+++ b/tests/format.c
@@ -1,5 +1,5 @@
-#include "util/format.h"
-#include "util/textModifier.h"
+#include "common/format.h"
+#include "common/textModifier.h"
 #include "fastfetch.h"
 
 #include <stdlib.h>
diff --git a/tests/list.c b/tests/list.c
index c7c1752eb..70a5739b2 100644
--- a/tests/list.c
+++ b/tests/list.c
@@ -1,5 +1,5 @@
-#include "util/FFlist.h"
-#include "util/textModifier.h"
+#include "common/FFlist.h"
+#include "common/textModifier.h"
 
 #include <string.h>
 #include <stdarg.h>
diff --git a/tests/strbuf.c b/tests/strbuf.c
index 466fb9297..7e8058018 100644
--- a/tests/strbuf.c
+++ b/tests/strbuf.c
@@ -1,5 +1,5 @@
-#include "util/FFstrbuf.h"
-#include "util/textModifier.h"
+#include "common/FFstrbuf.h"
+#include "common/textModifier.h"
 
 #include <string.h>
 #include <stdlib.h>