diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18ae01633..efe91f626 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,26 +364,6 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}")
 #######################
 
 set(LIBFASTFETCH_SRC
-    src/common/commandoption.c
-    src/common/duration.c
-    src/common/font.c
-    src/common/format.c
-    src/common/frequency.c
-    src/common/init.c
-    src/common/jsonconfig.c
-    src/common/library.c
-    src/common/modules.c
-    src/common/netif/netif.c
-    src/common/networking/networking_common.c
-    src/common/option.c
-    src/common/parsing.c
-    src/common/percent.c
-    src/common/printing.c
-    src/common/properties.c
-    src/common/settings.c
-    src/common/size.c
-    src/common/temps.c
-    src/common/time.c
     src/detection/bluetoothradio/bluetoothradio.c
     src/detection/bootmgr/bootmgr.c
     src/detection/chassis/chassis.c
@@ -492,6 +472,26 @@ set(LIBFASTFETCH_SRC
     src/options/display.c
     src/options/logo.c
     src/options/general.c
+    src/util/commandoption.c
+    src/util/duration.c
+    src/util/font.c
+    src/util/format.c
+    src/util/frequency.c
+    src/util/init.c
+    src/util/jsonconfig.c
+    src/util/library.c
+    src/util/modules.c
+    src/util/netif/netif.c
+    src/util/networking/networking_common.c
+    src/util/option.c
+    src/util/parsing.c
+    src/util/percent.c
+    src/util/printing.c
+    src/util/properties.c
+    src/util/settings.c
+    src/util/size.c
+    src/util/temps.c
+    src/util/time.c
     src/util/edidHelper.c
     src/util/base64.c
     src/util/FFlist.c
@@ -504,11 +504,6 @@ set(LIBFASTFETCH_SRC
 
 if(LINUX)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_linux.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
         src/detection/battery/battery_linux.c
         src/detection/bios/bios_linux.c
         src/detection/board/board_linux.c
@@ -583,16 +578,16 @@ if(LINUX)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_linux.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_linux.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
         src/detection/battery/battery_android.c
         src/detection/bios/bios_android.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -656,17 +651,16 @@ elseif(ANDROID)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_android.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_linux.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(FreeBSD)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
         src/detection/battery/battery_bsd.c
         src/detection/bios/bios_bsd.c
         src/detection/bluetoothradio/bluetoothradio_nosupport.c
@@ -738,6 +732,12 @@ elseif(FreeBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_bsd.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
+        src/util/sysctl.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
@@ -754,12 +754,6 @@ elseif(FreeBSD)
     endif()
 elseif(NetBSD)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
         src/detection/battery/battery_nbsd.c
         src/detection/bios/bios_nbsd.c
         src/detection/bluetooth/bluetooth_bsd.c
@@ -831,17 +825,17 @@ elseif(NetBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_bsd.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
+        src/util/sysctl.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(OpenBSD)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
         src/detection/battery/battery_obsd.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -913,17 +907,18 @@ elseif(OpenBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_bsd.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
+        src/util/sysctl.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
         src/util/smbiosHelper.c
     )
 elseif(APPLE)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/io/io_unix.c
-        src/common/netif/netif_apple.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
         src/detection/battery/battery_apple.c
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
@@ -982,6 +977,11 @@ elseif(APPLE)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_apple.m
         src/detection/camera/camera_apple.m
+        src/util/io/io_unix.c
+        src/util/netif/netif_apple.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
+        src/util/sysctl.c
         src/util/apple/cf_helpers.c
         src/util/apple/osascript.m
         src/util/apple/smc_temps.c
@@ -990,10 +990,6 @@ elseif(APPLE)
     )
 elseif(WIN32)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/io/io_windows.c
-        src/common/netif/netif_windows.c
-        src/common/networking/networking_windows.c
-        src/common/processing_windows.c
         src/detection/battery/battery_windows.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
@@ -1051,6 +1047,10 @@ elseif(WIN32)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_windows.c
         src/detection/camera/camera_windows.cpp
+        src/util/io/io_windows.c
+        src/util/netif/netif_windows.c
+        src/util/networking/networking_windows.c
+        src/util/processing_windows.c
         src/util/windows/getline.c
         src/util/windows/com.cpp
         src/util/windows/registry.c
@@ -1063,11 +1063,6 @@ elseif(WIN32)
     )
 elseif(SunOS)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_apple.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1139,16 +1134,16 @@ elseif(SunOS)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_apple.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
 elseif(Haiku)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_haiku.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
         src/detection/battery/battery_haiku.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1207,17 +1202,17 @@ elseif(Haiku)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_nosupport.c
         src/detection/camera/camera_nosupport.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_haiku.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
         src/util/haiku/version.cpp
     )
 elseif(GNU)
     list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_gnu.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_nosupport.c
         src/detection/board/board_nosupport.c
@@ -1286,6 +1281,11 @@ elseif(GNU)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
+        src/util/dbus.c
+        src/util/io/io_unix.c
+        src/util/netif/netif_gnu.c
+        src/util/networking/networking_linux.c
+        src/util/processing_linux.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
    )
diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c
index c7f0090b3..fc7f3fcdb 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 "common/processing.h"
-#include "common/properties.h"
+#include "util/processing.h"
+#include "util/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_bsd.c b/src/detection/battery/battery_bsd.c
index 2997070cd..c938cb365 100644
--- a/src/detection/battery/battery_bsd.c
+++ b/src/detection/battery/battery_bsd.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/sysctl.h"
+#include "util/io/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 181049e2d..205d584e6 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 "common/io/io.h"
+#include "util/io/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 d6987bc35..773af2a1c 100644
--- a/src/detection/battery/battery_linux.c
+++ b/src/detection/battery/battery_linux.c
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>
diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
index 671fae360..df4225683 100644
--- a/src/detection/battery/battery_nbsd.c
+++ b/src/detection/battery/battery_nbsd.c
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c
index c9ef03c87..ad8369db1 100644
--- a/src/detection/battery/battery_obsd.c
+++ b/src/detection/battery/battery_obsd.c
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/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 9730664a0..e0f9425ef 100644
--- a/src/detection/battery/battery_windows.c
+++ b/src/detection/battery/battery_windows.c
@@ -1,6 +1,6 @@
 #include "battery.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/windows/nt.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
diff --git a/src/detection/bios/bios_android.c b/src/detection/bios/bios_android.c
index b2b20aaf9..256d6d830 100644
--- a/src/detection/bios/bios_android.c
+++ b/src/detection/bios/bios_android.c
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/settings.h"
+#include "util/settings.h"
 
 const char* ffDetectBios(FFBiosResult* bios)
 {
diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c
index 00b1bd394..cdf1767f0 100644
--- a/src/detection/bios/bios_bsd.c
+++ b/src/detection/bios/bios_bsd.c
@@ -1,8 +1,8 @@
 #include "bios.h"
 
-#include "common/settings.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/settings.h"
+#include "util/sysctl.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectBios(FFBiosResult* result)
diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c
index fc86b3a2e..446371a25 100644
--- a/src/detection/bios/bios_linux.c
+++ b/src/detection/bios/bios_linux.c
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/bios/bios_nbsd.c b/src/detection/bios/bios_nbsd.c
index 3330a74f4..a1e920b77 100644
--- a/src/detection/bios/bios_nbsd.c
+++ b/src/detection/bios/bios_nbsd.c
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectBios(FFBiosResult* bios)
diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c
index ea1977b1a..184a462dc 100644
--- a/src/detection/bios/bios_windows.c
+++ b/src/detection/bios/bios_windows.c
@@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
     };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
 #elif __OpenBSD__
-#include "common/io/io.h"
+#include "util/io/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 89ae13624..4785a8f2c 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 "common/io/io.h"
+#include "util/io/io.h"
 }
 
 #include <bluetooth/LocalDevice.h>
diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c
index c56b38558..3479d1428 100644
--- a/src/detection/bluetooth/bluetooth_linux.c
+++ b/src/detection/bluetooth/bluetooth_linux.c
@@ -2,8 +2,8 @@
 #include "util/stringUtils.h"
 
 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
-#include "common/io/io.h"
+#include "util/dbus.h"
+#include "util/io/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 8f1a685d3..841695668 100644
--- a/src/detection/bluetooth/bluetooth_windows.c
+++ b/src/detection/bluetooth/bluetooth_windows.c
@@ -1,5 +1,5 @@
 #include "bluetooth.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/bluetoothradio/bluetoothradio_apple.m b/src/detection/bluetoothradio/bluetoothradio_apple.m
index 63af39d9c..0e9ceb0e9 100644
--- a/src/detection/bluetoothradio/bluetoothradio_apple.m
+++ b/src/detection/bluetoothradio/bluetoothradio_apple.m
@@ -1,5 +1,5 @@
 #include "bluetoothradio.h"
-#include "common/processing.h"
+#include "util/processing.h"
 
 #import <IOBluetooth/IOBluetooth.h>
 
diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c
index 1eb0e4e09..9bfc6c20b 100644
--- a/src/detection/bluetoothradio/bluetoothradio_linux.c
+++ b/src/detection/bluetoothradio/bluetoothradio_linux.c
@@ -2,8 +2,8 @@
 #include "util/stringUtils.h"
 
 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
