Refactor: renames src/util to src/common

CMakeLists.txt

@@ -342,7 +342,7 @@ fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE)
 configure_file(src/fastfetch_config.h.in fastfetch_config.h @ONLY)
 configure_file(src/fastfetch_datatext.h.in fastfetch_datatext.h @ONLY)
 if(APPLE)
-    configure_file(src/util/impl/apple/Info.plist.in Info.plist @ONLY)
+    configure_file(src/common/impl/apple/Info.plist.in Info.plist @ONLY)
 endif()
 
 ####################
@@ -364,6 +364,33 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}")
 #######################
 
 set(LIBFASTFETCH_SRC
+    src/common/impl/commandoption.c
+    src/common/impl/duration.c
+    src/common/impl/font.c
+    src/common/impl/format.c
+    src/common/impl/frequency.c
+    src/common/impl/init.c
+    src/common/impl/jsonconfig.c
+    src/common/impl/library.c
+    src/common/impl/netif.c
+    src/common/impl/networking_common.c
+    src/common/impl/option.c
+    src/common/impl/parsing.c
+    src/common/impl/percent.c
+    src/common/impl/printing.c
+    src/common/impl/properties.c
+    src/common/impl/settings.c
+    src/common/impl/size.c
+    src/common/impl/temps.c
+    src/common/impl/time.c
+    src/common/impl/edidHelper.c
+    src/common/impl/base64.c
+    src/common/impl/FFlist.c
+    src/common/impl/FFstrbuf.c
+    src/common/impl/kmod.c
+    src/common/impl/path.c
+    src/common/impl/FFPlatform.c
+    src/common/impl/smbiosHelper.c
     src/detection/bluetoothradio/bluetoothradio.c
     src/detection/bootmgr/bootmgr.c
     src/detection/chassis/chassis.c
@@ -473,37 +500,17 @@ set(LIBFASTFETCH_SRC
     src/options/display.c
     src/options/logo.c
     src/options/general.c
-    src/util/impl/commandoption.c
-    src/util/impl/duration.c
-    src/util/impl/font.c
-    src/util/impl/format.c
-    src/util/impl/frequency.c
-    src/util/impl/init.c
-    src/util/impl/jsonconfig.c
-    src/util/impl/library.c
-    src/util/impl/netif.c
-    src/util/impl/networking_common.c
-    src/util/impl/option.c
-    src/util/impl/parsing.c
-    src/util/impl/percent.c
-    src/util/impl/printing.c
-    src/util/impl/properties.c
-    src/util/impl/settings.c
-    src/util/impl/size.c
-    src/util/impl/temps.c
-    src/util/impl/time.c
-    src/util/impl/edidHelper.c
-    src/util/impl/base64.c
-    src/util/impl/FFlist.c
-    src/util/impl/FFstrbuf.c
-    src/util/impl/kmod.c
-    src/util/impl/path.c
-    src/util/impl/FFPlatform.c
-    src/util/impl/smbiosHelper.c
 )
 
 if(LINUX)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_linux.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_linux.c
         src/detection/bios/bios_linux.c
         src/detection/board/board_linux.c
@@ -578,16 +585,16 @@ if(LINUX)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_linux.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_linux.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_android.c
         src/detection/bios/bios_android.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -651,16 +658,17 @@ elseif(ANDROID)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_android.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_linux.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(FreeBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_bsd.c
         src/detection/bios/bios_bsd.c
         src/detection/bluetoothradio/bluetoothradio_nosupport.c
@@ -732,14 +740,6 @@ elseif(FreeBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
     if(DragonFly)
         list(APPEND LIBFASTFETCH_SRC
@@ -754,6 +754,14 @@ elseif(FreeBSD)
     endif()
 elseif(NetBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nbsd.c
         src/detection/bios/bios_nbsd.c
         src/detection/bluetooth/bluetooth_bsd.c
@@ -825,17 +833,18 @@ elseif(NetBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(OpenBSD)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_bsd.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
+        src/common/impl/smbiosHelper.c
         src/detection/battery/battery_obsd.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_nosupport.c
@@ -907,18 +916,19 @@ elseif(OpenBSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_bsd.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
-        src/util/impl/smbiosHelper.c
     )
 elseif(APPLE)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/io_unix.c
+        src/common/impl/netif_apple.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/sysctl.c
+        src/common/impl/apple/cf_helpers.c
+        src/common/impl/apple/osascript.m
+        src/common/impl/apple/smc_temps.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_apple.c
         src/detection/battery/battery_apple.c
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
@@ -977,19 +987,22 @@ elseif(APPLE)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_apple.m
         src/detection/camera/camera_apple.m
-        src/util/impl/io_unix.c
-        src/util/impl/netif_apple.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/sysctl.c
-        src/util/impl/apple/cf_helpers.c
-        src/util/impl/apple/osascript.m
-        src/util/impl/apple/smc_temps.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_apple.c
     )
 elseif(WIN32)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/io_windows.c
+        src/common/impl/netif_windows.c
+        src/common/impl/networking_windows.c
+        src/common/impl/processing_windows.c
+        src/common/impl/windows/getline.c
+        src/common/impl/windows/com.cpp
+        src/common/impl/windows/registry.c
+        src/common/impl/windows/unicode.c
+        src/common/impl/windows/wmi.cpp
+        src/common/impl/windows/version.c
+        src/common/impl/FFPlatform_windows.c
+        src/common/impl/binary_windows.c
+        src/common/impl/debug_windows.c
         src/detection/battery/battery_windows.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
@@ -1047,22 +1060,16 @@ elseif(WIN32)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_windows.c
         src/detection/camera/camera_windows.cpp
-        src/util/impl/io_windows.c
-        src/util/impl/netif_windows.c
-        src/util/impl/networking_windows.c
-        src/util/impl/processing_windows.c
-        src/util/impl/windows/getline.c
-        src/util/impl/windows/com.cpp
-        src/util/impl/windows/registry.c
-        src/util/impl/windows/unicode.c
-        src/util/impl/windows/wmi.cpp
-        src/util/impl/windows/version.c
-        src/util/impl/FFPlatform_windows.c
-        src/util/impl/binary_windows.c
-        src/util/impl/debug_windows.c
     )
 elseif(SunOS)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_apple.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1134,16 +1141,17 @@ elseif(SunOS)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_apple.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
     )
 elseif(Haiku)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_haiku.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
+        src/common/impl/haiku/version.cpp
         src/detection/battery/battery_haiku.c
         src/detection/bios/bios_windows.c
         src/detection/board/board_windows.c
@@ -1202,17 +1210,16 @@ elseif(Haiku)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_nosupport.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_haiku.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
-        src/util/impl/haiku/version.cpp
     )
 elseif(GNU)
     list(APPEND LIBFASTFETCH_SRC
+        src/common/impl/dbus.c
+        src/common/impl/io_unix.c
+        src/common/impl/netif_gnu.c
+        src/common/impl/networking_linux.c
+        src/common/impl/processing_linux.c
+        src/common/impl/FFPlatform_unix.c
+        src/common/impl/binary_linux.c
         src/detection/battery/battery_nosupport.c
         src/detection/bios/bios_nosupport.c
         src/detection/board/board_nosupport.c
@@ -1281,13 +1288,6 @@ elseif(GNU)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
-        src/util/impl/dbus.c
-        src/util/impl/io_unix.c
-        src/util/impl/netif_gnu.c
-        src/util/impl/networking_linux.c
-        src/util/impl/processing_linux.c
-        src/util/impl/FFPlatform_unix.c
-        src/util/impl/binary_linux.c
    )
 endif()
 
@@ -1308,7 +1308,7 @@ endif()
 include(CheckFunctionExists)
 check_function_exists(wcwidth HAVE_WCWIDTH)
 if(NOT HAVE_WCWIDTH)
-    list(APPEND LIBFASTFETCH_SRC src/util/impl/wcwidth.c)
+    list(APPEND LIBFASTFETCH_SRC src/common/impl/wcwidth.c)
 endif()
 if(NOT WIN32)
     check_function_exists(pipe2 HAVE_PIPE2)
@@ -1881,7 +1881,7 @@ set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
 
 if(WIN32)
     target_sources(fastfetch
-        PRIVATE src/util/impl/windows/version.rc
+        PRIVATE src/common/impl/windows/version.rc
     )
 elseif(APPLE)
     target_link_options(fastfetch
@@ -1909,7 +1909,7 @@ if (BUILD_FLASHFETCH)
 
     if(WIN32)
         target_sources(flashfetch
-            PRIVATE src/util/impl/windows/version.rc
+            PRIVATE src/common/impl/windows/version.rc
         )
     elseif(APPLE)
         target_link_options(flashfetch

src/common/FFPlatform.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 typedef struct FFPlatformSysinfo
 {

src/common/apple/smc_temps.c

@@ -1,6 +1,6 @@
 #include "smc_temps.h"
-#include "util/apple/cf_helpers.h"
-#include "util/stringUtils.h"
+#include "common/apple/cf_helpers.h"
+#include "common/stringUtils.h"
 
 #include <stdint.h>
 #include <math.h>

src/common/dbus.h

@@ -3,8 +3,8 @@
 #ifdef FF_HAVE_DBUS
 #include <dbus/dbus.h>
 
-#include "util/FFstrbuf.h"
-#include "util/library.h"
+#include "common/FFstrbuf.h"
+#include "common/library.h"
 
 typedef struct FFDBusLibrary
 {

src/common/debug.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/time.h"
+#include "common/time.h"
 
 static inline const char* ffFindFileName(const char* file)
 {

src/common/edidHelper.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 void ffEdidGetVendorAndModel(const uint8_t edid[128], FFstrbuf* result);
 bool ffEdidGetName(const uint8_t edid[128], FFstrbuf* name);

src/common/font.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 typedef struct FFfont
 {

src/common/format.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 typedef enum __attribute__((__packed__)) FFformatArgType
 {

src/common/haiku/version.h

@@ -1,3 +1,3 @@
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 bool ffGetFileVersion(const char* filePath, FFstrbuf* version);

src/common/impl/FFPlatform.c

@@ -1,6 +1,6 @@
 #include "FFPlatform_private.h"
-#include "util/stringUtils.h"
-#include "util/io.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "detection/version/version.h"
 
 void ffPlatformInit(FFPlatform* platform)

src/common/impl/FFPlatform_private.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFPlatform.h"
+#include "common/FFPlatform.h"
 
 void ffPlatformInitImpl(FFPlatform* platform);
 

src/common/impl/FFPlatform_unix.c

@@ -1,7 +1,7 @@
 #include "FFPlatform_private.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
-#include "util/io.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "fastfetch_config.h"
 
 #include <unistd.h>

src/common/impl/FFPlatform_windows.c

@@ -1,10 +1,10 @@
 #include "FFPlatform_private.h"
-#include "util/io.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/windows/unicode.h"
-#include "util/windows/registry.h"
-#include "util/windows/nt.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/windows/nt.h"
 
 #include <windows.h>
 #include <shlobj.h>

src/common/impl/FFlist.c

@@ -1,4 +1,4 @@
-#include "util/FFlist.h"
+#include "common/FFlist.h"
 
 #include <stdlib.h>
 #include <string.h>

src/common/impl/FFstrbuf.c

@@ -1,5 +1,5 @@
-#include "util/FFstrbuf.h"
-#include "util/mallocHelper.h"
+#include "common/FFstrbuf.h"
+#include "common/mallocHelper.h"
 
 #include <ctype.h>
 #include <inttypes.h>

src/common/impl/base64.c

@@ -1,4 +1,4 @@
-#include "util/base64.h"
+#include "common/base64.h"
 
 // https://github.com/kostya/benchmarks/blob/master/base64/test-nolib.c#L145
 void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output)

src/common/impl/binary_apple.c

@@ -1,7 +1,7 @@
-#include "util/binary.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <string.h>

src/common/impl/binary_linux.c

@@ -1,10 +1,10 @@
-#include "util/binary.h"
+#include "common/binary.h"
 
 #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__)
 
-#include "util/io.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
 
 #include <libelf.h> // #1254
 #include <fcntl.h>

src/common/impl/binary_windows.c

@@ -1,7 +1,7 @@
-#include "util/binary.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <windows.h>
 #include <imagehlp.h>

src/common/impl/commandoption.c

@@ -1,9 +1,9 @@
-#include "util/commandoption.h"
-#include "util/color.h"
-#include "util/printing.h"
-#include "util/time.h"
-#include "util/jsonconfig.h"
-#include "util/stringUtils.h"
+#include "common/commandoption.h"
+#include "common/color.h"
+#include "common/printing.h"
+#include "common/time.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.h"
 #include "fastfetch_datatext.h"
 #include "modules/modules.h"
 

src/common/impl/dbus.c

@@ -1,9 +1,9 @@
-#include "util/dbus.h"
+#include "common/dbus.h"
 
 #ifdef FF_HAVE_DBUS
 
-#include "util/thread.h"
-#include "util/stringUtils.h"
+#include "common/thread.h"
+#include "common/stringUtils.h"
 
 static bool loadLibSymbols(FFDBusLibrary* lib)
 {

src/common/impl/debug_windows.c

@@ -1,4 +1,4 @@
-#include "util/debug.h"
+#include "common/debug.h"
 
 #include <windows.h>
 

src/common/impl/duration.c

@@ -1,4 +1,4 @@
-#include "util/duration.h"
+#include "common/duration.h"
 
 void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result)
 {

src/common/impl/edidHelper.c

@@ -1,4 +1,4 @@
-#include "util/edidHelper.h"
+#include "common/edidHelper.h"
 
 void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint32_t* height)
 {

src/common/impl/font.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/FFlist.h"
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
-#include "util/font.h"
+#include "common/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
+#include "common/font.h"
 
 #include <string.h>
 #include <ctype.h>

src/common/impl/format.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/format.h"
-#include "util/parsing.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/format.h"
+#include "common/parsing.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 #include <inttypes.h>
 

src/common/impl/frequency.c

@@ -1,4 +1,4 @@
-#include "util/frequency.h"
+#include "common/frequency.h"
 
 bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result)
 {

src/common/impl/init.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/init.h"
-#include "util/parsing.h"
-#include "util/thread.h"
-#include "util/textModifier.h"
+#include "common/init.h"
+#include "common/parsing.h"
+#include "common/thread.h"
+#include "common/textModifier.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/terminaltheme/terminaltheme.h"
 #include "logo/logo.h"
@@ -12,7 +12,7 @@
 #include <locale.h>
 #ifdef _WIN32
     #include <windows.h>
-    #include "util/windows/unicode.h"
+    #include "common/windows/unicode.h"
 #else
     #include <signal.h>
 #endif

src/common/impl/io_unix.c

@@ -1,7 +1,7 @@
-#include "util/io.h"
+#include "common/io.h"
 #include "fastfetch.h"
-#include "util/stringUtils.h"
-#include "util/time.h"
+#include "common/stringUtils.h"
+#include "common/time.h"
 
 #include <fcntl.h>
 #include <termios.h>

src/common/impl/io_windows.c

@@ -1,9 +1,9 @@
-#include "util/io.h"
+#include "common/io.h"
 #include "fastfetch.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <windows.h>
-#include "util/windows/nt.h"
+#include "common/windows/nt.h"
 #include <ntstatus.h>
 
 static void createSubfolders(const char* fileName)

src/common/impl/jsonconfig.c

@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/color.h"
-#include "util/jsonconfig.h"
-#include "util/printing.h"
-#include "util/io.h"
-#include "util/time.h"
-#include "util/stringUtils.h"
+#include "common/color.h"
+#include "common/jsonconfig.h"
+#include "common/printing.h"
+#include "common/io.h"
+#include "common/time.h"
+#include "common/stringUtils.h"
 #include "detection/version/version.h"
 #include "modules/modules.h"
 

src/common/impl/kmod.c

@@ -1,7 +1,7 @@
-#include "util/kmod.h"
+#include "common/kmod.h"
 
 #if __linux__
-#include "util/io.h"
+#include "common/io.h"
 
 bool ffKmodLoaded(const char* modName)
 {
@@ -32,7 +32,7 @@ bool ffKmodLoaded(const char* modName)
     return modfind(modName) >= 0;
 }
 #elif __NetBSD__
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"
 
 #include <sys/module.h>
 #include <sys/param.h>
@@ -75,7 +75,7 @@ bool ffKmodLoaded(const char* modName)
     return false;
 }
 #elif __APPLE__
-#include "util/apple/cf_helpers.h"
+#include "common/apple/cf_helpers.h"
 #include <IOKit/kext/KextManager.h>
 #include <CoreFoundation/CoreFoundation.h>
 

src/common/impl/library.c

@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "util/library.h"
+#include "common/library.h"
 
 #ifndef FF_DISABLE_DLOPEN
 

src/common/impl/netif.c

@@ -1,4 +1,4 @@
-#include "util/netif.h"
+#include "common/netif.h"
 
 #ifndef _WIN32
     #include <net/if.h>

src/common/impl/netif_apple.c

@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_dl.h>

src/common/impl/netif_bsd.c

@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <net/if.h>
 #include <net/if_dl.h>

src/common/impl/netif_gnu.c

@@ -1,5 +1,5 @@
-#include "util/netif.h"
-#include "util/io.h"
+#include "common/netif.h"
+#include "common/io.h"
 
 #include <net/if.h>
 #include <stdio.h>

src/common/impl/netif_haiku.c

@@ -1,6 +1,6 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <arpa/inet.h>
 #include <net/if.h>

src/common/impl/netif_linux.c

@@ -1,7 +1,7 @@
-#include "util/netif.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/netif.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>

src/common/impl/netif_windows.c

@@ -1,5 +1,5 @@
-#include "util/netif.h"
-#include "util/mallocHelper.h"
+#include "common/netif.h"
+#include "common/mallocHelper.h"
 
 #include <ws2tcpip.h> // AF_INET6, IN6_IS_ADDR_UNSPECIFIED
 #include <iphlpapi.h>

src/common/impl/networking_common.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/library.h"
-#include "util/networking.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/library.h"
+#include "common/networking.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 #ifdef FF_HAVE_ZLIB
 #include <zlib.h>

src/common/impl/networking_linux.c

@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/networking.h"
-#include "util/time.h"
-#include "util/library.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/networking.h"
+#include "common/time.h"
+#include "common/library.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 #include <unistd.h>
 #include <poll.h>

src/common/impl/networking_windows.c

@@ -3,9 +3,9 @@
 
 //Must be included after <mswsock.h>
 #include "fastfetch.h"
-#include "util/networking.h"
-#include "util/stringUtils.h"
-#include "util/debug.h"
+#include "common/networking.h"
+#include "common/stringUtils.h"
+#include "common/debug.h"
 
 static LPFN_CONNECTEX ConnectEx;
 

src/common/impl/option.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/option.h"
-#include "util/color.h"
-#include "util/stringUtils.h"
+#include "common/option.h"
+#include "common/color.h"
+#include "common/stringUtils.h"
 
 // Return start position of the inner key if the argument key belongs to the module specified, NULL otherwise
 const char* ffOptionTestPrefix(const char* argumentKey, const char* moduleName)

src/common/impl/parsing.c

@@ -1,5 +1,5 @@
 #include "fastfetch.h"
-#include "util/parsing.h"
+#include "common/parsing.h"
 
 #include <ctype.h>
 

src/common/impl/path.c

@@ -1,6 +1,6 @@
-#include "util/path.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
+#include "common/path.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
 
 #if !_WIN32
 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result)

src/common/impl/percent.c

@@ -1,10 +1,10 @@
 #include "fastfetch.h"
-#include "util/percent.h"
-#include "util/color.h"
-#include "util/option.h"
-#include "util/jsonconfig.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/percent.h"
+#include "common/color.h"
+#include "common/option.h"
+#include "common/jsonconfig.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 static void appendOutputColor(FFstrbuf* buffer, const FFModuleArgs* module)
 {

src/common/impl/printing.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/printing.h"
-#include "util/textModifier.h"
+#include "common/printing.h"
+#include "common/textModifier.h"
 #include "logo/logo.h"
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType)

src/common/impl/processing_linux.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/processing.h"
-#include "util/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/processing.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/common/impl/processing_windows.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "util/processing.h"
-#include "util/io.h"
+#include "common/processing.h"
+#include "common/io.h"
 
 #include <windows.h>
 #include <ntstatus.h>

src/common/impl/properties.c

@@ -1,12 +1,12 @@
 #include "fastfetch.h"
-#include "util/properties.h"
-#include "util/io.h"
-#include "util/mallocHelper.h"
+#include "common/properties.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
 
 #include <stdlib.h>
 #include <ctype.h>
 #ifdef _WIN32
-    #include "util/windows/getline.h"
+    #include "common/windows/getline.h"
 #endif
 
 bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)

src/common/impl/settings.c

@@ -1,8 +1,8 @@
 #include "fastfetch.h"
-#include "util/settings.h"
-#include "util/library.h"
-#include "util/thread.h"
-#include "util/io.h"
+#include "common/settings.h"
+#include "common/library.h"
+#include "common/thread.h"
+#include "common/io.h"
 
 #include <string.h>
 
@@ -197,7 +197,7 @@ FFvariant ffSettingsGetGnome(const char* dconfKey, const char* gsettingsSchemaNa
 }
 
 #ifdef FF_HAVE_DBUS
-#include "util/dbus.h"
+#include "common/dbus.h"
 
 FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
 {

src/common/impl/size.c

@@ -1,4 +1,4 @@
-#include "util/size.h"
+#include "common/size.h"
 
 #include <inttypes.h>
 

src/common/impl/smbiosHelper.c

@@ -1,8 +1,8 @@
-#include "util/smbiosHelper.h"
-#include "util/io.h"
-#include "util/unused.h"
-#include "util/mallocHelper.h"
-#include "util/debug.h"
+#include "common/smbiosHelper.h"
+#include "common/io.h"
+#include "common/unused.h"
+#include "common/mallocHelper.h"
+#include "common/debug.h"
 
 bool ffIsSmbiosValueSet(FFstrbuf* value)
 {
@@ -60,14 +60,14 @@ const FFSmbiosHeader* ffSmbiosNextEntry(const FFSmbiosHeader* header)
 #include <stddef.h>
 
 #ifdef __linux__
-    #include "util/properties.h"
+    #include "common/properties.h"
 #elif defined(__FreeBSD__)
-    #include "util/settings.h"
+    #include "common/settings.h"
     #define loff_t off_t // FreeBSD doesn't have loff_t
 #elif defined(__sun)
     #define loff_t off_t
 #elif defined(__NetBSD__)
-    #include "util/sysctl.h"
+    #include "common/sysctl.h"
     #define loff_t off_t
 #endif
 

src/common/impl/sysctl.c

@@ -1,4 +1,4 @@
-#include "util/sysctl.h"
+#include "common/sysctl.h"
 
 #include <stdlib.h>
 

src/common/impl/temps.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
-#include "util/temps.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
+#include "common/temps.h"
+#include "common/textModifier.h"
+#include "common/stringUtils.h"
 
 void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module)
 {

src/common/impl/time.c

@@ -1,4 +1,4 @@
-#include "util/time.h"
+#include "common/time.h"
 
 #include <stdio.h>
 

src/common/io.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"
 
 #ifdef _WIN32
     #include <fileapi.h>

src/common/library.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/FFcheckmacros.h"
+#include "common/FFcheckmacros.h"
 
 #ifndef FF_DISABLE_DLOPEN
 

src/common/networking.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/thread.h"
-#include "util/FFstrbuf.h"
+#include "common/thread.h"
+#include "common/FFstrbuf.h"
 
 #ifdef _WIN32
     #include <minwindef.h>

src/common/option.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 struct yyjson_val;
 struct yyjson_mut_doc;

src/common/parsing.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 #include <stdint.h>
 

src/common/path.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/stringUtils.h"
+#include "common/FFstrbuf.h"
+#include "common/stringUtils.h"
 
 const char* ffFindExecutableInPath(const char* name, FFstrbuf* result);
 static inline bool ffIsAbsolutePath(const char* path)

src/common/percent.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
-#include "util/parsing.h"
-#include "util/option.h"
+#include "common/FFstrbuf.h"
+#include "common/parsing.h"
+#include "common/option.h"
 
 typedef enum __attribute__((__packed__)) FFPercentageTypeFlags
 {

src/common/printing.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/format.h"
+#include "common/format.h"
 
 typedef enum __attribute__((__packed__)) FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,

src/common/processing.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 #ifndef _WIN32
 #include <sys/types.h> // pid_t

src/common/smbiosHelper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"
 
 bool ffIsSmbiosValueSet(FFstrbuf* value);
 static inline void ffCleanUpSmbiosValue(FFstrbuf* value)

src/common/sysctl.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "fastfetch.h"
-#include "util/FFcheckmacros.h"
+#include "common/FFcheckmacros.h"
 
 #include <sys/types.h>
 #include <sys/sysctl.h>

src/common/temps.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "util/parsing.h"
-#include "util/option.h"
+#include "common/parsing.h"
+#include "common/option.h"
 
 void ffTempsAppendNum(double celsius, FFstrbuf* buffer, FFColorRangeConfig config, const FFModuleArgs* module);
 bool ffTempsParseCommandOptions(const char* key, const char* subkey, const char* value, bool* useTemp, FFColorRangeConfig* config);

src/common/time.h

@@ -10,7 +10,7 @@
     #include <OS.h>
 #endif
 
-#include "util/arrayUtils.h"
+#include "common/arrayUtils.h"
 
 static inline double ffTimeGetTick(void) //In msec
 {