-#include "common/io/io.h"
+#include "util/dbus.h"
+#include "util/io/io.h"
 
 /* Example dbus reply:
 array [
diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c
index 2fc94d6b3..288d6255b 100644
--- a/src/detection/bluetoothradio/bluetoothradio_windows.c
+++ b/src/detection/bluetoothradio/bluetoothradio_windows.c
@@ -1,6 +1,6 @@
 #include "bluetoothradio.h"
-#include "common/library.h"
-#include "common/io/io.h"
+#include "util/library.h"
+#include "util/io/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/board/board_android.c b/src/detection/board/board_android.c
index 64e917e6a..c1d504062 100644
--- a/src/detection/board/board_android.c
+++ b/src/detection/board/board_android.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/settings.h"
+#include "util/settings.h"
 
 const char* ffDetectBoard(FFBoardResult* board)
 {
diff --git a/src/detection/board/board_bsd.c b/src/detection/board/board_bsd.c
index 3fc5f9637..4f138286e 100644
--- a/src/detection/board/board_bsd.c
+++ b/src/detection/board/board_bsd.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectBoard(FFBoardResult* result)
diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c
index 70cd54034..bd3a4a522 100644
--- a/src/detection/board/board_linux.c
+++ b/src/detection/board/board_linux.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c
index cc89149aa..bcb713f5d 100644
--- a/src/detection/board/board_nbsd.c
+++ b/src/detection/board/board_nbsd.c
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectBoard(FFBoardResult* board)
diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c
index 764489974..e9d1e90ec 100644
--- a/src/detection/bootmgr/bootmgr_apple.c
+++ b/src/detection/bootmgr/bootmgr_apple.c
@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/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 989ac348e..19d6db1b6 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 "common/io/io.h"
+#include "util/io/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 7a47dc5f3..74e6cd242 100644
--- a/src/detection/bootmgr/bootmgr_linux.c
+++ b/src/detection/bootmgr/bootmgr_linux.c
@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "common/io/io.h"
+#include "util/io/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 dea46b2ea..6f46f497f 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #include <windows.h>
 
diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c
index 6b7a0a8b3..07d7239db 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 "common/io/io.h"
+#include "util/io/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 bff5f173c..b24f0aef6 100644
--- a/src/detection/brightness/brightness_linux.c
+++ b/src/detection/brightness/brightness_linux.c
@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 
@@ -87,7 +87,7 @@ static const char* detectWithBacklight(FFlist* result)
 
 #ifdef FF_HAVE_DDCUTIL
 #include "detection/displayserver/displayserver.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 
 #include <ddcutil_macros.h>
diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c
index 67464772e..3e5b629b2 100644
--- a/src/detection/brightness/brightness_nbsd.c
+++ b/src/detection/brightness/brightness_nbsd.c
@@ -1,6 +1,6 @@
 #include "brightness.h"
 
-#include "common/sysctl.h"
+#include "util/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 e5b944a42..ddae77163 100644
--- a/src/detection/brightness/brightness_obsd.c
+++ b/src/detection/brightness/brightness_obsd.c
@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "common/io/io.h"
+#include "util/io/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 493347670..8cddd3b76 100644
--- a/src/detection/brightness/brightness_windows.cpp
+++ b/src/detection/brightness/brightness_windows.cpp
@@ -2,7 +2,7 @@ extern "C"
 {
 #include "brightness.h"
 #include "detection/displayserver/displayserver.h"
-#include "common/library.h"
+#include "util/library.h"
 }
 #include "util/windows/wmi.hpp"
 #include "util/windows/unicode.hpp"
diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c
index e48496fff..5dc190741 100644
--- a/src/detection/btrfs/btrfs_linux.c
+++ b/src/detection/btrfs/btrfs_linux.c
@@ -1,6 +1,6 @@
 #include "btrfs.h"
 
-#include "common/io/io.h"
+#include "util/io/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 7f5f24447..804e2ead8 100644
--- a/src/detection/camera/camera_android.c
+++ b/src/detection/camera/camera_android.c
@@ -1,7 +1,7 @@
 #include "camera.h"
 
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/processing.h"
+#include "util/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 49a296fbb..7549f9123 100644
--- a/src/detection/camera/camera_apple.m
+++ b/src/detection/camera/camera_apple.m
@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #import <AVFoundation/AVCaptureDevice.h>
 
diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c
index 09a6fb06d..988c41293 100644
--- a/src/detection/camera/camera_linux.c
+++ b/src/detection/camera/camera_linux.c
@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "common/io/io.h"
+#include "util/io/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 356945158..f185cc131 100644
--- a/src/detection/camera/camera_windows.cpp
+++ b/src/detection/camera/camera_windows.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "camera.h"
-#include "common/library.h"
+#include "util/library.h"
 }
 #include "util/windows/com.hpp"
 #include "util/windows/unicode.hpp"
diff --git a/src/detection/chassis/chassis_bsd.c b/src/detection/chassis/chassis_bsd.c
index 816a5dcad..d660d668e 100644
--- a/src/detection/chassis/chassis_bsd.c
+++ b/src/detection/chassis/chassis_bsd.c
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectChassis(FFChassisResult* result)
diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c
index 8968a2093..93aa79e06 100644
--- a/src/detection/chassis/chassis_linux.c
+++ b/src/detection/chassis/chassis_linux.c
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c
index c2593bf85..b9786cee4 100644
--- a/src/detection/chassis/chassis_nbsd.c
+++ b/src/detection/chassis/chassis_nbsd.c
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectChassis(FFChassisResult* chassis)
diff --git a/src/detection/command/command.c b/src/detection/command/command.c
index f99c4fda5..d6263eed7 100644
--- a/src/detection/command/command.c
+++ b/src/detection/command/command.c
@@ -1,6 +1,6 @@
-#include "common/processing.h"
-#include "util/FFstrbuf.h"
 #include "detection/command/command.h"
+#include "util/processing.h"
+#include "util/FFstrbuf.h"
 
 typedef struct FFCommandResultBundle
 {
diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c
index 37bd27a63..c10f04541 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 "common/io/io.h"
+#include "util/io/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 efa7bb04a..f046a2e45 100644
--- a/src/detection/cpu/cpu_apple.c
+++ b/src/detection/cpu/cpu_apple.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/apple/smc_temps.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c
index aff68c2a2..9bc0605a1 100644
--- a/src/detection/cpu/cpu_bsd.c
+++ b/src/detection/cpu/cpu_bsd.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"
 
 #include <sys/param.h>
diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c
index bdb567700..9fc2287ec 100644
--- a/src/detection/cpu/cpu_linux.c
+++ b/src/detection/cpu/cpu_linux.c
@@ -1,7 +1,7 @@
 #include "cpu.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/processing.h"
+#include "util/properties.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/path.h"
@@ -200,7 +200,7 @@ static void detectNumaNodes(FFCPUResult* cpu)
 }
 
 #ifdef __ANDROID__
-#include "common/settings.h"
+#include "util/settings.h"
 
 static void detectQualcomm(FFCPUResult* cpu)
 {
diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
index 38ee1b3fd..6f115a930 100644
--- a/src/detection/cpu/cpu_nbsd.c
+++ b/src/detection/cpu/cpu_nbsd.c
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/sysctl.h"
+#include "util/io/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 3ac5893f6..cc1638002 100644
--- a/src/detection/cpu/cpu_obsd.c
+++ b/src/detection/cpu/cpu_obsd.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"
 
 #include <errno.h>
diff --git a/src/detection/cpu/cpu_sunos.c b/src/detection/cpu/cpu_sunos.c
index 1ae1f77c6..0f9bb994f 100644
--- a/src/detection/cpu/cpu_sunos.c
+++ b/src/detection/cpu/cpu_sunos.c
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 #include <kstat.h>
 
diff --git a/src/detection/cpucache/cpucache_apple.c b/src/detection/cpucache/cpucache_apple.c
index cacb85df6..9496d4261 100644
--- a/src/detection/cpucache/cpucache_apple.c
+++ b/src/detection/cpucache/cpucache_apple.c
@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"
 
 const char* ffDetectCPUCache(FFCPUCacheResult* result)
diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c
index 11ec5cbd1..07f650f61 100644
--- a/src/detection/cpucache/cpucache_linux.c
+++ b/src/detection/cpucache/cpucache_linux.c
@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)
diff --git a/src/detection/cpuusage/cpuusage.c b/src/detection/cpuusage/cpuusage.c
index 40e569528..a90c00225 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 "common/time.h"
+#include "util/time.h"
 
 #include <stdint.h>
 
diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c
index 02544630c..27c9f4b1f 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #include <stdio.h>
 #include <inttypes.h>
diff --git a/src/detection/cursor/cursor_linux.c b/src/detection/cursor/cursor_linux.c
index bd8c9b1cd..5258afbd9 100644
--- a/src/detection/cursor/cursor_linux.c
+++ b/src/detection/cursor/cursor_linux.c
@@ -1,10 +1,10 @@
 #include "cursor.h"
 
-#include "common/properties.h"
-#include "common/parsing.h"
-#include "common/settings.h"
 #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 <stdlib.h>
diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c
index 10a0a7cac..51293b6f6 100644
--- a/src/detection/de/de_linux.c
+++ b/src/detection/de/de_linux.c
@@ -1,11 +1,11 @@
 #include "de.h"
 
-#include "common/dbus.h"
-#include "common/io/io.h"
-#include "common/library.h"
-#include "common/parsing.h"
-#include "common/properties.h"
-#include "common/processing.h"
+#include "util/dbus.h"
+#include "util/io/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 "detection/displayserver/displayserver.h"
diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c
index 518d356ac..b54cd86c1 100644
--- a/src/detection/disk/disk_linux.c
+++ b/src/detection/disk/disk_linux.c
@@ -1,6 +1,6 @@
 #include "disk.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <limits.h>
diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c
index e7b0c2f53..42066fb2e 100644
--- a/src/detection/disk/disk_sunos.c
+++ b/src/detection/disk/disk_sunos.c
@@ -1,5 +1,5 @@
 #include "disk.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <sys/mntent.h>
diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c
index 524f0cd91..b88289fa5 100644
--- a/src/detection/disk/disk_windows.c
+++ b/src/detection/disk/disk_windows.c
@@ -1,6 +1,6 @@
 #include "disk.h"
-#include "common/io/io.h"
-#include "common/thread.h"
+#include "util/io/io.h"
+#include "util/thread.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/diskio/diskio.c b/src/detection/diskio/diskio.c
index 9413a7125..decd7d4d3 100644
--- a/src/detection/diskio/diskio.c
+++ b/src/detection/diskio/diskio.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
 
-#include "common/time.h"
+#include "util/time.h"
 
 const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options);
 
diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c
index f07b063c5..5b24620b8 100644
--- a/src/detection/diskio/diskio_linux.c
+++ b/src/detection/diskio/diskio_linux.c
@@ -1,6 +1,6 @@
 #include "diskio.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"
 
 #include <ctype.h>
diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c
index cf92d32ea..4cb17a351 100644
--- a/src/detection/diskio/diskio_windows.c
+++ b/src/detection/diskio/diskio_windows.c
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/displayserver/displayserver_android.c b/src/detection/displayserver/displayserver_android.c
index 76e152de4..137b290e5 100644
--- a/src/detection/displayserver/displayserver_android.c
+++ b/src/detection/displayserver/displayserver_android.c
@@ -1,6 +1,6 @@
 #include "displayserver.h"
-#include "common/settings.h"
-#include "common/processing.h"
+#include "util/settings.h"
+#include "util/processing.h"
 #include "linux/displayserver_linux.h"
 
 #include <math.h>
diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c
index f86105c0b..d4da9c604 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 "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #ifdef __FreeBSD__
-    #include "common/settings.h"
+    #include "util/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 1552785b6..7fbc427b0 100644
--- a/src/detection/displayserver/linux/drm.c
+++ b/src/detection/displayserver/linux/drm.c
@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 
@@ -110,7 +110,7 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)
 
 #ifdef FF_HAVE_DRM
 
-#include "common/library.h"
+#include "util/library.h"
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c
index 7f351edbf..ba2e95c77 100644
--- a/src/detection/displayserver/linux/wayland/wayland.c
+++ b/src/detection/displayserver/linux/wayland/wayland.c
@@ -1,5 +1,5 @@
 #include "../displayserver_linux.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 
@@ -10,7 +10,7 @@
 
 #include <sys/socket.h>
 
-#include "common/properties.h"
+#include "util/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 bf29d70c0..79ed73a53 100644
--- a/src/detection/displayserver/linux/wayland/wayland.h
+++ b/src/detection/displayserver/linux/wayland/wayland.h
@@ -2,7 +2,7 @@
 
 #ifdef FF_HAVE_WAYLAND
 
-#include "common/library.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 
 #include <wayland-client.h>
diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c
index 164cf5aae..8115ff57d 100644
--- a/src/detection/displayserver/linux/wmde.c
+++ b/src/detection/displayserver/linux/wmde.c
@@ -1,6 +1,6 @@
 #include "displayserver_linux.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c
index d7022e343..81f0e76d8 100644
--- a/src/detection/displayserver/linux/xcb.c
+++ b/src/detection/displayserver/linux/xcb.c
@@ -2,8 +2,8 @@
 
 #ifdef FF_HAVE_XCB_RANDR
 
-#include "common/library.h"
-#include "common/properties.h"
+#include "util/library.h"
+#include "util/properties.h"
 #include "util/edidHelper.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c
index 44884e940..25fab64d9 100644
--- a/src/detection/displayserver/linux/xlib.c
+++ b/src/detection/displayserver/linux/xlib.c
@@ -2,8 +2,8 @@
 
 #ifdef FF_HAVE_XRANDR
 
-#include "common/library.h"
-#include "common/properties.h"
+#include "util/library.h"
+#include "util/properties.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c
index 9568f28b0..2061f77ff 100644
--- a/src/detection/dns/dns_apple.c
+++ b/src/detection/dns/dns_apple.c
@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/apple/cf_helpers.h"
diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c
index 51c2fd643..6b76479ec 100644
--- a/src/detection/dns/dns_linux.c
+++ b/src/detection/dns/dns_linux.c
@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c
index 48615117f..b6eb792a7 100644
--- a/src/detection/dns/dns_windows.c
+++ b/src/detection/dns/dns_windows.c
@@ -1,5 +1,5 @@
 #include "detection/dns/dns.h"
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"
 
 #include <ws2tcpip.h>
diff --git a/src/detection/editor/editor.c b/src/detection/editor/editor.c
index b94cadc30..bdae1d1e3 100644
--- a/src/detection/editor/editor.c
+++ b/src/detection/editor/editor.c
@@ -1,6 +1,6 @@
 #include "editor.h"
-#include "common/processing.h"
-#include "common/library.h"
+#include "util/processing.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 #include "util/path.h"
 #include "util/binary.h"
diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m
index 683acad03..2bd4de6ac 100644
--- a/src/detection/font/font_apple.m
+++ b/src/detection/font/font_apple.m
@@ -1,5 +1,5 @@
-#include "common/font.h"
-#include "common/io/io.h"
+#include "util/font.h"
+#include "util/io/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 e3253379c..f823b226d 100644
--- a/src/detection/font/font_linux.c
+++ b/src/detection/font/font_linux.c
@@ -1,5 +1,5 @@
-#include "common/font.h"
-#include "common/parsing.h"
+#include "util/font.h"
+#include "util/parsing.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "font.h"
diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c
index 1cc5993ba..1ad91b9fe 100644
--- a/src/detection/gamepad/gamepad_bsd.c
+++ b/src/detection/gamepad/gamepad_bsd.c
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/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 d8dacb40e..a6f685461 100644
--- a/src/detection/gamepad/gamepad_linux.c
+++ b/src/detection/gamepad/gamepad_linux.c
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/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 d441b01ef..e0dae742d 100644
--- a/src/detection/gamepad/gamepad_windows.c
+++ b/src/detection/gamepad/gamepad_windows.c
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 
diff --git a/src/detection/gpu/gpu_amd.c b/src/detection/gpu/gpu_amd.c
index 11edf9fa2..8ad5eb94d 100644
--- a/src/detection/gpu/gpu_amd.c
+++ b/src/detection/gpu/gpu_amd.c
@@ -1,7 +1,7 @@
 #include "gpu_driver_specific.h"
 
 #include "adl.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "util/debug.h"
 
diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c
index a0406790f..ba7d7dba2 100644
--- a/src/detection/gpu/gpu_android.c
+++ b/src/detection/gpu/gpu_android.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>
diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c
index 1a5ac8b44..570de2700 100644
--- a/src/detection/gpu/gpu_bsd.c
+++ b/src/detection/gpu/gpu_bsd.c
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <sys/pciio.h>
@@ -36,7 +36,7 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu)
 }
 
 #if FF_HAVE_DRM
-#include "common/library.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 
 #include <xf86drm.h>
diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c
index 78372a55a..3fdda54ed 100644
--- a/src/detection/gpu/gpu_drm.c
+++ b/src/detection/gpu/gpu_drm.c
@@ -5,8 +5,8 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c
index 5b1c8e77e..dce396e9c 100644
--- a/src/detection/gpu/gpu_general.c
+++ b/src/detection/gpu/gpu_general.c
@@ -2,8 +2,8 @@
 
 #ifdef FF_HAVE_PCIACCESS
 
-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"
 
 #include <pciaccess.h>
 
diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c
index 3368f7064..91a2f7e52 100644
--- a/src/detection/gpu/gpu_haiku.c
+++ b/src/detection/gpu/gpu_haiku.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #include <private/drivers/poke.h>
 
diff --git a/src/detection/gpu/gpu_intel.c b/src/detection/gpu/gpu_intel.c
index f5fe08cd5..334ad58ea 100644
--- a/src/detection/gpu/gpu_intel.c
+++ b/src/detection/gpu/gpu_intel.c
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"
 
-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "igcl.h"
 
diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c
index 0fb3051d9..6bd51a59c 100644
--- a/src/detection/gpu/gpu_linux.c
+++ b/src/detection/gpu/gpu_linux.c
@@ -2,12 +2,12 @@
 #include "detection/vulkan/vulkan.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
-#include "common/io/io.h"
-#include "common/library.h"
-#include "modules/gpu/option.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
+#include "modules/gpu/option.h"
 
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/src/detection/gpu/gpu_mthreads.c b/src/detection/gpu/gpu_mthreads.c
index ff1347851..7ae7a622d 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 "common/library.h"
+#include "util/library.h"
 #include "mtml.h"
 
 struct FFMtmlData
diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c
index 888c86af6..c5857086d 100644
--- a/src/detection/gpu/gpu_nbsd.c
+++ b/src/detection/gpu/gpu_nbsd.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/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 983fb326c..3e8e85fed 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 "common/library.h"
+#include "util/library.h"
 #include "nvml.h"
 
 struct FFNvmlData {
diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c
index 2055c47bd..e3600237c 100644
--- a/src/detection/gpu/gpu_obsd.c
+++ b/src/detection/gpu/gpu_obsd.c
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/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 cce1deb45..1a186b3f3 100644
--- a/src/detection/gpu/gpu_pci.c
+++ b/src/detection/gpu/gpu_pci.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 
 #include <stdlib.h>
 #ifdef __FreeBSD__
diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c
index 1cde2376d..1f562031c 100644
--- a/src/detection/gpu/gpu_windows.c
+++ b/src/detection/gpu/gpu_windows.c
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "common/library.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"
diff --git a/src/detection/gpu/gpu_wsl.cpp b/src/detection/gpu/gpu_wsl.cpp
index f2351a9e0..6ed6dec7c 100644
--- a/src/detection/gpu/gpu_wsl.cpp
+++ b/src/detection/gpu/gpu_wsl.cpp
@@ -2,7 +2,7 @@
 
 #define INITGUID
 extern "C" {
-#include "common/library.h"
+#include "util/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 575568ada..c0e49d14a 100644
--- a/src/detection/gtk_qt/gtk.c
+++ b/src/detection/gtk_qt/gtk.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
+#include "util/properties.h"
+#include "util/thread.h"
+#include "util/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
-#include "common/properties.h"
-#include "common/thread.h"
-#include "common/settings.h"
 #include "detection/displayserver/displayserver.h"
 
 static inline bool allPropertiesSet(FFGTKResult* result)
diff --git a/src/detection/gtk_qt/qt.c b/src/detection/gtk_qt/qt.c
index b27ad748f..29854f62b 100644
--- a/src/detection/gtk_qt/qt.c
+++ b/src/detection/gtk_qt/qt.c
@@ -1,9 +1,9 @@
 #include "fastfetch.h"
-#include "common/properties.h"
-#include "common/thread.h"
+#include "util/properties.h"
+#include "util/thread.h"
+#include "util/stringUtils.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
-#include "util/stringUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/detection/host/host_android.c b/src/detection/host/host_android.c
index 940b46c6a..f0f476a04 100644
--- a/src/detection/host/host_android.c
+++ b/src/detection/host/host_android.c
@@ -1,5 +1,6 @@
 #include "host.h"
-#include "common/settings.h"
+#include "util/settings.h"
+
 #include <ctype.h>
 
 const char* ffDetectHost(FFHostResult* host)
diff --git a/src/detection/host/host_apple.c b/src/detection/host/host_apple.c
index 990f6c671..32db81c85 100644
--- a/src/detection/host/host_apple.c
+++ b/src/detection/host/host_apple.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/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 5de12117e..6c0b72f4b 100644
--- a/src/detection/host/host_bsd.c
+++ b/src/detection/host/host_bsd.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c
index 7f8108cc8..f2a850549 100644
--- a/src/detection/host/host_linux.c
+++ b/src/detection/host/host_linux.c
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "common/io/io.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/processing.h"
 #include "util/smbiosHelper.h"
 
 #include <stdlib.h>
diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c
index 8fd61abf2..b9bea191f 100644
--- a/src/detection/host/host_nbsd.c
+++ b/src/detection/host/host_nbsd.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
diff --git a/src/detection/host/host_obsd.c b/src/detection/host/host_obsd.c
index 960248ab3..f5eb28d65 100644
--- a/src/detection/host/host_obsd.c
+++ b/src/detection/host/host_obsd.c
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"
 
 const char* ffDetectHost(FFHostResult* host)
diff --git a/src/detection/icons/icons_linux.c b/src/detection/icons/icons_linux.c
index e5727b195..05968465b 100644
--- a/src/detection/icons/icons_linux.c
+++ b/src/detection/icons/icons_linux.c
@@ -1,5 +1,5 @@
 #include "icons.h"
-#include "common/parsing.h"
+#include "util/parsing.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c
index 032de91f6..9e00b574a 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 "common/io/io.h"
+#include "util/io/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 b730062a0..6ec5d942a 100644
--- a/src/detection/initsystem/initsystem_linux.c
+++ b/src/detection/initsystem/initsystem_linux.c
@@ -1,5 +1,5 @@
 #include "initsystem.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/binary.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c
index 727e91b02..092eb42de 100644
--- a/src/detection/keyboard/keyboard_bsd.c
+++ b/src/detection/keyboard/keyboard_bsd.c
@@ -1,5 +1,5 @@
 #include "keyboard.h"
-#include "common/io/io.h"
+#include "util/io/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 e2d482150..657e5dfff 100644
--- a/src/detection/keyboard/keyboard_linux.c
+++ b/src/detection/keyboard/keyboard_linux.c
@@ -1,5 +1,5 @@
 #include "keyboard.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/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 24cd8a452..fecf747e6 100644
--- a/src/detection/keyboard/keyboard_windows.c
+++ b/src/detection/keyboard/keyboard_windows.c
@@ -1,7 +1,7 @@
 #define INITGUID
 
 #include "keyboard.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 
diff --git a/src/detection/lm/lm_linux.c b/src/detection/lm/lm_linux.c
index c336e5796..0e270ad17 100644
--- a/src/detection/lm/lm_linux.c
+++ b/src/detection/lm/lm_linux.c
@@ -1,7 +1,7 @@
 #include "lm.h"
-#include "common/properties.h"
-#include "common/dbus.h"
-#include "common/processing.h"
+#include "util/properties.h"
+#include "util/dbus.h"
+#include "util/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 "common/library.h"
+#include "util/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 c75afb962..ec123c977 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #include <sys/sysinfo.h>
 
diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c
index 1b5537ff6..50f045706 100644
--- a/src/detection/localip/localip_linux.c
+++ b/src/detection/localip/localip_linux.c
@@ -1,6 +1,6 @@
 #include "localip.h"
-#include "common/io/io.h"
-#include "common/netif/netif.h"
+#include "util/io/io.h"
+#include "util/netif/netif.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
 
diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c
index 7c4e32a45..9ca2aa5f9 100644
--- a/src/detection/localip/localip_windows.c
+++ b/src/detection/localip/localip_windows.c
@@ -1,7 +1,7 @@
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
 
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 #include "util/debug.h"
diff --git a/src/detection/media/media.c b/src/detection/media/media.c
index 3c1288fe1..dc5ce58e4 100644
--- a/src/detection/media/media.c
+++ b/src/detection/media/media.c
@@ -1,5 +1,5 @@
 #include "media.h"
-#include "common/io/io.h"
+#include "util/io/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 d822b9435..b69e4f92d 100644
--- a/src/detection/media/media_apple.m
+++ b/src/detection/media/media_apple.m
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "detection/media/media.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/apple/cf_helpers.h"
+#include "detection/media/media.h"
 
 #import <Foundation/Foundation.h>
 #import <CoreFoundation/CoreFoundation.h>
diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index 37b19048e..35cf931c6 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -1,15 +1,14 @@
-#include "common/io/io.h"
 #include "fastfetch.h"
-#include "detection/media/media.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
-#include "util/unused.h"
+#include "detection/media/media.h"
 
 #include <string.h>
 
 #define FF_DBUS_MPRIS_PREFIX "org.mpris.MediaPlayer2."
 
 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
+#include "util/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 fa55b09be..52846607c 100644
--- a/src/detection/media/media_windows.c
+++ b/src/detection/media/media_windows.c
@@ -1,4 +1,4 @@
-#include "common/library.h"
+#include "util/library.h"
 #include "util/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 0db20527a..699d22416 100644
--- a/src/detection/memory/memory_bsd.c
+++ b/src/detection/memory/memory_bsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 
 const char* ffDetectMemory(FFMemoryResult* ram)
 {
diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c
index 42051279a..90bb34935 100644
--- a/src/detection/memory/memory_linux.c
+++ b/src/detection/memory/memory_linux.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <inttypes.h>
diff --git a/src/detection/memory/memory_nbsd.c b/src/detection/memory/memory_nbsd.c
index 651058686..112d9c16b 100644
--- a/src/detection/memory/memory_nbsd.c
+++ b/src/detection/memory/memory_nbsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "common/sysctl.h"
+#include "util/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 e58bf0d37..2ca8b1ca4 100644
--- a/src/detection/memory/memory_obsd.c
+++ b/src/detection/memory/memory_obsd.c
@@ -1,5 +1,5 @@
 #include "memory.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 
 #include <sys/param.h>
 #include <uvm/uvm_extern.h>
diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c
index 3a1f2eb69..0f6507b52 100644
--- a/src/detection/mouse/mouse_bsd.c
+++ b/src/detection/mouse/mouse_bsd.c
@@ -1,5 +1,5 @@
 #include "mouse.h"
-#include "common/io/io.h"
+#include "util/io/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 d03a3e7e5..8d81384a3 100644
--- a/src/detection/mouse/mouse_linux.c
+++ b/src/detection/mouse/mouse_linux.c
@@ -1,5 +1,5 @@
 #include "mouse.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/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 08002e550..3ab2ff3e2 100644
--- a/src/detection/mouse/mouse_windows.c
+++ b/src/detection/mouse/mouse_windows.c
@@ -1,7 +1,7 @@
 #define INITGUID
 
 #include "mouse.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 
diff --git a/src/detection/netio/netio.c b/src/detection/netio/netio.c
index 666321c99..7ffa73783 100644
--- a/src/detection/netio/netio.c
+++ b/src/detection/netio/netio.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "common/time.h"
+#include "util/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 69f2667c9..da1e850c5 100644
--- a/src/detection/netio/netio_apple.c
+++ b/src/detection/netio/netio_apple.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>
diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c
index dcf9b709d..2284dd22a 100644
--- a/src/detection/netio/netio_bsd.c
+++ b/src/detection/netio/netio_bsd.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>
diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp
index 812d926f4..d2389d091 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 "common/netif/netif.h"
+#include "util/netif/netif.h"
 }
 
 #include <NetworkInterface.h>
diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c
index 651a612fa..ac552c912 100644
--- a/src/detection/netio/netio_linux.c
+++ b/src/detection/netio/netio_linux.c
@@ -1,7 +1,7 @@
 #include "netio.h"
 
-#include "common/io/io.h"
-#include "common/netif/netif.h"
+#include "util/io/io.h"
+#include "util/netif/netif.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>
diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c
index e946d6d7e..3d06c8421 100644
--- a/src/detection/netio/netio_sunos.c
+++ b/src/detection/netio/netio_sunos.c
@@ -1,6 +1,7 @@
 #include "netio.h"
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/stringUtils.h"
+
 #include <kstat.h>
 
 static inline void kstatFreeWrap(kstat_ctl_t** pkc)
diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c
index 56e5fc06d..b97e761c2 100644
--- a/src/detection/netio/netio_windows.c
+++ b/src/detection/netio/netio_windows.c
@@ -1,6 +1,6 @@
 #include "netio.h"
 
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 
diff --git a/src/detection/opencl/opencl.c b/src/detection/opencl/opencl.c
index 6d55d8ac7..5ebc92190 100644
--- a/src/detection/opencl/opencl.c
+++ b/src/detection/opencl/opencl.c
@@ -7,8 +7,8 @@
 
 #ifdef FF_HAVE_OPENCL
 
-#include "common/library.h"
-#include "common/parsing.h"
+#include "util/library.h"
+#include "util/parsing.h"
 #include "util/stringUtils.h"
 #include <string.h>
 
diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp
index ce0103360..ca0873822 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 "common/io/io.h"
+#include "util/io/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 b227ebb99..ba1c4386b 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #include <string.h>
 
@@ -14,7 +14,7 @@
 #if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX)
 #define FF_HAVE_GL 1
 
-#include "common/library.h"
+#include "util/library.h"
 
 #include <GL/gl.h>
 
diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c
index d1a263a86..4dcfdebbb 100644
--- a/src/detection/opengl/opengl_shared.c
+++ b/src/detection/opengl/opengl_shared.c
@@ -1,5 +1,5 @@
 #include "opengl.h"
-#include "common/library.h"
+#include "util/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 "common/io/io.h"
+#include "util/io/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 50e0e88da..b75acc4d0 100644
--- a/src/detection/opengl/opengl_windows.c
+++ b/src/detection/opengl/opengl_windows.c
@@ -1,6 +1,6 @@
 #include "opengl.h"
-#include "common/library.h"
-#include "common/printing.h"
+#include "util/library.h"
+#include "util/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 7d39954d6..986ce6da2 100644
--- a/src/detection/os/os_android.c
+++ b/src/detection/os/os_android.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "common/settings.h"
+#include "util/settings.h"
 
 void ffDetectOSImpl(FFOSResult* os)
 {
diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m
index 82732ac79..61e6c59e7 100644
--- a/src/detection/os/os_apple.m
+++ b/src/detection/os/os_apple.m
@@ -1,6 +1,6 @@
 #include "os.h"
-#include "common/io/io.h"
-#include "common/sysctl.h"
+#include "util/io/io.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
index 23b956832..f1ff2b2d2 100644
--- a/src/detection/os/os_linux.c
+++ b/src/detection/os/os_linux.c
@@ -1,8 +1,8 @@
 #include "os.h"
-#include "common/properties.h"
-#include "common/parsing.h"
-#include "common/io/io.h"
-#include "common/processing.h"
+#include "util/properties.h"
+#include "util/parsing.h"
+#include "util/io/io.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 
 #include <string.h>
diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c
index 46bf05b65..c5964163b 100644
--- a/src/detection/os/os_sunos.c
+++ b/src/detection/os/os_sunos.c
@@ -1,5 +1,5 @@
 #include "os.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 void ffDetectOSImpl(FFOSResult* os)
 {
diff --git a/src/detection/os/os_windows.cpp b/src/detection/os/os_windows.cpp
index 522756c29..14025ec8e 100644
--- a/src/detection/os/os_windows.cpp
+++ b/src/detection/os/os_windows.cpp
@@ -1,6 +1,6 @@
 extern "C" {
 #include "os.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 #include "util/windows/registry.h"
 }
diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c
index 71ca2e609..fea48f6e2 100644
--- a/src/detection/packages/packages.c
+++ b/src/detection/packages/packages.c
@@ -1,5 +1,5 @@
 #include "packages.h"
-#include "common/io/io.h"
+#include "util/io/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 5a176c834..300a8a35c 100644
--- a/src/detection/packages/packages_apple.c
+++ b/src/detection/packages/packages_apple.c
@@ -1,7 +1,7 @@
 #include "packages.h"
-#include "common/io/io.h"
-#include "common/parsing.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/parsing.h"
+#include "util/processing.h"
 #include "util/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 4ad2d8b49..23096e638 100644
--- a/src/detection/packages/packages_bsd.c
+++ b/src/detection/packages/packages_bsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "common/settings.h"
+#include "util/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 b48062a87..3f4d4eede 100644
--- a/src/detection/packages/packages_haiku.c
+++ b/src/detection/packages/packages_haiku.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "common/io/io.h"
+#include "util/io/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 fc5a0cf21..d75e65ede 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -1,10 +1,10 @@
 #include "packages.h"
-#include "common/io/io.h"
-#include "common/parsing.h"
-#include "common/properties.h"
-#include "common/settings.h"
-#include "detection/os/os.h"
+#include "util/io/io.h"
+#include "util/parsing.h"
+#include "util/properties.h"
+#include "util/settings.h"
 #include "util/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 "common/library.h"
+#include "util/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 e4004bde6..440eaaf04 100644
--- a/src/detection/packages/packages_nbsd.c
+++ b/src/detection/packages/packages_nbsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "common/io/io.h"
+#include "util/io/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 08a5479a6..60609bd82 100644
--- a/src/detection/packages/packages_nix.c
+++ b/src/detection/packages/packages_nix.c
@@ -1,6 +1,6 @@
 #include "packages.h"
-#include "common/io/io.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 
 static bool isValidNixPkg(FFstrbuf* pkg)
diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c
index 422b402a1..41b29c8ac 100644
--- a/src/detection/packages/packages_obsd.c
+++ b/src/detection/packages/packages_obsd.c
@@ -1,6 +1,6 @@
 #include "packages.h"
 
-#include "common/io/io.h"
+#include "util/io/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 1ff16842d..f78a8e952 100644
--- a/src/detection/packages/packages_windows.c
+++ b/src/detection/packages/packages_windows.c
@@ -1,10 +1,10 @@
 #include "packages.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 #include "util/path.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #include <windows.h>
 #include "util/windows/nt.h"
diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c
index 2b75cde4e..1b4dc5d23 100644
--- a/src/detection/physicaldisk/physicaldisk_haiku.c
+++ b/src/detection/physicaldisk/physicaldisk_haiku.c
@@ -1,6 +1,6 @@
 #include "physicaldisk.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <OS.h>
diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c
index f4f46a0fe..3f4846cfb 100644
--- a/src/detection/physicaldisk/physicaldisk_linux.c
+++ b/src/detection/physicaldisk/physicaldisk_linux.c
@@ -1,6 +1,6 @@
 #include "physicaldisk.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"
 
 #include <ctype.h>
diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c
index 0a6e76d58..12d9b38ed 100644
--- a/src/detection/physicaldisk/physicaldisk_windows.c
+++ b/src/detection/physicaldisk/physicaldisk_windows.c
@@ -1,5 +1,5 @@
 #include "physicaldisk.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/physicalmemory/physicalmemory_apple.m b/src/detection/physicalmemory/physicalmemory_apple.m
index b7b25d528..550d94c74 100644
--- a/src/detection/physicalmemory/physicalmemory_apple.m
+++ b/src/detection/physicalmemory/physicalmemory_apple.m
@@ -1,5 +1,5 @@
 #include "physicalmemory.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/smbiosHelper.h"
 #include "util/stringUtils.h"
 #include "util/apple/cf_helpers.h"
diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c
index 0aba7e4dd..d1c496094 100644
--- a/src/detection/poweradapter/poweradapter_linux.c
+++ b/src/detection/poweradapter/poweradapter_linux.c
@@ -1,5 +1,5 @@
 #include "poweradapter.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>
diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c
index 1c4641178..c85c4b3bb 100644
--- a/src/detection/processes/processes_linux.c
+++ b/src/detection/processes/processes_linux.c
@@ -1,6 +1,6 @@
 #include "processes.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 const char* ffDetectProcesses(uint32_t* result)
diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c
index 2f8fdcbe0..a1ec6a20e 100644
--- a/src/detection/publicip/publicip.c
+++ b/src/detection/publicip/publicip.c
@@ -1,5 +1,5 @@
 #include "publicip.h"
-#include "common/networking/networking.h"
+#include "util/networking/networking.h"
 
 #define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState states[2];
diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c
index dae28a4ed..73a5ae42b 100644
--- a/src/detection/sound/sound_bsd.c
+++ b/src/detection/sound/sound_bsd.c
@@ -1,6 +1,6 @@
 #include "sound.h"
-#include "common/io/io.h"
-#include "common/sysctl.h"
+#include "util/io/io.h"
+#include "util/sysctl.h"
 
 #include <fcntl.h>
 #include <sys/soundcard.h>
diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c
index 675859768..ecd074367 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 <common/library.h>
+#include "util/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 88fd5f505..792304c35 100644
--- a/src/detection/sound/sound_nbsd.c
+++ b/src/detection/sound/sound_nbsd.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c
index d6e43eede..0bfda3f02 100644
--- a/src/detection/sound/sound_sunos.c
+++ b/src/detection/sound/sound_sunos.c
@@ -1,5 +1,5 @@
 #include "sound.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <fcntl.h>
diff --git a/src/detection/swap/swap_bsd.c b/src/detection/swap/swap_bsd.c
index c3e40b3df..9fb40d1a6 100644
--- a/src/detection/swap/swap_bsd.c
+++ b/src/detection/swap/swap_bsd.c
@@ -1,5 +1,5 @@
 #include "swap.h"
-#include "common/sysctl.h"
+#include "util/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 5c4971d8f..2c70d3064 100644
--- a/src/detection/swap/swap_linux.c
+++ b/src/detection/swap/swap_linux.c
@@ -1,6 +1,6 @@
 #include "swap.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <inttypes.h>
diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c
index 5e0d6204f..3a6c5368e 100644
--- a/src/detection/terminalfont/terminalfont.c
+++ b/src/detection/terminalfont/terminalfont.c
@@ -1,10 +1,10 @@
 #include "terminalfont.h"
-#include "common/io/io.h"
-#include "common/properties.h"
-#include "common/processing.h"
-#include "detection/terminalshell/terminalshell.h"
+#include "util/io/io.h"
+#include "util/properties.h"
+#include "util/processing.h"
 #include "util/debug.h"
 #include "util/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 03ddad99e..b0b468f2d 100644
--- a/src/detection/terminalfont/terminalfont.h
+++ b/src/detection/terminalfont/terminalfont.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "common/font.h"
+#include "util/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 dc9c59f46..8514d6579 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #ifdef FF_HAVE_FREETYPE
-    #include "common/library.h"
+    #include "util/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 2ee70007b..f9da1fbef 100644
--- a/src/detection/terminalfont/terminalfont_apple.m
+++ b/src/detection/terminalfont/terminalfont_apple.m
@@ -1,5 +1,5 @@
 #include "terminalfont.h"
-#include "common/font.h"
+#include "util/font.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "util/apple/osascript.h"
 
diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c
index 7b4cbf92f..39b509bfe 100644
--- a/src/detection/terminalfont/terminalfont_linux.c
+++ b/src/detection/terminalfont/terminalfont_linux.c
@@ -1,15 +1,15 @@
-#include "common/font.h"
+#include "util/font.h"
 #include "terminalfont.h"
-#include "common/settings.h"
-#include "common/properties.h"
-#include "common/parsing.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "detection/terminalshell/terminalshell.h"
-#include "detection/displayserver/displayserver.h"
+#include "util/settings.h"
+#include "util/properties.h"
+#include "util/parsing.h"
+#include "util/io/io.h"
+#include "util/processing.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/binary.h"
+#include "detection/terminalshell/terminalshell.h"
+#include "detection/displayserver/displayserver.h"
 
 static const char* getSystemMonospaceFont(void)
 {
diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c
index 059e1ac51..8065ceb29 100644
--- a/src/detection/terminalfont/terminalfont_windows.c
+++ b/src/detection/terminalfont/terminalfont_windows.c
@@ -1,11 +1,11 @@
-#include "common/library.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/properties.h"
-#include "detection/terminalshell/terminalshell.h"
+#include "util/library.h"
+#include "util/io/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 "detection/terminalshell/terminalshell.h"
 #include "terminalfont.h"
 
 #include <shlobj.h>
diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c
index 015bbfcac..8e54995a7 100644
--- a/src/detection/terminalshell/terminalshell.c
+++ b/src/detection/terminalshell/terminalshell.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/processing.h"
+#include "util/properties.h"
 #include "util/path.h"
 #include "util/stringUtils.h"
 #include "util/binary.h"
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
index 165b9c19b..3376ecbfe 100644
--- a/src/detection/terminalshell/terminalshell_linux.c
+++ b/src/detection/terminalshell/terminalshell_linux.c
@@ -1,8 +1,8 @@
 #include "terminalshell.h"
-#include "common/io/io.h"
-#include "common/parsing.h"
-#include "common/processing.h"
-#include "common/thread.h"
+#include "util/io/io.h"
+#include "util/parsing.h"
+#include "util/processing.h"
+#include "util/thread.h"
 #include "util/stringUtils.h"
 
 #include <string.h>
diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c
index 1fc1ad760..177f4d273 100644
--- a/src/detection/terminalshell/terminalshell_windows.c
+++ b/src/detection/terminalshell/terminalshell_windows.c
@@ -1,7 +1,7 @@
 #include "terminalshell.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/thread.h"
+#include "util/io/io.h"
+#include "util/processing.h"
+#include "util/thread.h"
 #include "util/mallocHelper.h"
 #include "util/windows/registry.h"
 #include "util/windows/unicode.h"
diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c
index cb6880f8d..d74a4d933 100644
--- a/src/detection/terminalsize/terminalsize_linux.c
+++ b/src/detection/terminalsize/terminalsize_linux.c
@@ -1,5 +1,5 @@
 #include "terminalsize.h"
-#include "common/io/io.h"
+#include "util/io/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 ae9970eb9..8c05f05c2 100644
--- a/src/detection/terminalsize/terminalsize_windows.c
+++ b/src/detection/terminalsize/terminalsize_windows.c
@@ -1,5 +1,5 @@
 #include "terminalsize.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #include <windows.h>
 
diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c
index b42b61a07..f40a53675 100644
--- a/src/detection/terminaltheme/terminaltheme.c
+++ b/src/detection/terminaltheme/terminaltheme.c
@@ -1,5 +1,5 @@
 #include "terminaltheme.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <inttypes.h>
diff --git a/src/detection/theme/theme_linux.c b/src/detection/theme/theme_linux.c
index 650130775..1e9496823 100644
--- a/src/detection/theme/theme_linux.c
+++ b/src/detection/theme/theme_linux.c
@@ -1,5 +1,5 @@
 #include "theme.h"
-#include "common/parsing.h"
+#include "util/parsing.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
diff --git a/src/detection/tpm/tpm_bsd.c b/src/detection/tpm/tpm_bsd.c
index 2e32d512b..251f13b31 100644
--- a/src/detection/tpm/tpm_bsd.c
+++ b/src/detection/tpm/tpm_bsd.c
@@ -1,5 +1,5 @@
 #include "tpm.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/kmod.h"
 
 const char* ffDetectTPM(FFTPMResult* result)
diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c
index 90c7cf7c1..593f76555 100644
--- a/src/detection/tpm/tpm_linux.c
+++ b/src/detection/tpm/tpm_linux.c
@@ -1,5 +1,5 @@
 #include "tpm.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 const char* ffDetectTPM(FFTPMResult* result)
 {
diff --git a/src/detection/tpm/tpm_windows.c b/src/detection/tpm/tpm_windows.c
index 32ec92da9..1d663238c 100644
--- a/src/detection/tpm/tpm_windows.c
+++ b/src/detection/tpm/tpm_windows.c
@@ -1,5 +1,5 @@
 #include "tpm.h"
-#include "common/library.h"
+#include "util/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 57a17b0d7..3cd4dc56e 100644
--- a/src/detection/uptime/uptime_bsd.c
+++ b/src/detection/uptime/uptime_bsd.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "common/time.h"
+#include "util/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 a2c48a5ec..7b2395406 100644
--- a/src/detection/uptime/uptime_haiku.c
+++ b/src/detection/uptime/uptime_haiku.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "common/time.h"
+#include "util/time.h"
 
 const char* ffDetectUptime(FFUptimeResult* result)
 {
diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c
index 1007374ce..6cfa770be 100644
--- a/src/detection/uptime/uptime_linux.c
+++ b/src/detection/uptime/uptime_linux.c
@@ -1,6 +1,6 @@
 #include "uptime.h"
-#include "common/time.h"
-#include "common/io/io.h"
+#include "util/time.h"
+#include "util/io/io.h"
 
 #include <inttypes.h>
 
diff --git a/src/detection/uptime/uptime_sunos.c b/src/detection/uptime/uptime_sunos.c
index fe45b61c8..b0a34f2ef 100644
--- a/src/detection/uptime/uptime_sunos.c
+++ b/src/detection/uptime/uptime_sunos.c
@@ -1,5 +1,6 @@
 #include "uptime.h"
-#include "common/time.h"
+#include "util/time.h"
+
 #include <utmpx.h>
 
 const char* ffDetectUptime(FFUptimeResult* result)
diff --git a/src/detection/uptime/uptime_windows.c b/src/detection/uptime/uptime_windows.c
index 6978a1163..b75187c1d 100644
--- a/src/detection/uptime/uptime_windows.c
+++ b/src/detection/uptime/uptime_windows.c
@@ -1,5 +1,5 @@
 #include "uptime.h"
-#include "common/time.h"
+#include "util/time.h"
 
 #include <sysinfoapi.h>
 
diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c
index 6875a423b..29b18f09f 100644
--- a/src/detection/users/users_linux.c
+++ b/src/detection/users/users_linux.c
@@ -1,5 +1,5 @@
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/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 db7a89467..17390f4d3 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 "common/io/io.h"
+#include "util/io/io.h"
 
 #include <utmp.h>
 
@@ -31,6 +31,6 @@ next:
         ffStrbufInit(&user->clientIp);
         user->loginTime = (uint64_t) n.ut_time * 1000;
     }
-    
+
     return NULL;
 }
diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c
index 3ff3b38c0..969353e99 100644
--- a/src/detection/vulkan/vulkan.c
+++ b/src/detection/vulkan/vulkan.c
@@ -3,9 +3,9 @@
 #include "detection/vulkan/vulkan.h"
 
 #ifdef FF_HAVE_VULKAN
-#include "common/library.h"
-#include "common/io/io.h"
-#include "common/parsing.h"
+#include "util/library.h"
+#include "util/io/io.h"
+#include "util/parsing.h"
 #include "util/stringUtils.h"
 
 #include <stdlib.h>
diff --git a/src/detection/wallpaper/wallpaper_apple.m b/src/detection/wallpaper/wallpaper_apple.m
index 6780828d3..33fe54488 100644
--- a/src/detection/wallpaper/wallpaper_apple.m
+++ b/src/detection/wallpaper/wallpaper_apple.m
@@ -1,5 +1,5 @@
 #include "wallpaper.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/apple/osascript.h"
 
 #import <Foundation/Foundation.h>
diff --git a/src/detection/wallpaper/wallpaper_linux.c b/src/detection/wallpaper/wallpaper_linux.c
index d2aa65b6c..76b4274f3 100644
--- a/src/detection/wallpaper/wallpaper_linux.c
+++ b/src/detection/wallpaper/wallpaper_linux.c
@@ -1,5 +1,5 @@
 #include "wallpaper.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
 
 const char* ffDetectWallpaper(FFstrbuf* result)
diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c
index e244d6319..9fb62cb77 100644
--- a/src/detection/weather/weather.c
+++ b/src/detection/weather/weather.c
@@ -1,5 +1,5 @@
 #include "weather.h"
-#include "common/networking/networking.h"
+#include "util/networking/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 e74a96b37..6503285e7 100644
--- a/src/detection/wifi/wifi_android.c
+++ b/src/detection/wifi/wifi_android.c
@@ -1,7 +1,7 @@
 #include "wifi.h"
 
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/processing.h"
+#include "util/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 77b661cc4..2c208e17d 100644
--- a/src/detection/wifi/wifi_apple.m
+++ b/src/detection/wifi/wifi_apple.m
@@ -1,5 +1,5 @@
 #include "wifi.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 
 #import <CoreWLAN/CoreWLAN.h>
diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c
index 860b66bc2..461e61186 100644
--- a/src/detection/wifi/wifi_bsd.c
+++ b/src/detection/wifi/wifi_bsd.c
@@ -1,5 +1,5 @@
 #include "wifi.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <sys/ioctl.h>
diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c
index 1826c656c..53781e64e 100644
--- a/src/detection/wifi/wifi_linux.c
+++ b/src/detection/wifi/wifi_linux.c
@@ -1,8 +1,8 @@
 #include "wifi.h"
-#include "common/dbus.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/dbus.h"
+#include "util/io/io.h"
+#include "util/processing.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
 
diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c
index 2f0db6523..3339cf395 100644
--- a/src/detection/wifi/wifi_nbsd.c
+++ b/src/detection/wifi/wifi_nbsd.c
@@ -1,5 +1,5 @@
 #include "wifi.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #define COMPAT_FREEBSD_NET80211 1
diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c
index f811b585c..830e984e5 100644
--- a/src/detection/wifi/wifi_obsd.c
+++ b/src/detection/wifi/wifi_obsd.c
@@ -1,5 +1,5 @@
 #include "wifi.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #include <sys/ioctl.h>
diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c
index c0b539231..98c40b683 100644
--- a/src/detection/wifi/wifi_windows.c
+++ b/src/detection/wifi/wifi_windows.c
@@ -1,5 +1,5 @@
 #include "wifi.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
diff --git a/src/detection/wm/wm_apple.m b/src/detection/wm/wm_apple.m
index 889d7ccb4..1289cb58c 100644
--- a/src/detection/wm/wm_apple.m
+++ b/src/detection/wm/wm_apple.m
@@ -1,6 +1,6 @@
 #include "wm.h"
 
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 
diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c
index 25abcc4da..7ebc43338 100644
--- a/src/detection/wm/wm_linux.c
+++ b/src/detection/wm/wm_linux.c
@@ -1,12 +1,12 @@
 #include "wm.h"
 
-#include "common/processing.h"
-#include "common/io/io.h"
-#include "detection/displayserver/displayserver.h"
+#include "util/processing.h"
+#include "util/io/io.h"
 #include "util/binary.h"
 #include "util/path.h"
 #include "util/stringUtils.h"
 #include "util/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 5eff2d15b..01acf5830 100644
--- a/src/detection/wm/wm_windows.cpp
+++ b/src/detection/wm/wm_windows.cpp
@@ -1,9 +1,9 @@
 extern "C"
 {
 #include "wm.h"
-#include "common/io/io.h"
-#include "detection/terminalshell/terminalshell.h"
+#include "util/io/io.h"
 #include "util/windows/version.h"
+#include "detection/terminalshell/terminalshell.h"
 }
 
 #include "util/windows/com.hpp"
diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c
index 2c4d1694a..adf3a66e0 100644
--- a/src/detection/wmtheme/wmtheme_linux.c
+++ b/src/detection/wmtheme/wmtheme_linux.c
@@ -1,12 +1,12 @@
 #include "wmtheme.h"
-#include "common/io/io.h"
-#include "common/properties.h"
-#include "common/parsing.h"
-#include "common/settings.h"
-#include "detection/gtk_qt/gtk_qt.h"
-#include "detection/displayserver/displayserver.h"
+#include "util/io/io.h"
+#include "util/properties.h"
+#include "util/parsing.h"
+#include "util/settings.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
+#include "detection/gtk_qt/gtk_qt.h"
+#include "detection/displayserver/displayserver.h"
 
 static bool detectWMThemeFromConfigFile(const char* configFile, const char* themeRegex, const char* defaultValue, FFstrbuf* themeOrError)
 {
diff --git a/src/detection/zpool/zpool.c b/src/detection/zpool/zpool.c
index fcf37b0f2..83c5609fa 100644
--- a/src/detection/zpool/zpool.c
+++ b/src/detection/zpool/zpool.c
@@ -10,7 +10,7 @@
 #include "libzfs_simplified.h"
 #endif
 
-#include "common/library.h"
+#include "util/library.h"
 
 typedef struct FFZfsData
 {
diff --git a/src/fastfetch.c b/src/fastfetch.c
index b68bd1a6e..d7cfe540e 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1,11 +1,11 @@
 #include "fastfetch.h"
-#include "common/commandoption.h"
-#include "common/init.h"
-#include "common/io/io.h"
-#include "common/jsonconfig.h"
-#include "common/time.h"
 #include "detection/version/version.h"
 #include "logo/logo.h"
+#include "util/commandoption.h"
+#include "util/init.h"
+#include "util/io/io.h"
+#include "util/jsonconfig.h"
+#include "util/time.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 #include "fastfetch_datatext.h"
diff --git a/src/flashfetch.c b/src/flashfetch.c
index e4815686c..100d30b48 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 
-#include "common/init.h"
+#include "util/init.h"
 #include "logo/logo.h"
 #include "modules/modules.h"
 
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index b646e3d46..53f526b6a 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -1,6 +1,6 @@
 #include "logo.h"
 #include "logo_builtin.h"
-#include "common/color.h"
+#include "util/color.h"
 
 const FFlogo ffLogoUnknown = {
     .names = {"unknown"},
diff --git a/src/logo/image/im6.c b/src/logo/image/im6.c
index 4893eeaad..3243f847b 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 "common/library.h"
+#include "util/library.h"
 
 #include <magick/MagickCore.h>
 
diff --git a/src/logo/image/im7.c b/src/logo/image/im7.c
index b33c0ccf9..8ed0e0c65 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 "common/library.h"
+#include "util/library.h"
 
 #include <MagickCore/MagickCore.h>
 
diff --git a/src/logo/image/image.c b/src/logo/image/image.c
index 5462a2113..eb070a0d4 100644
--- a/src/logo/image/image.c
+++ b/src/logo/image/image.c
@@ -1,7 +1,7 @@
 #include "image.h"
-#include "common/io/io.h"
-#include "common/printing.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/printing.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 #include "util/base64.h"
 #include "detection/terminalsize/terminalsize.h"
@@ -421,7 +421,7 @@ static inline char* realpath(const char* restrict file_name, char* restrict reso
 #endif
 
 #ifdef FF_HAVE_ZLIB
-#include "common/library.h"
+#include "util/library.h"
 #include <stdlib.h>
 #include <zlib.h>
 
diff --git a/src/logo/logo.c b/src/logo/logo.c
index a5d906840..5b5390431 100644
--- a/src/logo/logo.c
+++ b/src/logo/logo.c
@@ -1,12 +1,12 @@
 #include "logo/logo.h"
-#include "common/io/io.h"
-#include "common/printing.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/printing.h"
+#include "util/processing.h"
+#include "util/textModifier.h"
+#include "util/stringUtils.h"
 #include "detection/media/media.h"
 #include "detection/os/os.h"
 #include "detection/terminalshell/terminalshell.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 #include <stdlib.h>
diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c
index dc87a3269..fb22003cb 100644
--- a/src/modules/battery/battery.c
+++ b/src/modules/battery/battery.c
@@ -1,11 +1,11 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/duration.h"
-#include "common/temps.h"
+#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 "detection/battery/battery.h"
 #include "modules/battery/battery.h"
-#include "util/stringUtils.h"
 
 static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index)
 {
diff --git a/src/modules/battery/option.h b/src/modules/battery/option.h
index 1ac5b97be..93ef0d50f 100644
--- a/src/modules/battery/option.h
+++ b/src/modules/battery/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBatteryOptions
 {
diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c
index 4eee62730..15234f3cd 100644
--- a/src/modules/bios/bios.c
+++ b/src/modules/bios/bios.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bios/bios.h"
 #include "modules/bios/bios.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBios(FFBiosOptions* options)
 {
diff --git a/src/modules/bios/option.h b/src/modules/bios/option.h
index 000803569..350afdcc6 100644
--- a/src/modules/bios/option.h
+++ b/src/modules/bios/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBiosOptions
 {
diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c
index ad6bcd064..d26dbe5c7 100644
--- a/src/modules/bluetooth/bluetooth.c
+++ b/src/modules/bluetooth/bluetooth.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bluetooth/bluetooth.h"
 #include "modules/bluetooth/bluetooth.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* device, uint8_t index)
 {
diff --git a/src/modules/bluetooth/option.h b/src/modules/bluetooth/option.h
index 516c0d8b4..7453a1ebd 100644
--- a/src/modules/bluetooth/option.h
+++ b/src/modules/bluetooth/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBluetoothOptions
 {
diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c
index b127f9349..8adf8e069 100644
--- a/src/modules/bluetoothradio/bluetoothradio.c
+++ b/src/modules/bluetoothradio/bluetoothradio.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bluetoothradio/bluetoothradio.h"
 #include "modules/bluetoothradio/bluetoothradio.h"
-#include "util/stringUtils.h"
 
 #define FF_BLUETOOTHRADIO_DISPLAY_NAME "Bluetooth Radio"
 
diff --git a/src/modules/bluetoothradio/option.h b/src/modules/bluetoothradio/option.h
index 1b718b834..55c3090e3 100644
--- a/src/modules/bluetoothradio/option.h
+++ b/src/modules/bluetoothradio/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBluetoothRadioOptions
 {
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
index 9f572e69f..ef4174b2c 100644
--- a/src/modules/board/board.c
+++ b/src/modules/board/board.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/board/board.h"
 #include "modules/board/board.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBoard(FFBoardOptions* options)
 {
diff --git a/src/modules/board/option.h b/src/modules/board/option.h
index bcc69adf3..79bcd9c52 100644
--- a/src/modules/board/option.h
+++ b/src/modules/board/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBoardOptions
 {
diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c
index d953a1503..4c0d80305 100644
--- a/src/modules/bootmgr/bootmgr.c
+++ b/src/modules/bootmgr/bootmgr.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/bootmgr/bootmgr.h"
 #include "modules/bootmgr/bootmgr.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBootmgr(FFBootmgrOptions* options)
 {
diff --git a/src/modules/bootmgr/option.h b/src/modules/bootmgr/option.h
index e27e71efd..b5a62dbbe 100644
--- a/src/modules/bootmgr/option.h
+++ b/src/modules/bootmgr/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBootmgrOptions
 {
diff --git a/src/modules/break/break.c b/src/modules/break/break.c
index e3b958782..8f68af87d 100644
--- a/src/modules/break/break.c
+++ b/src/modules/break/break.c
@@ -1,4 +1,4 @@
-#include "common/printing.h"
+#include "util/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 e5acbf20d..b768196ee 100644
--- a/src/modules/break/option.h
+++ b/src/modules/break/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFBreakOptions
 {
diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c
index cc758e285..52bd00d80 100644
--- a/src/modules/brightness/brightness.c
+++ b/src/modules/brightness/brightness.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/brightness/brightness.h"
 #include "modules/brightness/brightness.h"
-#include "util/stringUtils.h"
 
 bool ffPrintBrightness(FFBrightnessOptions* options)
 {
diff --git a/src/modules/brightness/option.h b/src/modules/brightness/option.h
index 4ff3843e7..41bb5e202 100644
--- a/src/modules/brightness/option.h
+++ b/src/modules/brightness/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBrightnessOptions
 {
diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c
index b3f968d88..fed42af5c 100644
--- a/src/modules/btrfs/btrfs.c
+++ b/src/modules/btrfs/btrfs.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/btrfs/btrfs.h"
 #include "modules/btrfs/btrfs.h"
-#include "util/stringUtils.h"
 
 static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t index)
 {
diff --git a/src/modules/btrfs/option.h b/src/modules/btrfs/option.h
index 019eacb19..052b5a783 100644
--- a/src/modules/btrfs/option.h
+++ b/src/modules/btrfs/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFBtrfsOptions
 {
diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c
index 19c28e95a..b40fc71ac 100644
--- a/src/modules/camera/camera.c
+++ b/src/modules/camera/camera.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/camera/camera.h"
 #include "modules/camera/camera.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index)
 {
diff --git a/src/modules/camera/option.h b/src/modules/camera/option.h
index 6a2481fe8..7b99bfc42 100644
--- a/src/modules/camera/option.h
+++ b/src/modules/camera/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCameraOptions
 {
diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c
index 068e51cc0..a9111cf9e 100644
--- a/src/modules/chassis/chassis.c
+++ b/src/modules/chassis/chassis.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/chassis/chassis.h"
 #include "modules/chassis/chassis.h"
-#include "util/stringUtils.h"
 
 bool ffPrintChassis(FFChassisOptions* options)
 {
diff --git a/src/modules/chassis/option.h b/src/modules/chassis/option.h
index b3100653f..fae05cbed 100644
--- a/src/modules/chassis/option.h
+++ b/src/modules/chassis/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFChassisOptions
 {
diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c
index e3e9e04a7..9527bbb42 100644
--- a/src/modules/colors/colors.c
+++ b/src/modules/colors/colors.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "logo/logo.h"
-#include "modules/colors/colors.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/textModifier.h"
 #include "util/stringUtils.h"
+#include "logo/logo.h"
+#include "modules/colors/colors.h"
 
 static inline uint8_t min(uint8_t a, uint8_t b)
 {
diff --git a/src/modules/colors/option.h b/src/modules/colors/option.h
index 6a0bbb0d4..12d77a7e4 100644
--- a/src/modules/colors/option.h
+++ b/src/modules/colors/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFColorsSymbol
 {
diff --git a/src/modules/command/command.c b/src/modules/command/command.c
index 84ecba557..0f8b7e430 100644
--- a/src/modules/command/command.c
+++ b/src/modules/command/command.c
@@ -1,5 +1,5 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/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 06f3b05b3..2b3a13545 100644
--- a/src/modules/command/option.h
+++ b/src/modules/command/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCommandOptions
 {
diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c
index 1e2e75378..65252a899 100644
--- a/src/modules/cpu/cpu.c
+++ b/src/modules/cpu/cpu.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/parsing.h"
-#include "common/temps.h"
-#include "common/frequency.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/parsing.h"
+#include "util/temps.h"
+#include "util/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 428b40a6b..9dae8e4f8 100644
--- a/src/modules/cpu/option.h
+++ b/src/modules/cpu/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCPUOptions
 {
diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c
index e3664909a..e9d4df261 100644
--- a/src/modules/cpucache/cpucache.c
+++ b/src/modules/cpucache/cpucache.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/cpucache/cpucache.h"
 #include "modules/cpucache/cpucache.h"
-#include "util/stringUtils.h"
 
 #define FF_CPUCACHE_DISPLAY_NAME "CPU Cache"
 
diff --git a/src/modules/cpucache/option.h b/src/modules/cpucache/option.h
index f53acf691..3ac2c5e04 100644
--- a/src/modules/cpucache/option.h
+++ b/src/modules/cpucache/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCPUCacheOptions
 {
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
index d9a3ecc8c..eb04341f1 100644
--- a/src/modules/cpuusage/cpuusage.c
+++ b/src/modules/cpuusage/cpuusage.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/stringUtils.h"
 #include "detection/cpuusage/cpuusage.h"
 #include "modules/cpuusage/cpuusage.h"
-#include "util/stringUtils.h"
 
 #define FF_CPUUSAGE_DISPLAY_NAME "CPU Usage"
 
diff --git a/src/modules/cpuusage/option.h b/src/modules/cpuusage/option.h
index dc19fbe76..32ed6d0bc 100644
--- a/src/modules/cpuusage/option.h
+++ b/src/modules/cpuusage/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFCPUUsageOptions
 {
diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c
index 93e14dcbb..e2cd83cef 100644
--- a/src/modules/cursor/cursor.c
+++ b/src/modules/cursor/cursor.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/cursor/cursor.h"
 #include "modules/cursor/cursor.h"
-#include "util/stringUtils.h"
 
 bool ffPrintCursor(FFCursorOptions* options)
 {
diff --git a/src/modules/cursor/option.h b/src/modules/cursor/option.h
index 3f02c567c..5df94b8e0 100644
--- a/src/modules/cursor/option.h
+++ b/src/modules/cursor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCursorOptions
 {
diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c
index bee9ed21f..cee7f9874 100644
--- a/src/modules/custom/custom.c
+++ b/src/modules/custom/custom.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "modules/custom/custom.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/textModifier.h"
 #include "util/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 c66ccee7d..89a6044d0 100644
--- a/src/modules/custom/option.h
+++ b/src/modules/custom/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFCustomOptions
 {
diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c
index 233f11cf7..d65458837 100644
--- a/src/modules/datetime/datetime.c
+++ b/src/modules/datetime/datetime.c
@@ -1,8 +1,8 @@
-#include "common/time.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "modules/datetime/datetime.h"
+#include "util/time.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/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 fffd5dc51..ef6da988d 100644
--- a/src/modules/datetime/option.h
+++ b/src/modules/datetime/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDateTimeOptions
 {
diff --git a/src/modules/de/de.c b/src/modules/de/de.c
index 60870e3c9..eac9cc524 100644
--- a/src/modules/de/de.c
+++ b/src/modules/de/de.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/de/de.h"
 #include "modules/de/de.h"
-#include "util/stringUtils.h"
 
 bool ffPrintDE(FFDEOptions* options)
 {
diff --git a/src/modules/de/option.h b/src/modules/de/option.h
index c587a0c96..b442cb2cb 100644
--- a/src/modules/de/option.h
+++ b/src/modules/de/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDEOptions
 {
diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c
index 947f7482f..f3656483c 100644
--- a/src/modules/disk/disk.c
+++ b/src/modules/disk/disk.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
-#include "common/time.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/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 f4ec16f93..76445ecff 100644
--- a/src/modules/disk/option.h
+++ b/src/modules/disk/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef enum __attribute__((__packed__)) FFDiskVolumeType
 {
diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c
index e353d95f5..de15f18fa 100644
--- a/src/modules/diskio/diskio.c
+++ b/src/modules/diskio/diskio.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/diskio/diskio.h"
 #include "modules/diskio/diskio.h"
-#include "util/stringUtils.h"
 
 #define FF_DISKIO_DISPLAY_NAME "Disk IO"
 
diff --git a/src/modules/diskio/option.h b/src/modules/diskio/option.h
index 5de458fa3..c32db7e75 100644
--- a/src/modules/diskio/option.h
+++ b/src/modules/diskio/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFDiskIOOptions
 {
diff --git a/src/modules/display/display.c b/src/modules/display/display.c
index 0a9a4563c..75dd7b424 100644
--- a/src/modules/display/display.c
+++ b/src/modules/display/display.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/display/display.h"
-#include "util/stringUtils.h"
 
 #include <math.h>
 
diff --git a/src/modules/display/option.h b/src/modules/display/option.h
index 12ad3c5ec..6735ec319 100644
--- a/src/modules/display/option.h
+++ b/src/modules/display/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFDisplayCompactType
 {
diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c
index a92784df6..69596473f 100644
--- a/src/modules/dns/dns.c
+++ b/src/modules/dns/dns.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/dns/dns.h"
 #include "modules/dns/dns.h"
-#include "util/stringUtils.h"
 
 bool ffPrintDNS(FFDNSOptions* options)
 {
diff --git a/src/modules/dns/option.h b/src/modules/dns/option.h
index bc3bd5690..b287d0349 100644
--- a/src/modules/dns/option.h
+++ b/src/modules/dns/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/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 6e1551402..2f0d501af 100644
--- a/src/modules/editor/editor.c
+++ b/src/modules/editor/editor.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/editor/editor.h"
 #include "modules/editor/editor.h"
-#include "util/stringUtils.h"
 
 bool ffPrintEditor(FFEditorOptions* options)
 {
diff --git a/src/modules/editor/option.h b/src/modules/editor/option.h
index f7c545f84..93597d908 100644
--- a/src/modules/editor/option.h
+++ b/src/modules/editor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFEditorOptions
 {
diff --git a/src/modules/font/font.c b/src/modules/font/font.c
index b85a9e94d..da568a87f 100644
--- a/src/modules/font/font.c
+++ b/src/modules/font/font.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/font/font.h"
 #include "modules/font/font.h"
-#include "util/stringUtils.h"
 
 bool ffPrintFont(FFFontOptions* options)
 {
diff --git a/src/modules/font/option.h b/src/modules/font/option.h
index 6c942e7dd..83c6e338f 100644
--- a/src/modules/font/option.h
+++ b/src/modules/font/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFFontOptions
 {
diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c
index 327d73b15..dd213abd0 100644
--- a/src/modules/gamepad/gamepad.c
+++ b/src/modules/gamepad/gamepad.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/gamepad/gamepad.h"
 #include "modules/gamepad/gamepad.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index)
 {
diff --git a/src/modules/gamepad/option.h b/src/modules/gamepad/option.h
index b52b1dea3..a977cd8b5 100644
--- a/src/modules/gamepad/option.h
+++ b/src/modules/gamepad/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFGamepadOptions
diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c
index 723a2cebe..d84750cbd 100644
--- a/src/modules/gpu/gpu.c
+++ b/src/modules/gpu/gpu.c
@@ -1,13 +1,13 @@
-#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 "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 "detection/host/host.h"
 #include "detection/gpu/gpu.h"
 #include "modules/gpu/gpu.h"
-#include "util/stringUtils.h"
 
 #include <stdlib.h>
 
diff --git a/src/modules/gpu/option.h b/src/modules/gpu/option.h
index 0d1d0fac8..e732877d8 100644
--- a/src/modules/gpu/option.h
+++ b/src/modules/gpu/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef enum __attribute__((__packed__)) FFGPUType
 {
diff --git a/src/modules/host/host.c b/src/modules/host/host.c
index b86e37d54..d681db453 100644
--- a/src/modules/host/host.c
+++ b/src/modules/host/host.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/host/host.h"
 #include "modules/host/host.h"
-#include "util/stringUtils.h"
 
 bool ffPrintHost(FFHostOptions* options)
 {
diff --git a/src/modules/host/option.h b/src/modules/host/option.h
index 2516f864c..1fc37b2f5 100644
--- a/src/modules/host/option.h
+++ b/src/modules/host/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFHostOptions
 {
diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c
index b50b85363..e1716edcc 100644
--- a/src/modules/icons/icons.c
+++ b/src/modules/icons/icons.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/icons/icons.h"
 #include "modules/icons/icons.h"
-#include "util/stringUtils.h"
 
 bool ffPrintIcons(FFIconsOptions* options)
 {
diff --git a/src/modules/icons/option.h b/src/modules/icons/option.h
index 966bba5f5..7cc423fad 100644
--- a/src/modules/icons/option.h
+++ b/src/modules/icons/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFIconsOptions
 {
diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c
index d32f7a6dd..e667c7f59 100644
--- a/src/modules/initsystem/initsystem.c
+++ b/src/modules/initsystem/initsystem.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/initsystem/initsystem.h"
 #include "modules/initsystem/initsystem.h"
-#include "util/stringUtils.h"
 
 #define FF_INITSYSTEM_DISPLAY_NAME "Init System"
 
diff --git a/src/modules/initsystem/option.h b/src/modules/initsystem/option.h
index 54c10158e..922d8fbfe 100644
--- a/src/modules/initsystem/option.h
+++ b/src/modules/initsystem/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFInitSystemOptions
 {
diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c
index 665361704..5ef2a3369 100644
--- a/src/modules/kernel/kernel.c
+++ b/src/modules/kernel/kernel.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
-#include "modules/kernel/kernel.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
 #include "util/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 2b2b27d7e..3f632ba18 100644
--- a/src/modules/kernel/option.h
+++ b/src/modules/kernel/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFKernelOptions
 {
diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c
index b33c4ff4a..f7749034d 100644
--- a/src/modules/keyboard/keyboard.c
+++ b/src/modules/keyboard/keyboard.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/keyboard/keyboard.h"
 #include "modules/keyboard/keyboard.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFKeyboardOptions* options, const FFKeyboardDevice* device, uint8_t index)
 {
diff --git a/src/modules/keyboard/option.h b/src/modules/keyboard/option.h
index 6f5244a6a..36784a7f0 100644
--- a/src/modules/keyboard/option.h
+++ b/src/modules/keyboard/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFKeyboardOptions
diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c
index 0b17f3744..ea5ea1781 100644
--- a/src/modules/lm/lm.c
+++ b/src/modules/lm/lm.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/lm/lm.h"
 #include "modules/lm/lm.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLM(FFLMOptions* options)
 {
diff --git a/src/modules/lm/option.h b/src/modules/lm/option.h
index 21a4ad8b7..c0ccd9147 100644
--- a/src/modules/lm/option.h
+++ b/src/modules/lm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLMOptions
 {
diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c
index 793786e04..cb7874e24 100644
--- a/src/modules/loadavg/loadavg.c
+++ b/src/modules/loadavg/loadavg.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/stringUtils.h"
 #include "detection/loadavg/loadavg.h"
 #include "detection/cpu/cpu.h"
 #include "modules/loadavg/loadavg.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLoadavg(FFLoadavgOptions* options)
 {
diff --git a/src/modules/loadavg/option.h b/src/modules/loadavg/option.h
index 947b310db..d5b57094f 100644
--- a/src/modules/loadavg/option.h
+++ b/src/modules/loadavg/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLoadavgOptions
 {
diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c
index a5bc15a43..d2151ed15 100644
--- a/src/modules/locale/locale.c
+++ b/src/modules/locale/locale.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/locale/locale.h"
 #include "modules/locale/locale.h"
-#include "util/stringUtils.h"
 
 bool ffPrintLocale(FFLocaleOptions* options)
 {
diff --git a/src/modules/locale/option.h b/src/modules/locale/option.h
index 236d61ee3..2f1efd722 100644
--- a/src/modules/locale/option.h
+++ b/src/modules/locale/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFLocaleOptions
 {
diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c
index bb479099d..344e0a25b 100644
--- a/src/modules/localip/localip.c
+++ b/src/modules/localip/localip.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/localip/localip.h"
 #include "modules/localip/localip.h"
-#include "util/stringUtils.h"
 
 #define FF_LOCALIP_DISPLAY_NAME "Local IP"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
diff --git a/src/modules/localip/option.h b/src/modules/localip/option.h
index 18205263c..140d7c1f4 100644
--- a/src/modules/localip/option.h
+++ b/src/modules/localip/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFLocalIpType
 {
diff --git a/src/modules/media/media.c b/src/modules/media/media.c
index ab1aafc3a..e667a2ef8 100644
--- a/src/modules/media/media.c
+++ b/src/modules/media/media.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/media/media.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 
diff --git a/src/modules/media/option.h b/src/modules/media/option.h
index e90ee854f..6565c94f1 100644
--- a/src/modules/media/option.h
+++ b/src/modules/media/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFMediaOptions
 {
diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c
index 182d55567..10a21bc3b 100644
--- a/src/modules/memory/memory.c
+++ b/src/modules/memory/memory.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/memory/memory.h"
 #include "modules/memory/memory.h"
-#include "util/stringUtils.h"
 
 bool ffPrintMemory(FFMemoryOptions* options)
 {
diff --git a/src/modules/memory/option.h b/src/modules/memory/option.h
index 243847f5f..a73399281 100644
--- a/src/modules/memory/option.h
+++ b/src/modules/memory/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFMemoryOptions
 {
diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c
index 46a4ad78e..f6b98d8dc 100644
--- a/src/modules/monitor/monitor.c
+++ b/src/modules/monitor/monitor.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "modules/monitor/monitor.h"
-#include "util/stringUtils.h"
 
 #include <math.h>
 
diff --git a/src/modules/monitor/option.h b/src/modules/monitor/option.h
index 07905ecba..2aff6e649 100644
--- a/src/modules/monitor/option.h
+++ b/src/modules/monitor/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFMonitorOptions
 {
diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c
index a0e3ef69a..83d04b115 100644
--- a/src/modules/mouse/mouse.c
+++ b/src/modules/mouse/mouse.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/mouse/mouse.h"
 #include "modules/mouse/mouse.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFMouseOptions* options, const FFMouseDevice* device, uint8_t index)
 {
diff --git a/src/modules/mouse/option.h b/src/modules/mouse/option.h
index dcb5331f7..329e3644a 100644
--- a/src/modules/mouse/option.h
+++ b/src/modules/mouse/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 #include "util/FFlist.h"
 
 typedef struct FFMouseOptions
diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c
index fd5c90349..668248ba1 100644
--- a/src/modules/netio/netio.c
+++ b/src/modules/netio/netio.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/netio/netio.h"
 #include "modules/netio/netio.h"
-#include "util/stringUtils.h"
 
 #define FF_NETIO_DISPLAY_NAME "Network IO"
 
diff --git a/src/modules/netio/option.h b/src/modules/netio/option.h
index 61ffa37d5..ba30d8b08 100644
--- a/src/modules/netio/option.h
+++ b/src/modules/netio/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFNetIOOptions
 {
diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c
index fd35e5bf5..829c98875 100644
--- a/src/modules/opencl/opencl.c
+++ b/src/modules/opencl/opencl.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/opencl/opencl.h"
 #include "detection/gpu/gpu.h"
 #include "modules/opencl/opencl.h"
-#include "util/stringUtils.h"
 
 bool ffPrintOpenCL(FFOpenCLOptions* options)
 {
diff --git a/src/modules/opencl/option.h b/src/modules/opencl/option.h
index 2fd7dff26..0c020e140 100644
--- a/src/modules/opencl/option.h
+++ b/src/modules/opencl/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFOpenCLOptions
 {
diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c
index 5dcc55540..421ff5ef0 100644
--- a/src/modules/opengl/opengl.c
+++ b/src/modules/opengl/opengl.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/opengl/opengl.h"
 #include "modules/opengl/opengl.h"
-#include "util/stringUtils.h"
 
 bool ffPrintOpenGL(FFOpenGLOptions* options)
 {
diff --git a/src/modules/opengl/option.h b/src/modules/opengl/option.h
index cc4b6ef46..aabd35262 100644
--- a/src/modules/opengl/option.h
+++ b/src/modules/opengl/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFOpenGLLibrary
 {
diff --git a/src/modules/os/option.h b/src/modules/os/option.h
index c7142b237..2fff435ca 100644
--- a/src/modules/os/option.h
+++ b/src/modules/os/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFOSOptions
 {
diff --git a/src/modules/os/os.c b/src/modules/os/os.c
index 4745225ec..5e6981194 100644
--- a/src/modules/os/os.c
+++ b/src/modules/os/os.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/option.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/option.h"
+#include "util/stringUtils.h"
 #include "detection/os/os.h"
 #include "modules/os/os.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
index f39541388..d7a83b2fa 100644
--- a/src/modules/packages/option.h
+++ b/src/modules/packages/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFPackagesFlags
 {
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index 5f78a0524..59670ec95 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/packages/packages.h"
 #include "modules/packages/packages.h"
-#include "util/stringUtils.h"
 
 bool ffPrintPackages(FFPackagesOptions* options)
 {
diff --git a/src/modules/physicaldisk/option.h b/src/modules/physicaldisk/option.h
index 3951f0610..8e65494e1 100644
--- a/src/modules/physicaldisk/option.h
+++ b/src/modules/physicaldisk/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPhysicalDiskOptions
 {
diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c
index e6dca99d1..8f66cebee 100644
--- a/src/modules/physicaldisk/physicaldisk.c
+++ b/src/modules/physicaldisk/physicaldisk.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/temps.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/temps.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/physicaldisk/physicaldisk.h"
 #include "modules/physicaldisk/physicaldisk.h"
-#include "util/stringUtils.h"
 
 #define FF_PHYSICALDISK_DISPLAY_NAME "Physical Disk"
 
diff --git a/src/modules/physicalmemory/option.h b/src/modules/physicalmemory/option.h
index 154354b4a..df41b4d5f 100644
--- a/src/modules/physicalmemory/option.h
+++ b/src/modules/physicalmemory/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFPhysicalMemoryOptions
 {
diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c
index 81e593f3f..4798541ae 100644
--- a/src/modules/physicalmemory/physicalmemory.c
+++ b/src/modules/physicalmemory/physicalmemory.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/physicalmemory/physicalmemory.h"
 #include "modules/physicalmemory/physicalmemory.h"
-#include "util/stringUtils.h"
 
 #define FF_PHYSICALMEMORY_DISPLAY_NAME "Physical Memory"
 
diff --git a/src/modules/player/option.h b/src/modules/player/option.h
index 9d55821fd..152253394 100644
--- a/src/modules/player/option.h
+++ b/src/modules/player/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPlayerOptions
 {
diff --git a/src/modules/player/player.c b/src/modules/player/player.c
index 62592dced..37eca4d96 100644
--- a/src/modules/player/player.c
+++ b/src/modules/player/player.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/media/media.h"
 #include "modules/player/player.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 
diff --git a/src/modules/poweradapter/option.h b/src/modules/poweradapter/option.h
index 303bbba73..96d37ded1 100644
--- a/src/modules/poweradapter/option.h
+++ b/src/modules/poweradapter/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPowerAdapterOptions
 {
diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c
index 1361bc60d..93117b863 100644
--- a/src/modules/poweradapter/poweradapter.c
+++ b/src/modules/poweradapter/poweradapter.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/poweradapter/poweradapter.h"
 #include "modules/poweradapter/poweradapter.h"
-#include "util/stringUtils.h"
 
 #define FF_POWERADAPTER_DISPLAY_NAME "Power Adapter"
 
diff --git a/src/modules/processes/option.h b/src/modules/processes/option.h
index 0b59f9df3..4f11f77f6 100644
--- a/src/modules/processes/option.h
+++ b/src/modules/processes/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFProcessesOptions
 {
diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c
index fcec4c041..130bed411 100644
--- a/src/modules/processes/processes.c
+++ b/src/modules/processes/processes.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/processes/processes.h"
 #include "modules/processes/processes.h"
-#include "util/stringUtils.h"
 
 bool ffPrintProcesses(FFProcessesOptions* options)
 {
diff --git a/src/modules/publicip/option.h b/src/modules/publicip/option.h
index e3118cb28..c02d4450c 100644
--- a/src/modules/publicip/option.h
+++ b/src/modules/publicip/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFPublicIPOptions
 {
diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c
index 493d3d531..3c842c938 100644
--- a/src/modules/publicip/publicip.c
+++ b/src/modules/publicip/publicip.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "modules/publicip/publicip.h"
 #include "detection/publicip/publicip.h"
-#include "util/stringUtils.h"
 
 #define FF_PUBLICIP_DISPLAY_NAME "Public IP"
 
diff --git a/src/modules/separator/option.h b/src/modules/separator/option.h
index a8b31379d..b905f90fe 100644
--- a/src/modules/separator/option.h
+++ b/src/modules/separator/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFSeparatorOptions
 {
diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c
index bf2a5ffb3..1b7a898f6 100644
--- a/src/modules/separator/separator.c
+++ b/src/modules/separator/separator.c
@@ -1,11 +1,11 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "logo/logo.h"
-#include "modules/separator/separator.h"
+#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 "logo/logo.h"
+#include "modules/separator/separator.h"
 
 #include <locale.h>
 
diff --git a/src/modules/shell/option.h b/src/modules/shell/option.h
index 49ec83f51..5567ca970 100644
--- a/src/modules/shell/option.h
+++ b/src/modules/shell/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFShellOptions
 {
diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c
index 73feb0119..0e6ef540e 100644
--- a/src/modules/shell/shell.c
+++ b/src/modules/shell/shell.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/shell/shell.h"
-#include "util/stringUtils.h"
 
 bool ffPrintShell(FFShellOptions* options)
 {
diff --git a/src/modules/sound/option.h b/src/modules/sound/option.h
index 0c9f0fd4f..c5f25e5ef 100644
--- a/src/modules/sound/option.h
+++ b/src/modules/sound/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef enum __attribute__((__packed__)) FFSoundType
 {
diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c
index e87af35d6..d5d12e55f 100644
--- a/src/modules/sound/sound.c
+++ b/src/modules/sound/sound.c
@@ -1,9 +1,9 @@
-#include "common/percent.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/percent.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/sound/sound.h"
 #include "modules/sound/sound.h"
-#include "util/stringUtils.h"
 
 static void printDevice(FFSoundOptions* options, const FFSoundDevice* device, uint8_t index)
 {
diff --git a/src/modules/swap/option.h b/src/modules/swap/option.h
index 2d9691100..61f82935e 100644
--- a/src/modules/swap/option.h
+++ b/src/modules/swap/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFSwapOptions
 {
diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c
index d336cf972..d6a5d06c6 100644
--- a/src/modules/swap/swap.c
+++ b/src/modules/swap/swap.c
@@ -1,10 +1,10 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
+#include "util/size.h"
+#include "util/stringUtils.h"
 #include "detection/swap/swap.h"
 #include "modules/swap/swap.h"
-#include "util/stringUtils.h"
 
 void printSwap(FFSwapOptions* options, uint8_t index, FFSwapResult* storage)
 {
diff --git a/src/modules/terminal/option.h b/src/modules/terminal/option.h
index 49b005e03..744c03a4e 100644
--- a/src/modules/terminal/option.h
+++ b/src/modules/terminal/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTerminalOptions
 {
diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c
index fdaf93dcc..dd8bbdf00 100644
--- a/src/modules/terminal/terminal.c
+++ b/src/modules/terminal/terminal.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "modules/terminal/terminal.h"
-#include "util/stringUtils.h"
 
 bool ffPrintTerminal(FFTerminalOptions* options)
 {
diff --git a/src/modules/terminalfont/option.h b/src/modules/terminalfont/option.h
index db652adce..972341123 100644
--- a/src/modules/terminalfont/option.h
+++ b/src/modules/terminalfont/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTerminalFontOptions
 {
diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c
index b99ed6eda..4cdf30085 100644
--- a/src/modules/terminalfont/terminalfont.c
+++ b/src/modules/terminalfont/terminalfont.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/terminalfont/terminalfont.h"
 #include "modules/terminalfont/terminalfont.h"
-#include "util/stringUtils.h"
 
 #define FF_TERMINALFONT_DISPLAY_NAME "Terminal Font"
 
diff --git a/src/modules/terminalsize/option.h b/src/modules/terminalsize/option.h
index 518856a8c..ec9f221ff 100644
--- a/src/modules/terminalsize/option.h
+++ b/src/modules/terminalsize/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTerminalSizeOptions
 {
diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c
index b604c597c..ed380e7b4 100644
--- a/src/modules/terminalsize/terminalsize.c
+++ b/src/modules/terminalsize/terminalsize.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/terminalsize/terminalsize.h"
 #include "modules/terminalsize/terminalsize.h"
-#include "util/stringUtils.h"
 
 #define FF_TERMINALSIZE_DISPLAY_NAME "Terminal Size"
 
diff --git a/src/modules/terminaltheme/option.h b/src/modules/terminaltheme/option.h
index 3d8cdc252..d2a55bf20 100644
--- a/src/modules/terminaltheme/option.h
+++ b/src/modules/terminaltheme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTerminalThemeOptions
 {
diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c
index f77d5e60c..2ffb37ee9 100644
--- a/src/modules/terminaltheme/terminaltheme.c
+++ b/src/modules/terminaltheme/terminaltheme.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "modules/terminaltheme/terminaltheme.h"
-#include "util/stringUtils.h"
 
 #include <inttypes.h>
 
diff --git a/src/modules/theme/option.h b/src/modules/theme/option.h
index ca232bfb9..614c24626 100644
--- a/src/modules/theme/option.h
+++ b/src/modules/theme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFThemeOptions
 {
diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c
index 89cd332d2..8a31f89b6 100644
--- a/src/modules/theme/theme.c
+++ b/src/modules/theme/theme.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/theme/theme.h"
 #include "modules/theme/theme.h"
-#include "util/stringUtils.h"
 
 bool ffPrintTheme(FFThemeOptions* options)
 {
diff --git a/src/modules/title/option.h b/src/modules/title/option.h
index 16505d39b..99b29a2f5 100644
--- a/src/modules/title/option.h
+++ b/src/modules/title/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTitleOptions
 {
diff --git a/src/modules/title/title.c b/src/modules/title/title.c
index dd8519208..04ad37c37 100644
--- a/src/modules/title/title.c
+++ b/src/modules/title/title.c
@@ -1,7 +1,7 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "modules/title/title.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
 #include "util/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 19fb79029..a7c0ca7d2 100644
--- a/src/modules/tpm/option.h
+++ b/src/modules/tpm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFTPMOptions
 {
diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c
index b3f4e53cf..5c5d31960 100644
--- a/src/modules/tpm/tpm.c
+++ b/src/modules/tpm/tpm.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/tpm/tpm.h"
 #include "modules/tpm/tpm.h"
-#include "util/stringUtils.h"
 
 bool ffPrintTPM(FFTPMOptions* options)
 {
diff --git a/src/modules/uptime/option.h b/src/modules/uptime/option.h
index 4235995c5..ae92d600a 100644
--- a/src/modules/uptime/option.h
+++ b/src/modules/uptime/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFUptimeOptions
 {
diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c
index e1cbd9a8c..d3184865a 100644
--- a/src/modules/uptime/uptime.c
+++ b/src/modules/uptime/uptime.c
@@ -1,10 +1,10 @@
-#include "common/duration.h"
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/time.h"
+#include "util/duration.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/time.h"
+#include "util/stringUtils.h"
 #include "detection/uptime/uptime.h"
 #include "modules/uptime/uptime.h"
-#include "util/stringUtils.h"
 
 bool ffPrintUptime(FFUptimeOptions* options)
 {
diff --git a/src/modules/users/option.h b/src/modules/users/option.h
index 16ea5e88f..151395209 100644
--- a/src/modules/users/option.h
+++ b/src/modules/users/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFUsersOptions
 {
diff --git a/src/modules/users/users.c b/src/modules/users/users.c
index 751816179..a089231ab 100644
--- a/src/modules/users/users.c
+++ b/src/modules/users/users.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/time.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/time.h"
+#include "util/stringUtils.h"
 #include "detection/users/users.h"
 #include "modules/users/users.h"
-#include "util/stringUtils.h"
 
 #pragma GCC diagnostic ignored "-Wformat" // warning: unknown conversion type character 'F' in format
 
diff --git a/src/modules/version/option.h b/src/modules/version/option.h
index f3b68b4f2..8f528ea18 100644
--- a/src/modules/version/option.h
+++ b/src/modules/version/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFVersionOptions
 {
diff --git a/src/modules/version/version.c b/src/modules/version/version.c
index 4350e7170..a12e330ba 100644
--- a/src/modules/version/version.c
+++ b/src/modules/version/version.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/libc/libc.h"
 #include "detection/version/version.h"
 #include "modules/version/version.h"
-#include "util/stringUtils.h"
 
 bool ffPrintVersion(FFVersionOptions* options)
 {
diff --git a/src/modules/vulkan/option.h b/src/modules/vulkan/option.h
index 38ec20c99..faf22440e 100644
--- a/src/modules/vulkan/option.h
+++ b/src/modules/vulkan/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFVulkanOptions
 {
diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c
index d77400725..2f2629a6a 100644
--- a/src/modules/vulkan/vulkan.c
+++ b/src/modules/vulkan/vulkan.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/gpu/gpu.h"
 #include "detection/vulkan/vulkan.h"
 #include "modules/vulkan/vulkan.h"
-#include "util/stringUtils.h"
 
 bool ffPrintVulkan(FFVulkanOptions* options)
 {
diff --git a/src/modules/wallpaper/option.h b/src/modules/wallpaper/option.h
index 621699fa3..b19f06987 100644
--- a/src/modules/wallpaper/option.h
+++ b/src/modules/wallpaper/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFWallpaperOptions
 {
diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c
index 61098f278..e8da5ecfe 100644
--- a/src/modules/wallpaper/wallpaper.c
+++ b/src/modules/wallpaper/wallpaper.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/wallpaper/wallpaper.h"
 #include "modules/wallpaper/wallpaper.h"
-#include "util/stringUtils.h"
 
 bool ffPrintWallpaper(FFWallpaperOptions* options)
 {
diff --git a/src/modules/weather/option.h b/src/modules/weather/option.h
index 76c3df11b..73089f637 100644
--- a/src/modules/weather/option.h
+++ b/src/modules/weather/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFWeatherOptions
 {
diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c
index 3fc3d3a48..9f4a9b9ca 100644
--- a/src/modules/weather/weather.c
+++ b/src/modules/weather/weather.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/weather/weather.h"
 #include "modules/weather/weather.h"
-#include "util/stringUtils.h"
 
 bool ffPrintWeather(FFWeatherOptions* options)
 {
diff --git a/src/modules/wifi/option.h b/src/modules/wifi/option.h
index f74579267..913980c3e 100644
--- a/src/modules/wifi/option.h
+++ b/src/modules/wifi/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFWifiOptions
 {
diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c
index 136211418..c37d75adf 100644
--- a/src/modules/wifi/wifi.c
+++ b/src/modules/wifi/wifi.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/wifi/wifi.h"
 #include "modules/wifi/wifi.h"
-#include "util/stringUtils.h"
 
 bool ffPrintWifi(FFWifiOptions* options)
 {
diff --git a/src/modules/wm/option.h b/src/modules/wm/option.h
index d213c9c3a..0165280f1 100644
--- a/src/modules/wm/option.h
+++ b/src/modules/wm/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFWMOptions
 {
diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c
index 23c724fb6..49b117fb5 100644
--- a/src/modules/wm/wm.c
+++ b/src/modules/wm/wm.c
@@ -1,9 +1,9 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/wm/wm.h"
 #include "modules/wm/wm.h"
-#include "util/stringUtils.h"
 
 bool ffPrintWM(FFWMOptions* options)
 {
diff --git a/src/modules/wmtheme/option.h b/src/modules/wmtheme/option.h
index b12f9f8b3..c1113c26c 100644
--- a/src/modules/wmtheme/option.h
+++ b/src/modules/wmtheme/option.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/option.h"
+#include "util/option.h"
 
 typedef struct FFWMThemeOptions
 {
diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c
index eee270df2..c82a6f30b 100644
--- a/src/modules/wmtheme/wmtheme.c
+++ b/src/modules/wmtheme/wmtheme.c
@@ -1,8 +1,8 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
+#include "util/printing.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "detection/wmtheme/wmtheme.h"
 #include "modules/wmtheme/wmtheme.h"
-#include "util/stringUtils.h"
 
 #define FF_WMTHEME_DISPLAY_NAME "WM Theme"
 
diff --git a/src/modules/zpool/option.h b/src/modules/zpool/option.h
index 49522b3be..00f57fae8 100644
--- a/src/modules/zpool/option.h
+++ b/src/modules/zpool/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/option.h"
-#include "common/percent.h"
+#include "util/option.h"
+#include "util/percent.h"
 
 typedef struct FFZpoolOptions
 {
diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c
index b518eae85..f615695bf 100644
--- a/src/modules/zpool/zpool.c
+++ b/src/modules/zpool/zpool.c
@@ -1,11 +1,11 @@
-#include "common/printing.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
-#include "common/size.h"
-#include "detection/zpool/zpool.h"
-#include "modules/zpool/zpool.h"
+#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 "detection/zpool/zpool.h"
+#include "modules/zpool/zpool.h"
 
 static void printZpool(FFZpoolOptions* options, FFZpoolResult* result, uint8_t index)
 {
diff --git a/src/options/display.c b/src/options/display.c
index 7ba790d46..fb1533319 100644
--- a/src/options/display.c
+++ b/src/options/display.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "common/color.h"
-#include "common/jsonconfig.h"
-#include "common/percent.h"
+#include "util/color.h"
+#include "util/jsonconfig.h"
+#include "util/percent.h"
 #include "util/stringUtils.h"
 #include "options/display.h"
 
diff --git a/src/options/display.h b/src/options/display.h
index 55a4e6668..5a98309d9 100644
--- a/src/options/display.h
+++ b/src/options/display.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/percent.h"
+#include "util/percent.h"
 #include "util/FFstrbuf.h"
 #include "util/FFlist.h"
 
diff --git a/src/options/general.c b/src/options/general.c
index 128d91799..c1a22e7e1 100644
--- a/src/options/general.c
+++ b/src/options/general.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "common/jsonconfig.h"
-#include "common/processing.h"
-#include "options/general.h"
+#include "util/jsonconfig.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
+#include "options/general.h"
 
 #include <unistd.h>
 
diff --git a/src/options/logo.c b/src/options/logo.c
index 2e93dd518..5b49e061c 100644
--- a/src/options/logo.c
+++ b/src/options/logo.c
@@ -1,6 +1,6 @@
 #include "logo/logo.h"
 
-#include "common/jsonconfig.h"
+#include "util/jsonconfig.h"
 #include "util/stringUtils.h"
 
 void ffOptionsInitLogo(FFOptionsLogo* options)
diff --git a/src/util/binary_apple.c b/src/util/binary_apple.c
index 9ee0ace96..31d975fa9 100644
--- a/src/util/binary_apple.c
+++ b/src/util/binary_apple.c
@@ -1,5 +1,5 @@
 #include "binary.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c
index ce3a0b8ae..6844ebb00 100644
--- a/src/util/binary_linux.c
+++ b/src/util/binary_linux.c
@@ -2,8 +2,8 @@
 
 #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__)
 
-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 
 #include <libelf.h> // #1254
diff --git a/src/util/binary_windows.c b/src/util/binary_windows.c
index e86cd5e5c..d11ae8c0e 100644
--- a/src/util/binary_windows.c
+++ b/src/util/binary_windows.c
@@ -1,5 +1,5 @@
 #include "binary.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
diff --git a/src/common/color.h b/src/util/color.h
similarity index 100%
rename from src/common/color.h
rename to src/util/color.h
diff --git a/src/common/commandoption.c b/src/util/commandoption.c
similarity index 98%
rename from src/common/commandoption.c
rename to src/util/commandoption.c
index 626a1c06f..948edf1c2 100644
--- a/src/common/commandoption.c
+++ b/src/util/commandoption.c
@@ -1,11 +1,11 @@
 #include "commandoption.h"
-#include "common/color.h"
-#include "common/printing.h"
-#include "common/time.h"
-#include "common/jsonconfig.h"
+#include "util/color.h"
+#include "util/printing.h"
+#include "util/time.h"
+#include "util/jsonconfig.h"
+#include "util/stringUtils.h"
 #include "fastfetch_datatext.h"
 #include "modules/modules.h"
-#include "util/stringUtils.h"
 
 #include <ctype.h>
 #include <inttypes.h>
diff --git a/src/common/commandoption.h b/src/util/commandoption.h
similarity index 100%
rename from src/common/commandoption.h
rename to src/util/commandoption.h
diff --git a/src/common/dbus.c b/src/util/dbus.c
similarity index 99%
rename from src/common/dbus.c
rename to src/util/dbus.c
index a2b46e66f..97b2e08a4 100644
--- a/src/common/dbus.c
+++ b/src/util/dbus.c
@@ -2,7 +2,7 @@
 
 #ifdef FF_HAVE_DBUS
 
-#include "common/thread.h"
+#include "util/thread.h"
 #include "util/stringUtils.h"
 
 static bool loadLibSymbols(FFDBusLibrary* lib)
diff --git a/src/common/dbus.h b/src/util/dbus.h
similarity index 98%
rename from src/common/dbus.h
rename to src/util/dbus.h
index cb55f7680..50cffdcee 100644
--- a/src/common/dbus.h
+++ b/src/util/dbus.h
@@ -4,7 +4,7 @@
 #include <dbus/dbus.h>
 
 #include "util/FFstrbuf.h"
-#include "common/library.h"
+#include "util/library.h"
 
 typedef struct FFDBusLibrary
 {
diff --git a/src/util/debug.h b/src/util/debug.h
index 0f6d8b821..60cd14d68 100644
--- a/src/util/debug.h
+++ b/src/util/debug.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "common/time.h"
+#include "util/time.h"
 
 static inline const char* ffFindFileName(const char* file)
 {
diff --git a/src/common/duration.c b/src/util/duration.c
similarity index 100%
rename from src/common/duration.c
rename to src/util/duration.c
diff --git a/src/common/duration.h b/src/util/duration.h
similarity index 86%
rename from src/common/duration.h
rename to src/util/duration.h
index 234a2c976..30733c946 100644
--- a/src/common/duration.h
+++ b/src/util/duration.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "fastfetch.h"
 
 void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result);
diff --git a/src/common/font.c b/src/util/font.c
similarity index 99%
rename from src/common/font.c
rename to src/util/font.c
index 599860bb7..e506f6376 100644
--- a/src/common/font.c
+++ b/src/util/font.c
@@ -2,7 +2,7 @@
 #include "util/FFlist.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
-#include "common/font.h"
+#include "util/font.h"
 
 #include <string.h>
 #include <ctype.h>
diff --git a/src/common/font.h b/src/util/font.h
similarity index 100%
rename from src/common/font.h
rename to src/util/font.h
diff --git a/src/common/format.c b/src/util/format.c
similarity index 99%
rename from src/common/format.c
rename to src/util/format.c
index 82baaa180..132ad32d9 100644
--- a/src/common/format.c
+++ b/src/util/format.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/format.h"
-#include "common/parsing.h"
+#include "util/format.h"
+#include "util/parsing.h"
 #include "util/textModifier.h"
 #include "util/stringUtils.h"
 
diff --git a/src/common/format.h b/src/util/format.h
similarity index 100%
rename from src/common/format.h
rename to src/util/format.h
diff --git a/src/common/frequency.c b/src/util/frequency.c
similarity index 100%
rename from src/common/frequency.c
rename to src/util/frequency.c
diff --git a/src/common/frequency.h b/src/util/frequency.h
similarity index 84%
rename from src/common/frequency.h
rename to src/util/frequency.h
index 53dacf803..7a3bdab02 100644
--- a/src/common/frequency.h
+++ b/src/util/frequency.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "fastfetch.h"
 
 bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result);
diff --git a/src/common/init.c b/src/util/init.c
similarity index 98%
rename from src/common/init.c
rename to src/util/init.c
index 0c0927d7d..e0f3f80be 100644
--- a/src/common/init.c
+++ b/src/util/init.c
@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "common/init.h"
-#include "common/parsing.h"
-#include "common/thread.h"
+#include "util/init.h"
+#include "util/parsing.h"
+#include "util/thread.h"
+#include "util/textModifier.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/terminaltheme/terminaltheme.h"
-#include "util/textModifier.h"
 #include "logo/logo.h"
 
 #include <stdlib.h>
diff --git a/src/common/init.h b/src/util/init.h
similarity index 100%
rename from src/common/init.h
rename to src/util/init.h
diff --git a/src/common/io/io.h b/src/util/io/io.h
similarity index 100%
rename from src/common/io/io.h
rename to src/util/io/io.h
diff --git a/src/common/io/io_unix.c b/src/util/io/io_unix.c
similarity index 99%
rename from src/common/io/io_unix.c
rename to src/util/io/io_unix.c
index a24c1aa65..3b6a9b27e 100644
--- a/src/common/io/io_unix.c
+++ b/src/util/io/io_unix.c
@@ -1,7 +1,7 @@
 #include "io.h"
 #include "fastfetch.h"
 #include "util/stringUtils.h"
-#include "common/time.h"
+#include "util/time.h"
 
 #include <fcntl.h>
 #include <termios.h>
diff --git a/src/common/io/io_windows.c b/src/util/io/io_windows.c
similarity index 100%
rename from src/common/io/io_windows.c
rename to src/util/io/io_windows.c
diff --git a/src/common/jsonconfig.c b/src/util/jsonconfig.c
similarity index 98%
rename from src/common/jsonconfig.c
rename to src/util/jsonconfig.c
index 208710628..c606fe0a3 100644
--- a/src/common/jsonconfig.c
+++ b/src/util/jsonconfig.c
@@ -1,12 +1,12 @@
 #include "fastfetch.h"
-#include "common/color.h"
-#include "common/jsonconfig.h"
-#include "common/printing.h"
-#include "common/io/io.h"
-#include "common/time.h"
+#include "util/color.h"
+#include "util/jsonconfig.h"
+#include "util/printing.h"
+#include "util/io/io.h"
+#include "util/time.h"
+#include "util/stringUtils.h"
 #include "detection/version/version.h"
 #include "modules/modules.h"
-#include "util/stringUtils.h"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/src/common/jsonconfig.h b/src/util/jsonconfig.h
similarity index 100%
rename from src/common/jsonconfig.h
rename to src/util/jsonconfig.h
diff --git a/src/util/kmod.c b/src/util/kmod.c
index f68b970bd..38e819f85 100644
--- a/src/util/kmod.c
+++ b/src/util/kmod.c
@@ -1,7 +1,7 @@
 #include "kmod.h"
 
 #if __linux__
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 bool ffKmodLoaded(const char* modName)
 {
diff --git a/src/common/library.c b/src/util/library.c
similarity index 98%
rename from src/common/library.c
rename to src/util/library.c
index 8a47a1039..1ff1c02c2 100644
--- a/src/common/library.c
+++ b/src/util/library.c
@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "common/library.h"
+#include "util/library.h"
 
 #ifndef FF_DISABLE_DLOPEN
 
diff --git a/src/common/library.h b/src/util/library.h
similarity index 100%
rename from src/common/library.h
rename to src/util/library.h
diff --git a/src/common/modules.c b/src/util/modules.c
similarity index 100%
rename from src/common/modules.c
rename to src/util/modules.c
diff --git a/src/common/netif/netif.c b/src/util/netif/netif.c
similarity index 100%
rename from src/common/netif/netif.c
rename to src/util/netif/netif.c
diff --git a/src/common/netif/netif.h b/src/util/netif/netif.h
similarity index 100%
rename from src/common/netif/netif.h
rename to src/util/netif/netif.h
diff --git a/src/common/netif/netif_apple.c b/src/util/netif/netif_apple.c
similarity index 99%
rename from src/common/netif/netif_apple.c
rename to src/util/netif/netif_apple.c
index c56533062..6452077ca 100644
--- a/src/common/netif/netif_apple.c
+++ b/src/util/netif/netif_apple.c
@@ -1,6 +1,6 @@
 #include "netif.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>
diff --git a/src/common/netif/netif_bsd.c b/src/util/netif/netif_bsd.c
similarity index 99%
rename from src/common/netif/netif_bsd.c
rename to src/util/netif/netif_bsd.c
index 90c788908..e53c53641 100644
--- a/src/common/netif/netif_bsd.c
+++ b/src/util/netif/netif_bsd.c
@@ -1,6 +1,6 @@
 #include "netif.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <net/if.h>
diff --git a/src/common/netif/netif_gnu.c b/src/util/netif/netif_gnu.c
similarity index 97%
rename from src/common/netif/netif_gnu.c
rename to src/util/netif/netif_gnu.c
index b829af9cd..a62a9a4a4 100644
--- a/src/common/netif/netif_gnu.c
+++ b/src/util/netif/netif_gnu.c
@@ -1,5 +1,5 @@
 #include "netif.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 
 #include <net/if.h>
 #include <stdio.h>
diff --git a/src/common/netif/netif_haiku.c b/src/util/netif/netif_haiku.c
similarity index 99%
rename from src/common/netif/netif_haiku.c
rename to src/util/netif/netif_haiku.c
index 06f8e90b6..d5c5906ae 100644
--- a/src/common/netif/netif_haiku.c
+++ b/src/util/netif/netif_haiku.c
@@ -1,5 +1,5 @@
 #include "netif.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <arpa/inet.h>
diff --git a/src/common/netif/netif_linux.c b/src/util/netif/netif_linux.c
similarity index 99%
rename from src/common/netif/netif_linux.c
rename to src/util/netif/netif_linux.c
index 7867d1a1e..3427bead0 100644
--- a/src/common/netif/netif_linux.c
+++ b/src/util/netif/netif_linux.c
@@ -1,5 +1,5 @@
 #include "netif.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/debug.h"
 
diff --git a/src/common/netif/netif_windows.c b/src/util/netif/netif_windows.c
similarity index 100%
rename from src/common/netif/netif_windows.c
rename to src/util/netif/netif_windows.c
diff --git a/src/common/networking/networking.h b/src/util/networking/networking.h
similarity index 97%
rename from src/common/networking/networking.h
rename to src/util/networking/networking.h
index 6662f3117..39cf41762 100644
--- a/src/common/networking/networking.h
+++ b/src/util/networking/networking.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/thread.h"
+#include "util/thread.h"
 #include "util/FFstrbuf.h"
 
 #ifdef _WIN32
diff --git a/src/common/networking/networking_common.c b/src/util/networking/networking_common.c
similarity index 99%
rename from src/common/networking/networking_common.c
rename to src/util/networking/networking_common.c
index a330dd5f7..aa6bd22e7 100644
--- a/src/common/networking/networking_common.c
+++ b/src/util/networking/networking_common.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/library.h"
-#include "common/networking/networking.h"
+#include "util/library.h"
+#include "util/networking/networking.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
 
diff --git a/src/common/networking/networking_linux.c b/src/util/networking/networking_linux.c
similarity index 99%
rename from src/common/networking/networking_linux.c
rename to src/util/networking/networking_linux.c
index caf19accc..068cfe3c5 100644
--- a/src/common/networking/networking_linux.c
+++ b/src/util/networking/networking_linux.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "common/networking/networking.h"
-#include "common/time.h"
-#include "common/library.h"
+#include "util/networking/networking.h"
+#include "util/time.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 #include "util/debug.h"
diff --git a/src/common/networking/networking_windows.c b/src/util/networking/networking_windows.c
similarity index 99%
rename from src/common/networking/networking_windows.c
rename to src/util/networking/networking_windows.c
index 5c45027aa..afd426618 100644
--- a/src/common/networking/networking_windows.c
+++ b/src/util/networking/networking_windows.c
@@ -3,7 +3,7 @@
 
 //Must be included after <mswsock.h>
 #include "fastfetch.h"
-#include "common/networking/networking.h"
+#include "util/networking/networking.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
 
diff --git a/src/common/option.c b/src/util/option.c
similarity index 99%
rename from src/common/option.c
rename to src/util/option.c
index 71a9a1d19..3a808986d 100644
--- a/src/common/option.c
+++ b/src/util/option.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/option.h"
-#include "common/color.h"
+#include "util/option.h"
+#include "util/color.h"
 #include "util/stringUtils.h"
 
 // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise
diff --git a/src/common/option.h b/src/util/option.h
similarity index 100%
rename from src/common/option.h
rename to src/util/option.h
diff --git a/src/common/parsing.c b/src/util/parsing.c
similarity index 99%
rename from src/common/parsing.c
rename to src/util/parsing.c
index 668a28773..fbd7f1208 100644
--- a/src/common/parsing.c
+++ b/src/util/parsing.c
@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "common/parsing.h"
+#include "util/parsing.h"
 
 #include <ctype.h>
 
diff --git a/src/common/parsing.h b/src/util/parsing.h
similarity index 100%
rename from src/common/parsing.h
rename to src/util/parsing.h
diff --git a/src/util/path.c b/src/util/path.c
index 6110edfd2..b6d6999e8 100644
--- a/src/util/path.c
+++ b/src/util/path.c
@@ -1,6 +1,6 @@
 #include "path.h"
 
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 
 #if !_WIN32
diff --git a/src/common/percent.c b/src/util/percent.c
similarity index 99%
rename from src/common/percent.c
rename to src/util/percent.c
index ea41596d8..7f7d5e222 100644
--- a/src/common/percent.c
+++ b/src/util/percent.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "common/percent.h"
-#include "common/color.h"
-#include "common/option.h"
-#include "common/jsonconfig.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"
 
diff --git a/src/common/percent.h b/src/util/percent.h
similarity index 96%
rename from src/common/percent.h
rename to src/util/percent.h
index a8bb18e33..028d64404 100644
--- a/src/common/percent.h
+++ b/src/util/percent.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "util/FFstrbuf.h"
-#include "common/parsing.h"
-#include "common/option.h"
+#include "util/parsing.h"
+#include "util/option.h"
 
 typedef enum __attribute__((__packed__)) FFPercentageTypeFlags
 {
diff --git a/src/util/platform/FFPlatform.c b/src/util/platform/FFPlatform.c
index 5b0f554e0..9195e6ea4 100644
--- a/src/util/platform/FFPlatform.c
+++ b/src/util/platform/FFPlatform.c
@@ -1,6 +1,6 @@
 #include "FFPlatform_private.h"
 #include "util/stringUtils.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "detection/version/version.h"
 
 void ffPlatformInit(FFPlatform* platform)
diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/platform/FFPlatform_unix.c
index 5badc958b..464077f52 100644
--- a/src/util/platform/FFPlatform_unix.c
+++ b/src/util/platform/FFPlatform_unix.c
@@ -1,8 +1,8 @@
 #include "FFPlatform_private.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
+#include "util/io/io.h"
 #include "fastfetch_config.h"
-#include "common/io/io.h"
 
 #include <unistd.h>
 #include <pwd.h>
diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/platform/FFPlatform_windows.c
index a916de4fe..26491031e 100644
--- a/src/util/platform/FFPlatform_windows.c
+++ b/src/util/platform/FFPlatform_windows.c
@@ -1,6 +1,6 @@
 #include "FFPlatform_private.h"
-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 #include "util/windows/unicode.h"
 #include "util/windows/registry.h"
diff --git a/src/common/printing.c b/src/util/printing.c
similarity index 99%
rename from src/common/printing.c
rename to src/util/printing.c
index f92677b0a..a3e0595eb 100644
--- a/src/common/printing.c
+++ b/src/util/printing.c
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "common/printing.h"
-#include "logo/logo.h"
+#include "util/printing.h"
 #include "util/textModifier.h"
+#include "logo/logo.h"
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)
 {
diff --git a/src/common/printing.h b/src/util/printing.h
similarity index 97%
rename from src/common/printing.h
rename to src/util/printing.h
index 1ee79d540..cd6e4e4ae 100644
--- a/src/common/printing.h
+++ b/src/util/printing.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "common/format.h"
+#include "util/format.h"
 
 typedef enum __attribute__((__packed__)) FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,
diff --git a/src/common/processing.h b/src/util/processing.h
similarity index 100%
rename from src/common/processing.h
rename to src/util/processing.h
diff --git a/src/common/processing_linux.c b/src/util/processing_linux.c
similarity index 99%
rename from src/common/processing_linux.c
rename to src/util/processing_linux.c
index 73f72a5a9..ae8fcccb5 100644
--- a/src/common/processing_linux.c
+++ b/src/util/processing_linux.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/processing.h"
-#include "common/io/io.h"
+#include "util/processing.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
diff --git a/src/common/processing_windows.c b/src/util/processing_windows.c
similarity index 99%
rename from src/common/processing_windows.c
rename to src/util/processing_windows.c
index 51042a625..e0bf519f4 100644
--- a/src/common/processing_windows.c
+++ b/src/util/processing_windows.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/processing.h"
-#include "common/io/io.h"
+#include "util/processing.h"
+#include "util/io/io.h"
 
 #include <windows.h>
 #include <ntstatus.h>
diff --git a/src/common/properties.c b/src/util/properties.c
similarity index 98%
rename from src/common/properties.c
rename to src/util/properties.c
index 746727d9c..dd224a574 100644
--- a/src/common/properties.c
+++ b/src/util/properties.c
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/properties.h"
-#include "common/io/io.h"
+#include "util/properties.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 
 #include <stdlib.h>
diff --git a/src/common/properties.h b/src/util/properties.h
similarity index 100%
rename from src/common/properties.h
rename to src/util/properties.h
diff --git a/src/common/settings.c b/src/util/settings.c
similarity index 99%
rename from src/common/settings.c
rename to src/util/settings.c
index 1bdae2e60..6fcb6f25b 100644
--- a/src/common/settings.c
+++ b/src/util/settings.c
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "common/settings.h"
-#include "common/library.h"
-#include "common/thread.h"
-#include "common/io/io.h"
+#include "util/settings.h"
+#include "util/library.h"
+#include "util/thread.h"
+#include "util/io/io.h"
 
 #include <string.h>
 
@@ -197,7 +197,7 @@ FFvariant ffSettingsGetGnome(const char* dconfKey, const char* gsettingsSchemaNa
 }
 
 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
+#include "util/dbus.h"
 
 FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
 {
diff --git a/src/common/settings.h b/src/util/settings.h
similarity index 100%
rename from src/common/settings.h
rename to src/util/settings.h
diff --git a/src/common/size.c b/src/util/size.c
similarity index 100%
rename from src/common/size.c
rename to src/util/size.c
diff --git a/src/common/size.h b/src/util/size.h
similarity index 85%
rename from src/common/size.h
rename to src/util/size.h
index f234d5ae0..7f1da020c 100644
--- a/src/common/size.h
+++ b/src/util/size.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "fastfetch.h"
 
 void ffSizeAppendNum(uint64_t bytes, FFstrbuf* result);
diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c
index cb1c751a5..848484af3 100644
--- a/src/util/smbiosHelper.c
+++ b/src/util/smbiosHelper.c
@@ -1,5 +1,5 @@
 #include "smbiosHelper.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/unused.h"
 #include "util/mallocHelper.h"
 #include "util/debug.h"
@@ -60,14 +60,14 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header)
 #include <stddef.h>
 
 #ifdef __linux__
-    #include "common/properties.h"
+    #include "util/properties.h"
 #elif defined(__FreeBSD__)
-    #include "common/settings.h"
+    #include "util/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 "common/sysctl.h"
+    #include "util/sysctl.h"
     #define loff_t off_t
 #endif
 
diff --git a/src/common/sysctl.c b/src/util/sysctl.c
similarity index 100%
rename from src/common/sysctl.c
rename to src/util/sysctl.c
diff --git a/src/common/sysctl.h b/src/util/sysctl.h
similarity index 100%
rename from src/common/sysctl.h
rename to src/util/sysctl.h
diff --git a/src/common/temps.c b/src/util/temps.c
similarity index 99%
rename from src/common/temps.c
rename to src/util/temps.c
index d524a79a1..dd237a649 100644
--- a/src/common/temps.c
+++ b/src/util/temps.c
@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "common/temps.h"
+#include "util/temps.h"
 #include "util/textModifier.h"
 #include "util/stringUtils.h"
 
diff --git a/src/common/temps.h b/src/util/temps.h
similarity index 89%
rename from src/common/temps.h
rename to src/util/temps.h
index f2f8eda89..1a4cecc7d 100644
--- a/src/common/temps.h
+++ b/src/util/temps.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "common/parsing.h"
-#include "common/option.h"
+#include "util/parsing.h"
+#include "util/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/common/thread.h b/src/util/thread.h
similarity index 100%
rename from src/common/thread.h
rename to src/util/thread.h
diff --git a/src/common/time.c b/src/util/time.c
similarity index 100%
rename from src/common/time.c
rename to src/util/time.c
diff --git a/src/common/time.h b/src/util/time.h
similarity index 100%
rename from src/common/time.h
rename to src/util/time.h
diff --git a/tests/color.c b/tests/color.c
index 596f2f473..430317bb9 100644
--- a/tests/color.c
+++ b/tests/color.c
@@ -1,4 +1,4 @@
-#include "common/format.h"
+#include "util/format.h"
 #include "util/textModifier.h"
 #include "fastfetch.h"
 
diff --git a/tests/duration.c b/tests/duration.c
index 283b31801..24b3c5fe5 100644
--- a/tests/duration.c
+++ b/tests/duration.c
@@ -1,4 +1,4 @@
-#include "common/duration.h"
+#include "util/duration.h"
 #include "util/textModifier.h"
 #include "fastfetch.h"
 
diff --git a/tests/format.c b/tests/format.c
index 0e94cec87..df0b58b4e 100644
--- a/tests/format.c
+++ b/tests/format.c
@@ -1,4 +1,4 @@
-#include "common/format.h"
+#include "util/format.h"
 #include "util/textModifier.h"
 #include "fastfetch.h"