diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 9edd12a34..eafe424ef 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -57,3 +57,8 @@ cbebe447078e28c50957d568303f42d6b8aae126
 # Includes changes to functionality so it can't be ignored:
 # color parsing, text alignment, output registration
 # 6adf6b9dd4d368640bf7ef57f3e6199d83154d78
+
+### Move sources into appropriate subdirectories (#2119)
+# Performed no changes to the source files, only moved them.
+# Child commit addressed the issues caused by the move.
+c3ff1a76430be5f53f688eec95fdc7274cd1a6d4
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 486b877d6..172f0784f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,80 +66,80 @@ set(conky_sources
   ${conky_sources}
   c++wrap.cc
   c++wrap.hh
-  colour-settings.cc
-  colour-settings.h
-  colours.cc
-  colours.h
-  combine.cc
-  combine.h
+  lua/colour-settings.cc
+  lua/colour-settings.hh
+  content/colours.cc
+  content/colours.hh
+  content/combine.cc
+  content/combine.h
   common.cc
   common.h
   conky.cc
   conky.h
   core.cc
   core.h
-  cpu.cc
-  cpu.h
-  diskio.cc
-  diskio.h
-  entropy.cc
-  entropy.h
-  exec.cc
-  exec.h
-  fs.cc
-  fs.h
-  gradient.cc
-  gradient.h
-  mail.cc
-  mail.h
-  misc.cc
-  misc.h
-  net_stat.cc
-  net_stat.h
-  template.cc
-  template.h
-  mboxscan.cc
-  mboxscan.h
-  read_tcpip.cc
-  read_tcpip.h
-  scroll.cc
-  scroll.h
-  specials.cc
-  specials.h
-  tailhead.cc
-  tailhead.h
-  temphelper.cc
-  temphelper.h
-  text_object.cc
-  text_object.h
-  timeinfo.cc
-  timeinfo.h
-  top.cc
-  top.h
-  algebra.cc
-  algebra.h
+  data/hardware/cpu.cc
+  data/hardware/cpu.h
+  data/hardware/diskio.cc
+  data/hardware/diskio.h
+  data/entropy.cc
+  data/entropy.h
+  data/exec.cc
+  data/exec.h
+  data/fs.cc
+  data/fs.h
+  content/gradient.cc
+  content/gradient.hh
+  data/network/mail.cc
+  data/network/mail.h
+  data/misc.cc
+  data/misc.h
+  data/network/net_stat.cc
+  data/network/net_stat.h
+  content/template.cc
+  content/template.h
+  data/network/mboxscan.cc
+  data/network/mboxscan.h
+  data/network/read_tcpip.cc
+  data/network/read_tcpip.h
+  content/scroll.cc
+  content/scroll.h
+  content/specials.cc
+  content/specials.h
+  data/tailhead.cc
+  data/tailhead.h
+  content/temphelper.cc
+  content/temphelper.h
+  content/text_object.cc
+  content/text_object.h
+  data/timeinfo.cc
+  data/timeinfo.h
+  data/top.cc
+  data/top.h
+  content/algebra.cc
+  content/algebra.h
   prioqueue.cc
   prioqueue.h
-  proc.cc
-  proc.h
-  user.cc
-  user.h
-  luamm.cc
-  luamm.hh
-  data-source.cc
-  data-source.hh
-  display-output.cc
-  display-output.hh
-  display-console.cc
-  display-console.hh
-  display-file.cc
-  display-file.hh
-  lua-config.cc
-  lua-config.hh
-  setting.cc
-  setting.hh
-  llua.cc
-  llua.h
+  data/proc.cc
+  data/proc.h
+  data/user.cc
+  data/user.h
+  lua/luamm.cc
+  lua/luamm.hh
+  data/data-source.cc
+  data/data-source.hh
+  output/display-output.cc
+  output/display-output.hh
+  output/display-console.cc
+  output/display-console.hh
+  output/display-file.cc
+  output/display-file.hh
+  lua/lua-config.cc
+  lua/lua-config.hh
+  lua/setting.cc
+  lua/setting.hh
+  lua/llua.cc
+  lua/llua.h
   update-cb.cc
   update-cb.hh
   logging.h
@@ -148,122 +148,152 @@ set(conky_sources
 
 # Platform specific sources
 if(OS_LINUX)
-  set(linux linux.cc linux.h users.cc users.h sony.cc sony.h i8k.cc i8k.h)
-  set(optional_sources ${optional_sources} ${linux})
+  set(linux_sources
+    data/os/linux.cc
+    data/os/linux.h
+    data/users.cc
+    data/users.h
+    data/hardware/sony.cc
+    data/hardware/sony.h
+    data/hardware/i8k.cc
+    data/hardware/i8k.h
+  )
+  set(optional_sources ${optional_sources} ${linux_sources})
 endif(OS_LINUX)
 
 if(OS_FREEBSD)
-  set(freebsd freebsd.cc freebsd.h bsdapm.cc bsdapm.h)
-  set(optional_sources ${optional_sources} ${freebsd})
+  set(freebsd_sources
+    data/os/freebsd.cc
+    data/os/freebsd.h
+    data/hardware/bsdapm.cc
+    data/hardware/bsdapm.h
+  )
+  set(optional_sources ${optional_sources} ${freebsd_sources})
 endif(OS_FREEBSD)
 
 if(OS_DRAGONFLY)
-  set(dragonfly dragonfly.cc dragonfly.h bsdapm.cc bsdapm.h)
-  set(optional_sources ${optional_sources} ${dragonfly})
+  set(dragonfly_sources
+    data/os/dragonfly.cc
+    data/os/dragonfly.h
+    data/hardware/bsdapm.cc
+    data/hardware/bsdapm.h
+  )
+  set(optional_sources ${optional_sources} ${dragonfly_sources})
 endif(OS_DRAGONFLY)
 
 if(OS_OPENBSD)
-  set(openbsd openbsd.cc openbsd.h bsdapm.cc bsdapm.h)
-  set(optional_sources ${optional_sources} ${openbsd})
+  set(openbsd_sources
+    data/os/openbsd.cc
+    data/os/openbsd.h
+    data/hardware/bsdapm.cc
+    data/hardware/bsdapm.h
+  )
+  set(optional_sources ${optional_sources} ${openbsd_sources})
 endif(OS_OPENBSD)
 
 # These below are not actually supported.  No idea what their status is.
 if(OS_SOLARIS)
-  set(solaris solaris.cc solaris.h)
-  set(optional_sources ${optional_sources} ${solaris})
+  set(solaris_sources data/os/solaris.cc data/os/solaris.h)
+  set(optional_sources ${optional_sources} ${solaris_sources})
 endif(OS_SOLARIS)
 
 if(OS_NETBSD)
-  set(netbsd netbsd.cc netbsd.h bsdcommon.cc bsdcommon.h)
-  set(optional_sources ${optional_sources} ${netbsd})
+  set(netbsd_sources data/os/netbsd.cc data/os/netbsd.h data/os/bsdcommon.cc data/os/bsdcommon.h)
+  set(optional_sources ${optional_sources} ${netbsd_sources})
 endif(OS_NETBSD)
 
 if(OS_HAIKU)
-  set(haiku haiku.cc haiku.h)
-  set(optional_sources ${optional_sources} ${haiku})
+  set(haiku_sources data/os/haiku.cc data/os/haiku.h)
+  set(optional_sources ${optional_sources} ${haiku_sources})
 endif(OS_HAIKU)
 
 if(OS_DARWIN)
-  set(darwin darwin.mm darwin.h darwin_sip.h i18n.h)
-  set(optional_sources ${optional_sources} ${darwin})
+  set(darwin_sources data/os/darwin.mm data/os/darwin.h data/os/darwin_sip.h i18n.h)
+  set(optional_sources ${optional_sources} ${darwin_sources})
 endif(OS_DARWIN)
 
 # Optional sources
 if(HAVE_SOUNDCARD_H)
-  set(mixer mixer.cc mixer.h)
+  set(mixer data/audio/mixer.cc data/audio/mixer.h)
   set(optional_sources ${optional_sources} ${mixer})
 endif(HAVE_SOUNDCARD_H)
 
 if(BUILD_AUDACIOUS)
-  set(audacious audacious.cc audacious.h)
+  set(audacious data/audio/audacious.cc data/audio/audacious.h)
   set(optional_sources ${optional_sources} ${audacious})
 endif(BUILD_AUDACIOUS)
 
 if(BUILD_IBM)
-  set(ibm ibm.cc ibm.h smapi.cc smapi.h)
+  set(ibm data/hardware/ibm.cc data/hardware/ibm.h data/hardware/smapi.cc data/hardware/smapi.h)
   set(optional_sources ${optional_sources} ${ibm})
 endif(BUILD_IBM)
 
 if(BUILD_MPD)
-  set(mpd mpd.cc mpd.h libmpdclient.cc libmpdclient.h)
+  set(mpd data/audio/mpd.cc data/audio/mpd.h data/audio/libmpdclient.cc data/audio/libmpdclient.h)
   set(optional_sources ${optional_sources} ${mpd})
 endif(BUILD_MPD)
 
 if(BUILD_MYSQL)
-  set(mysql mysql.cc mysql.h)
+  set(mysql data/mysql.cc data/mysql.h)
   set(optional_sources ${optional_sources} ${mysql})
 endif(BUILD_MYSQL)
 
 if(BUILD_MOC)
-  set(moc moc.cc moc.h)
+  set(moc data/audio/moc.cc data/audio/moc.h)
   set(optional_sources ${optional_sources} ${moc})
 endif(BUILD_MOC)
 
 if(BUILD_CMUS)
-  set(cmus cmus.cc cmus.h)
+  set(cmus data/audio/cmus.cc data/audio/cmus.h)
   set(optional_sources ${optional_sources} ${cmus})
 endif(BUILD_CMUS)
 
 if(BUILD_JOURNAL)
-  set(journal journal.cc journal.h)
+  set(journal data/os/journal.cc data/os/journal.h)
   set(optional_sources ${optional_sources} ${journal})
 endif(BUILD_JOURNAL)
 
 if(BUILD_XMMS2)
-  set(xmms2 xmms2.cc xmms2.h)
+  set(xmms2 data/audio/xmms2.cc data/audio/xmms2.h)
   set(optional_sources ${optional_sources} ${xmms2})
 endif(BUILD_XMMS2)
 
 if(BUILD_PORT_MONITORS)
-  add_library(tcp-portmon libtcp-portmon.cc libtcp-portmon.h)
+  add_library(tcp-portmon 
+    data/network/libtcp-portmon.cc
+    data/network/libtcp-portmon.h
+  )
   set(conky_libs ${conky_libs} tcp-portmon)
-  set(port_monitors tcp-portmon.cc tcp-portmon.h)
+  set(port_monitors
+    data/network/tcp-portmon.cc
+    data/network/tcp-portmon.h
+  )
   set(optional_sources ${optional_sources} ${port_monitors})
 endif(BUILD_PORT_MONITORS)
 
 if(BUILD_HTTP)
   set(http
-    display-http.cc
-    display-http.hh
+    output/display-http.cc
+    output/display-http.hh
   )
   set(optional_sources ${optional_sources} ${http})
 endif(BUILD_HTTP)
 
 if(BUILD_X11)
   set(x11
-    display-x11.cc
-    display-x11.hh
-    x11-settings.cc
-    x11-settings.h
-    x11-color.cc
-    x11.cc
-    x11.h
+    output/display-x11.cc
+    output/display-x11.hh
+    lua/x11-settings.cc
+    lua/x11-settings.h
+    output/x11-color.cc
+    output/x11.cc
+    output/x11.h
   )
   set(optional_sources ${optional_sources} ${x11})
 endif(BUILD_X11)
 
 if(BUILD_GUI)
-  set(gui fonts.cc fonts.h gui.cc gui.h)
+  set(gui lua/fonts.cc lua/fonts.h output/gui.cc output/gui.h)
   set(optional_sources ${optional_sources} ${gui})
 
   if(BUILD_MOUSE_EVENTS OR BUILD_XINPUT)
@@ -274,10 +304,10 @@ endif(BUILD_GUI)
 
 if(BUILD_WAYLAND)
   set(wl_sources
-    wl.cc
-    wl.h
-    display-wayland.cc
-    display-wayland.hh
+    output/wl.cc
+    output/wl.h
+    output/display-wayland.cc
+    output/display-wayland.hh
     xdg-shell-protocol.c
     wlr-layer-shell-protocol.c
   )
@@ -340,22 +370,30 @@ if(BUILD_WAYLAND)
 endif(BUILD_WAYLAND)
 
 if(BUILD_HDDTEMP)
-  set(hddtemp hddtemp.cc hddtemp.h)
+  set(hddtemp data/hardware/hddtemp.cc data/hardware/hddtemp.h)
   set(optional_sources ${optional_sources} ${hddtemp})
 endif(BUILD_HDDTEMP)
 
 if(BUILD_CURL)
-  set(ccurl_thread ccurl_thread.cc ccurl_thread.h)
+  set(ccurl_thread
+    data/network/ccurl_thread.cc
+    data/network/ccurl_thread.h
+  )
   set(optional_sources ${optional_sources} ${ccurl_thread})
 endif(BUILD_CURL)
 
 if(BUILD_RSS)
-  set(rss rss.cc rss.h prss.cc prss.h)
+  set(rss
+    data/network/rss.cc
+    data/network/rss.h
+    data/network/prss.cc
+    data/network/prss.h
+  )
   set(optional_sources ${optional_sources} ${rss})
 endif(BUILD_RSS)
 
 if(BUILD_NVIDIA)
-  set(nvidia nvidia.cc nvidia.h)
+  set(nvidia data/hardware/nvidia.cc data/hardware/nvidia.h)
   set(optional_sources ${optional_sources} ${nvidia})
 endif(BUILD_NVIDIA)
 
@@ -365,42 +403,42 @@ if(BUILD_IMLIB2)
 endif(BUILD_IMLIB2)
 
 if(BUILD_APCUPSD)
-  set(apcupsd apcupsd.cc apcupsd.h)
+  set(apcupsd data/hardware/apcupsd.cc data/hardware/apcupsd.h)
   set(optional_sources ${optional_sources} ${apcupsd})
 endif(BUILD_APCUPSD)
 
 if(BUILD_ICAL)
-  set(ical ical.cc ical.h)
+  set(ical data/ical.cc data/ical.h)
   set(optional_sources ${optional_sources} ${ical})
 endif(BUILD_ICAL)
 
 if(BUILD_IRC)
-  set(irc irc.cc irc.h)
+  set(irc data/network/irc.cc data/network/irc.h)
   set(optional_sources ${optional_sources} ${irc})
 endif(BUILD_IRC)
 
 if(BUILD_ICONV)
-  set(iconv iconv_tools.cc iconv_tools.h)
+  set(iconv data/iconv_tools.cc data/iconv_tools.h)
   set(optional_sources ${optional_sources} ${iconv})
 endif(BUILD_ICONV)
 
 if(BUILD_NCURSES)
   set(ncurses_srcs
-    nc.cc
-    nc.h
-    display-ncurses.cc
-    display-ncurses.hh
+    output/nc.cc
+    output/nc.h
+    output/display-ncurses.cc
+    output/display-ncurses.hh
   )
   set(optional_sources ${optional_sources} ${ncurses_srcs})
 endif(BUILD_NCURSES)
 
 if(BUILD_PULSEAUDIO)
-  set(pulseaudio pulseaudio.cc pulseaudio.h)
+  set(pulseaudio data/audio/pulseaudio.cc data/audio/pulseaudio.h)
   set(optional_sources ${optional_sources} ${pulseaudio})
 endif(BUILD_PULSEAUDIO)
 
 if(BUILD_INTEL_BACKLIGHT)
-  set(intel_backlight intel_backlight.cc intel_backlight.h)
+  set(intel_backlight data/hardware/intel_backlight.cc data/hardware/intel_backlight.h)
   set(optional_sources ${optional_sources} ${intel_backlight})
 endif(BUILD_INTEL_BACKLIGHT)
 
diff --git a/src/common.cc b/src/common.cc
index ae4e26b32..81ff13be9 100644
--- a/src/common.cc
+++ b/src/common.cc
@@ -47,14 +47,14 @@
 #include "config.h"
 #include "conky.h"
 #include "core.h"
-#include "fs.h"
+#include "data/fs.h"
 #include "logging.h"
-#include "misc.h"
-#include "net_stat.h"
-#include "specials.h"
-#include "temphelper.h"
-#include "timeinfo.h"
-#include "top.h"
+#include "data/misc.h"
+#include "data/network/net_stat.h"
+#include "content/specials.h"
+#include "content/temphelper.h"
+#include "data/timeinfo.h"
+#include "data/top.h"
 
 #if defined(_POSIX_C_SOURCE) && !defined(__OpenBSD__) && !defined(__HAIKU__)
 #include <wordexp.h>
@@ -62,23 +62,23 @@
 
 /* check for OS and include appropriate headers */
 #if defined(__linux__)
-#include "linux.h"
+#include "data/os/linux.h"
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "freebsd.h"
+#include "data/os/freebsd.h"
 #elif defined(__DragonFly__)
-#include "dragonfly.h"
+#include "data/os/dragonfly.h"
 #elif defined(__OpenBSD__)
-#include "openbsd.h"
+#include "data/os/openbsd.h"
 #elif defined(__NetBSD__)
-#include "netbsd.h"
+#include "data/os/netbsd.h"
 #elif defined(__APPLE__) && defined(__MACH__)
-#include "darwin.h"  // strings.h
+#include "data/os/darwin.h"  // strings.h
 #endif
 
 #include "update-cb.hh"
 
 #ifdef BUILD_CURL
-#include "ccurl_thread.h"
+#include "data/network/ccurl_thread.h"
 #endif /* BUILD_CURL */
 
 /* folds a string over top of itself, like so:
diff --git a/src/common.h b/src/common.h
index 472f35d2f..506407751 100644
--- a/src/common.h
+++ b/src/common.h
@@ -33,8 +33,8 @@
 #include <optional>
 #include <string>
 
-#include "setting.hh"
-#include "text_object.h"
+#include "lua/setting.hh"
+#include "content/text_object.h"
 
 char *readfile(const char *filename, int *total_read, char showerror);
 
diff --git a/src/conky-imlib2.cc b/src/conky-imlib2.cc
index 64d4ce6f7..a039433a0 100644
--- a/src/conky-imlib2.cc
+++ b/src/conky-imlib2.cc
@@ -24,9 +24,9 @@
 #include "conky-imlib2.h"
 
 #include "common.h"
-#include "display-output.hh"
+#include "output/display-output.hh"
 #include "logging.h"
-#include "text_object.h"
+#include "content/text_object.h"
 
 #include <Imlib2.h>
 #include <climits>
@@ -35,8 +35,8 @@
 #include <cstring>
 #include <ctime>
 
-#include "x11-settings.h"
-#include "x11.h"
+#include "lua/x11-settings.h"
+#include "output/x11.h"
 
 struct image_list_s {
   char name[1024];
diff --git a/src/conky-imlib2.h b/src/conky-imlib2.h
index 11a166979..c557289fd 100644
--- a/src/conky-imlib2.h
+++ b/src/conky-imlib2.h
@@ -24,8 +24,8 @@
 #ifndef _CONKY_IMBLI2_H_
 #define _CONKY_IMBLI2_H_
 
-#include "setting.hh"
-#include "text_object.h"
+#include "lua/setting.hh"
+#include "content/text_object.h"
 
 #include <array>
 
diff --git a/src/conky.cc b/src/conky.cc
index 889109c11..c543b5127 100644
--- a/src/conky.cc
+++ b/src/conky.cc
@@ -66,15 +66,15 @@
 #endif /* HAVE_DIRENT_H */
 
 #include "common.h"
-#include "text_object.h"
+#include "content/text_object.h"
 
 #ifdef BUILD_WAYLAND
-#include "wl.h"
+#include "output/wl.h"
 #endif /* BUILD_WAYLAND */
 
 #ifdef BUILD_X11
-#include "x11-settings.h"
-#include "x11.h"
+#include "lua/x11-settings.h"
+#include "output/x11.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wvariadic-macros"
@@ -101,57 +101,57 @@
 #endif /* BUILD_RSS */
 
 /* local headers */
-#include "colours.h"
+#include "content/colours.hh"
 #include "core.h"
-#include "diskio.h"
-#include "exec.h"
+#include "data/exec.h"
+#include "data/hardware/diskio.h"
 #ifdef BUILD_GUI
-#include "fonts.h"
-#include "gui.h"
+#include "lua/fonts.h"
+#include "output/gui.h"
 #endif /* BUILD_GUI */
-#include "fs.h"
+#include "data/fs.h"
 #ifdef BUILD_ICONV
-#include "iconv_tools.h"
+#include "data/iconv_tools.h"
 #endif /* BUILD_ICONV */
-#include "llua.h"
+#include "content/specials.h"
+#include "content/temphelper.h"
+#include "content/template.h"
+#include "data/network/mail.h"
+#include "data/network/net_stat.h"
+#include "data/timeinfo.h"
+#include "data/top.h"
 #include "logging.h"
-#include "mail.h"
-#include "nc.h"
-#include "net_stat.h"
-#include "specials.h"
-#include "temphelper.h"
-#include "template.h"
-#include "timeinfo.h"
-#include "top.h"
+#include "lua/llua.h"
+#include "output/nc.h"
 
 #ifdef BUILD_MYSQL
-#include "mysql.h"
+#include "data/mysql.h"
 #endif /* BUILD_MYSQL */
 #ifdef BUILD_NVIDIA
-#include "nvidia.h"
+#include "data/hardware/nvidia.h"
 #endif /* BUILD_NVIDIA */
 #ifdef BUILD_CURL
-#include "ccurl_thread.h"
+#include "data/network/ccurl_thread.h"
 #endif /* BUILD_CURL */
 
-#include "display-output.hh"
-#include "lua-config.hh"
-#include "setting.hh"
+#include "lua/lua-config.hh"
+#include "lua/setting.hh"
+#include "output/display-output.hh"
 
 /* check for OS and include appropriate headers */
 #if defined(__linux__)
-#include "linux.h"
+#include "data/os/linux.h"
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "freebsd.h"
+#include "data/os/freebsd.h"
 #elif defined(__DragonFly__)
-#include "dragonfly.h"
+#include "data/os/dragonfly.h"
 #elif defined(__OpenBSD__)
-#include "openbsd.h"
+#include "data/os/openbsd.h"
 #elif defined(__NetBSD__)
-#include "netbsd.h"
+#include "data/os/netbsd.h"
 #endif
 
-#include "gradient.h"
+#include "content/gradient.hh"
 
 #ifdef BUILD_OLD_CONFIG
 #include "convertconf.h"
diff --git a/src/conky.h b/src/conky.h
index efb8633f9..f65bee9ca 100644
--- a/src/conky.h
+++ b/src/conky.h
@@ -41,9 +41,9 @@
 #include <filesystem>
 #include <memory>
 
-#include "colours.h"
+#include "content/colours.hh"
 #include "common.h" /* at least for struct dns_data */
-#include "luamm.hh"
+#include "lua/luamm.hh"
 
 #if defined(HAS_MCHECK_H)
 #include <mcheck.h>
@@ -76,35 +76,35 @@ char *strndup(const char *s, size_t n);
 struct text_object;
 
 #ifdef BUILD_HDDTEMP
-#include "hddtemp.h"
+#include "data/hardware/hddtemp.h"
 #endif /* BUILD_HDDTEMP */
 
 #ifdef BUILD_MOC
-#include "moc.h"
+#include "data/audio/moc.h"
 #endif /* BUILD_MOC */
 
 #ifdef BUILD_MPD
-#include "mpd.h"
+#include "data/audio/mpd.h"
 #endif /* BUILD_MPD */
 
 #ifdef BUILD_MYSQL
-#include "mysql.h"
+#include "data/mysql.h"
 #endif /* BUILD_MYSQL */
 
 #ifdef BUILD_PORT_MONITORS
-#include "tcp-portmon.h"
+#include "data/network/tcp-portmon.h"
 #endif
 
 #ifdef BUILD_XMMS2
-#include "xmms2.h"
+#include "data/audio/xmms2.h"
 #endif /* BUILD_XMMS2 */
 
 #ifdef BUILD_APCUPSD
-#include "apcupsd.h"
+#include "data/hardware/apcupsd.h"
 #endif /* BUILD_APCUPSD */
 
 /* sony support */
-#include "sony.h"
+#include "data/hardware/sony.h"
 
 /* A size for temporary, static buffers to use when
  * one doesn't know what to choose. Defaults to 256.  */
diff --git a/src/content/algebra.cc b/src/content/algebra.cc
index 58b9a548f..2b067654a 100644
--- a/src/content/algebra.cc
+++ b/src/content/algebra.cc
@@ -33,8 +33,8 @@
 #include <cstring>
 #include <memory>
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 /* find the operand in the given expression
  * returns the index of the first op character or -1 on error
diff --git a/src/content/colour-names-stub.hh b/src/content/colour-names-stub.hh
index 7008d0765..1b8f01c32 100644
--- a/src/content/colour-names-stub.hh
+++ b/src/content/colour-names-stub.hh
@@ -8,7 +8,7 @@
 
 #include <cstdint>
 
-#include "logging.h"
+#include "../logging.h"
 
 struct rgb {
   const char *name;
diff --git a/src/content/colours.cc b/src/content/colours.cc
index 8af0f83c4..b069682e6 100644
--- a/src/content/colours.cc
+++ b/src/content/colours.cc
@@ -27,9 +27,9 @@
  *
  */
 
-#include "colours.h"
+#include "colours.hh"
 
-#include "logging.h"
+#include "../logging.h"
 
 #include <cstdio>
 #include <optional>
diff --git a/src/content/combine.cc b/src/content/combine.cc
index 40ab534b1..67c216c2b 100644
--- a/src/content/combine.cc
+++ b/src/content/combine.cc
@@ -29,8 +29,8 @@
 
 #include <vector>
 
-#include "core.h"
-#include "logging.h"
+#include "../core.h"
+#include "../logging.h"
 #include "text_object.h"
 
 struct combine_data {
diff --git a/src/content/gradient.cc b/src/content/gradient.cc
index d646520a5..cbed22d22 100644
--- a/src/content/gradient.cc
+++ b/src/content/gradient.cc
@@ -26,10 +26,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "gradient.h"
-#include "colours.h"
-#include "conky.h"
-#include "logging.h"
+#include "gradient.hh"
+#include "../conky.h"
+#include "../logging.h"
+#include "colours.hh"
 
 namespace conky {
 gradient_factory::gradient_factory(int width, Colour first_colour,
diff --git a/src/content/gradient.hh b/src/content/gradient.hh
index f861ba74d..bf697e8fa 100644
--- a/src/content/gradient.hh
+++ b/src/content/gradient.hh
@@ -31,7 +31,7 @@
 #define _GRADIENT_H
 
 #include <memory>
-#include "colours.h"
+#include "colours.hh"
 
 namespace conky {
 class gradient_factory {
diff --git a/src/content/scroll.cc b/src/content/scroll.cc
index 0d4065e57..246f09db8 100644
--- a/src/content/scroll.cc
+++ b/src/content/scroll.cc
@@ -27,11 +27,11 @@
  *
  */
 #include <vector>
-#include "colours.h"
-#include "conky.h"
-#include "core.h"
-#include "display-output.hh"
-#include "logging.h"
+#include "../conky.h"
+#include "../core.h"
+#include "../logging.h"
+#include "../output/display-output.hh"
+#include "colours.hh"
 #include "specials.h"
 #include "text_object.h"
 
diff --git a/src/content/specials.cc b/src/content/specials.cc
index 1278e711c..7ebd3ca51 100644
--- a/src/content/specials.cc
+++ b/src/content/specials.cc
@@ -26,14 +26,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "conky.h"
+#include "../conky.h"
 #ifdef BUILD_GUI
-#include "fonts.h"
-#include "gui.h"
+#include "../lua/fonts.h"
+#include "../output/gui.h"
 #endif /* BUILD_GUI */
 #include <cmath>
-#include "logging.h"
-#include "nc.h"
+#include "../logging.h"
+#include "../output/nc.h"
 #include "specials.h"
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -41,10 +41,10 @@
 #include <algorithm>
 #include <map>
 #include <sstream>
-#include "colours.h"
-#include "common.h"
-#include "conky.h"
-#include "display-output.hh"
+#include "../common.h"
+#include "../conky.h"
+#include "../output/display-output.hh"
+#include "colours.hh"
 
 struct special_node *specials = nullptr;
 
diff --git a/src/content/specials.h b/src/content/specials.h
index c7a8799ba..250b49d53 100644
--- a/src/content/specials.h
+++ b/src/content/specials.h
@@ -30,7 +30,7 @@
 #define _SPECIALS_H
 
 #include <tuple>
-#include "colours.h"
+#include "colours.hh"
 
 /* special stuff in text_buffer */
 
diff --git a/src/content/temphelper.cc b/src/content/temphelper.cc
index 45cb474c3..b37b566b4 100644
--- a/src/content/temphelper.cc
+++ b/src/content/temphelper.cc
@@ -27,7 +27,7 @@
 #include <cstdlib>
 #include <cstring>
 #include "config.h"
-#include "conky.h"
+#include "../conky.h"
 
 template <>
 conky::lua_traits<TEMP_UNIT>::Map conky::lua_traits<TEMP_UNIT>::map = {
diff --git a/src/content/template.cc b/src/content/template.cc
index 6045fe8dc..e7a212c69 100644
--- a/src/content/template.cc
+++ b/src/content/template.cc
@@ -29,8 +29,8 @@
 #include <cctype>
 #include <cstdlib>
 #include <string>
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 namespace {
 conky::simple_config_setting<std::string> _template[10] = {
diff --git a/src/content/text_object.cc b/src/content/text_object.cc
index 9a34eac02..ecd9b4e61 100644
--- a/src/content/text_object.cc
+++ b/src/content/text_object.cc
@@ -30,8 +30,8 @@
 #include <cstdlib>
 #include <cstring>
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 void gen_free_opaque(struct text_object *obj) {
   free_and_zero(obj->data.opaque);
diff --git a/src/content/text_object.h b/src/content/text_object.h
index b6f3c6d5b..f2a8087a3 100644
--- a/src/content/text_object.h
+++ b/src/content/text_object.h
@@ -31,7 +31,7 @@
 
 #include "config.h"
 
-#include "exec.h"
+#include "../data/exec.h"
 #include "specials.h" /* enum special_types */
 
 #include <cstdint> /* uint8_t */
diff --git a/src/core.cc b/src/core.cc
index d7aa10b4c..686f0c8b4 100644
--- a/src/core.cc
+++ b/src/core.cc
@@ -30,100 +30,100 @@
 #include "config.h"
 
 /* local headers */
-#include "algebra.h"
+#include "content/algebra.h"
 #include "core.h"
 
-#include "bsdapm.h"
 #include "build.h"
-#include "colour-settings.h"
-#include "colours.h"
-#include "combine.h"
-#include "diskio.h"
-#include "entropy.h"
-#include "exec.h"
-#include "i8k.h"
-#include "misc.h"
-#include "proc.h"
-#include "text_object.h"
+#include "lua/colour-settings.hh"
+#include "content/colours.hh"
+#include "content/combine.h"
+#include "content/text_object.h"
+#include "data/entropy.h"
+#include "data/exec.h"
+#include "data/hardware/bsdapm.h"
+#include "data/hardware/diskio.h"
+#include "data/hardware/i8k.h"
+#include "data/misc.h"
+#include "data/proc.h"
 #ifdef BUILD_IMLIB2
 #include "conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #ifdef BUILD_MYSQL
-#include "mysql.h"
+#include "data/mysql.h"
 #endif /* BUILD_MYSQL */
 #ifdef BUILD_ICAL
-#include "ical.h"
+#include "data/ical.h"
 #endif /* BUILD_ICAL */
 #ifdef BUILD_IRC
-#include "irc.h"
+#include "data/network/irc.h"
 #endif /* BUILD_IRC */
 #ifdef BUILD_GUI
-#include "fonts.h"
-#include "gui.h"
+#include "lua/fonts.h"
+#include "output/gui.h"
 #endif /* BUILD_GUI */
-#include "fs.h"
+#include "data/fs.h"
 #ifdef BUILD_IBM
-#include "ibm.h"
-#include "smapi.h"
+#include "data/hardware/ibm.h"
+#include "data/hardware/smapi.h"
 #endif /* BUILD_IBM */
 #ifdef BUILD_ICONV
-#include "iconv_tools.h"
+#include "data/iconv_tools.h"
 #endif /* BUILD_ICONV */
-#include "llua.h"
+#include "data/audio/mixer.h"
+#include "data/network/mail.h"
+#include "data/network/mboxscan.h"
+#include "data/network/net_stat.h"
 #include "logging.h"
-#include "mail.h"
-#include "mboxscan.h"
-#include "mixer.h"
-#include "nc.h"
-#include "net_stat.h"
+#include "lua/llua.h"
+#include "output/nc.h"
 #ifdef BUILD_NVIDIA
-#include "nvidia.h"
+#include "data/hardware/nvidia.h"
 #endif /* BUILD_NVIDIA */
 #include <inttypes.h>
-#include "cpu.h"
-#include "read_tcpip.h"
-#include "scroll.h"
-#include "specials.h"
-#include "tailhead.h"
-#include "temphelper.h"
-#include "template.h"
-#include "timeinfo.h"
-#include "top.h"
-#include "user.h"
-#include "users.h"
+#include "content/scroll.h"
+#include "content/specials.h"
+#include "content/temphelper.h"
+#include "content/template.h"
+#include "data/hardware/cpu.h"
+#include "data/network/read_tcpip.h"
+#include "data/tailhead.h"
+#include "data/timeinfo.h"
+#include "data/top.h"
+#include "data/user.h"
+#include "data/users.h"
 #ifdef BUILD_CURL
-#include "ccurl_thread.h"
+#include "data/network/ccurl_thread.h"
 #endif /* BUILD_CURL */
 #ifdef BUILD_RSS
-#include "rss.h"
+#include "data/network/rss.h"
 #endif /* BUILD_RSS */
 #ifdef BUILD_AUDACIOUS
-#include "audacious.h"
+#include "data/audio/audacious.h"
 #endif /* BUILD_AUDACIOUS */
 #ifdef BUILD_CMUS
-#include "cmus.h"
+#include "data/audio/cmus.h"
 #endif /* BUILD_CMUS */
 #ifdef BUILD_JOURNAL
-#include "journal.h"
+#include "data/os/journal.h"
 #endif /* BUILD_JOURNAL */
 #ifdef BUILD_PULSEAUDIO
-#include "pulseaudio.h"
+#include "data/audio/pulseaudio.h"
 #endif /* BUILD_PULSEAUDIO */
 #ifdef BUILD_INTEL_BACKLIGHT
-#include "intel_backlight.h"
+#include "data/hardware/intel_backlight.h"
 #endif /* BUILD_INTEL_BACKLIGHT */
 
 /* check for OS and include appropriate headers */
 #if defined(__linux__)
-#include "linux.h"
+#include "data/os/linux.h"
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "freebsd.h"
+#include "data/os/freebsd.h"
 #elif defined(__DragonFly__)
-#include "dragonfly.h"
+#include "data/os/dragonfly.h"
 #elif defined(__OpenBSD__)
-#include "openbsd.h"
+#include "data/os/openbsd.h"
 #elif defined(__APPLE__) && defined(__MACH__)
-#include "darwin.h"
+#include "data/os/darwin.h"
 #endif
 
 #define STRNDUP_ARG strndup(arg ? arg : "", text_buffer_size.get(*state))
diff --git a/src/data/audio/audacious.cc b/src/data/audio/audacious.cc
index cb99d7d4b..b3dc3d9e3 100644
--- a/src/data/audio/audacious.cc
+++ b/src/data/audio/audacious.cc
@@ -27,9 +27,9 @@
 
 #include <mutex>
 #include "audacious.h"
-#include "conky.h"
-#include "logging.h"
-#include "update-cb.hh"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../update-cb.hh"
 
 #include <glib.h>
 #ifdef NEW_AUDACIOUS_FOUND
diff --git a/src/data/audio/cmus.cc b/src/data/audio/cmus.cc
index 1b78d2095..61ce40185 100644
--- a/src/data/audio/cmus.cc
+++ b/src/data/audio/cmus.cc
@@ -20,9 +20,9 @@
  *
  */
 
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #include <math.h>
 #include <stdio.h>
@@ -31,7 +31,7 @@
 #include <cmath>
 #include <mutex>
 
-#include "update-cb.hh"
+#include "../../update-cb.hh"
 
 namespace {
 struct cmus_result {
diff --git a/src/data/audio/libmpdclient.cc b/src/data/audio/libmpdclient.cc
index c7060b77e..93539e278 100644
--- a/src/data/audio/libmpdclient.cc
+++ b/src/data/audio/libmpdclient.cc
@@ -34,7 +34,7 @@
  */
 
 #include "libmpdclient.h"
-#include "conky.h"
+#include "../../conky.h"
 
 #include <fcntl.h>
 #include <sys/param.h>
diff --git a/src/data/audio/mixer.cc b/src/data/audio/mixer.cc
index 6dad8dec2..ca59a10f5 100644
--- a/src/data/audio/mixer.cc
+++ b/src/data/audio/mixer.cc
@@ -31,10 +31,10 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "conky.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/specials.h"
+#include "../../content/text_object.h"
 
 #ifdef HAVE_SOUNDCARD_H
 #if defined(__linux__)
diff --git a/src/data/audio/moc.cc b/src/data/audio/moc.cc
index 1804bb248..065a0a5a7 100644
--- a/src/data/audio/moc.cc
+++ b/src/data/audio/moc.cc
@@ -20,9 +20,9 @@
  *
  */
 
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #include <cmath>
 #include <cstdio>
@@ -30,7 +30,7 @@
 #include <cstring>
 #include <mutex>
 
-#include "update-cb.hh"
+#include "../../update-cb.hh"
 
 namespace {
 struct moc_result {
diff --git a/src/data/audio/mpd.cc b/src/data/audio/mpd.cc
index 478f7a5bc..251a7fdfa 100644
--- a/src/data/audio/mpd.cc
+++ b/src/data/audio/mpd.cc
@@ -29,11 +29,11 @@
 #include "mpd.h"
 #include <cmath>
 #include <mutex>
-#include "conky.h"
+#include "../../conky.h"
 #include "libmpdclient.h"
-#include "logging.h"
-#include "timeinfo.h"
-#include "update-cb.hh"
+#include "../../logging.h"
+#include "../timeinfo.h"
+#include "../../update-cb.hh"
 
 namespace {
 
diff --git a/src/data/audio/pulseaudio.cc b/src/data/audio/pulseaudio.cc
index 0869ed0ab..431b8e5e1 100644
--- a/src/data/audio/pulseaudio.cc
+++ b/src/data/audio/pulseaudio.cc
@@ -30,13 +30,13 @@
 #include "pulseaudio.h"
 #include <math.h>
 #include <unistd.h>
-#include "common.h"
+#include "../../common.h"
 #include "config.h"
-#include "conky.h"
-#include "core.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../core.h"
+#include "../../logging.h"
+#include "../../content/specials.h"
+#include "../../content/text_object.h"
 
 struct pulseaudio_default_results get_result_copy();
 
diff --git a/src/data/audio/pulseaudio.h b/src/data/audio/pulseaudio.h
index 9df07ae05..213774e71 100644
--- a/src/data/audio/pulseaudio.h
+++ b/src/data/audio/pulseaudio.h
@@ -32,7 +32,7 @@
 
 #include <pulse/pulseaudio.h>
 #include <string>
-#include "text_object.h"
+#include "../../content/text_object.h"
 
 void init_pulseaudio(struct text_object *obj);
 void free_pulseaudio(struct text_object *obj);
diff --git a/src/data/audio/xmms2.cc b/src/data/audio/xmms2.cc
index 69af7c101..32ecd5090 100644
--- a/src/data/audio/xmms2.cc
+++ b/src/data/audio/xmms2.cc
@@ -26,7 +26,7 @@
  *
  */
 
-#include "conky.h"
+#include "../../conky.h"
 
 xmmsc_connection_t *xmms2_conn;
 
diff --git a/src/data/data-source.hh b/src/data/data-source.hh
index cdc6a739b..861839bac 100644
--- a/src/data/data-source.hh
+++ b/src/data/data-source.hh
@@ -27,7 +27,7 @@
 #include <string>
 #include <type_traits>
 
-#include "luamm.hh"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/data/entropy.cc b/src/data/entropy.cc
index e0711864b..1e9c1595e 100644
--- a/src/data/entropy.cc
+++ b/src/data/entropy.cc
@@ -30,26 +30,26 @@
 #include <inttypes.h>
 #include <time.h>
 #include "config.h"
-#include "conky.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../content/text_object.h"
 
 /* check for OS and include appropriate headers */
 #if defined(__linux__)
-#include "linux.h"
+#include "os/linux.h"
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "freebsd.h"
+#include "os/freebsd.h"
 #elif defined(__DragonFly__)
-#include "dragonfly.h"
+#include "os/dragonfly.h"
 #elif defined(__OpenBSD__)
-#include "openbsd.h"
+#include "os/openbsd.h"
 #elif defined(__NetBSD__)
-#include "netbsd.h"
+#include "os/netbsd.h"
 #elif defined(__sun)
-#include "solaris.h"
+#include "os/solaris.h"
 #elif defined(__HAIKU__)
-#include "haiku.h"
+#include "os/haiku.h"
 #elif defined(__APPLE__) && defined(__MACH__)
-#include "darwin.h"
+#include "os/darwin.h"
 #endif
 
 struct _entropy {
diff --git a/src/data/exec.cc b/src/data/exec.cc
index 81cf486cf..a46b801e7 100644
--- a/src/data/exec.cc
+++ b/src/data/exec.cc
@@ -35,12 +35,12 @@
 #include <cmath>
 #include <cstdio>
 #include <mutex>
-#include "conky.h"
-#include "core.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
-#include "update-cb.hh"
+#include "../conky.h"
+#include "../core.h"
+#include "../logging.h"
+#include "../content/specials.h"
+#include "../content/text_object.h"
+#include "../update-cb.hh"
 
 struct execi_data {
   float interval{0};
diff --git a/src/data/exec.h b/src/data/exec.h
index 4b045dbd7..478130a4b 100644
--- a/src/data/exec.h
+++ b/src/data/exec.h
@@ -30,7 +30,7 @@
 #ifndef _EXEC_H
 #define _EXEC_H
 
-#include "update-cb.hh"
+#include "../update-cb.hh"
 
 /**
  * A callback that executes a command and stores the output as a std::string.
diff --git a/src/data/fs.cc b/src/data/fs.cc
index c3850537e..9d024e50e 100644
--- a/src/data/fs.cc
+++ b/src/data/fs.cc
@@ -33,10 +33,10 @@
 #include <unistd.h>
 #include <cctype>
 #include <cerrno>
-#include "conky.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../logging.h"
+#include "../content/specials.h"
+#include "../content/text_object.h"
 
 #ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
@@ -48,17 +48,17 @@
 #endif
 
 #if defined(__FreeBSD__)
-#include "freebsd.h"
+#include "os/freebsd.h"
 #elif defined(__OpenBSD__)
-#include "openbsd.h"
+#include "os/openbsd.h"
 #elif defined(__DragonFly__)
-#include "dragonfly.h"
+#include "os/dragonfly.h"
 #elif defined(__NetBSD__)
-#include "netbsd.h"
+#include "os/netbsd.h"
 #elif defined(__HAIKU__)
-#include "haiku.h"
+#include "os/haiku.h"
 #elif defined(__APPLE__) && defined(__MACH__)
-#include "darwin.h"
+#include "os/darwin.h"
 #endif
 
 #if !defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) && !defined(__OpenBSD__) &&  \
diff --git a/src/data/fs.h b/src/data/fs.h
index 41d3a4d33..431a4dcbd 100644
--- a/src/data/fs.h
+++ b/src/data/fs.h
@@ -30,7 +30,7 @@
 #ifndef _FS_H
 #define _FS_H
 
-#include "conky.h" /* DEFAULT_TEXT_BUFFER_SIZE */
+#include "../conky.h" /* DEFAULT_TEXT_BUFFER_SIZE */
 
 /* needed here and by fs.c */
 struct fs_stat {
diff --git a/src/data/hardware/apcupsd.cc b/src/data/hardware/apcupsd.cc
index 0c739be81..ca28a181f 100644
--- a/src/data/hardware/apcupsd.cc
+++ b/src/data/hardware/apcupsd.cc
@@ -22,9 +22,9 @@
  */
 
 #include "apcupsd.h"
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #include <netdb.h>
 #include <netinet/in.h>
diff --git a/src/data/hardware/bsdapm.cc b/src/data/hardware/bsdapm.cc
index 7891df23b..99013a5de 100644
--- a/src/data/hardware/bsdapm.cc
+++ b/src/data/hardware/bsdapm.cc
@@ -31,8 +31,8 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "conky.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../content/text_object.h"
 
 #if defined(__OpenBSD__)
 #include <machine/apmvar.h>
diff --git a/src/data/hardware/cpu.cc b/src/data/hardware/cpu.cc
index f2548d9e9..2d15c1af4 100644
--- a/src/data/hardware/cpu.cc
+++ b/src/data/hardware/cpu.cc
@@ -34,8 +34,8 @@
 #include <time.h>
 #include <unistd.h>
 #include "config.h"
-#include "conky.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../content/text_object.h"
 
 #ifdef __x86_64__
 #define CPU_FEATURE(x, z) __asm__ __volatile__("cpuid" : "=a"(z) : "a"(x))
diff --git a/src/data/hardware/diskio.cc b/src/data/hardware/diskio.cc
index 130ff45c5..82ab6b1b5 100644
--- a/src/data/hardware/diskio.cc
+++ b/src/data/hardware/diskio.cc
@@ -31,13 +31,13 @@
 #include <sys/stat.h>
 #include <cstdlib>
 #include <vector>
-#include "common.h"
+#include "../../common.h"
 #include "config.h"
-#include "conky.h" /* text_buffer_size */
-#include "core.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../../conky.h" /* text_buffer_size */
+#include "../../core.h"
+#include "../../logging.h"
+#include "../../content/specials.h"
+#include "../../content/text_object.h"
 
 /* this is the root of all per disk stats,
  * also containing the totals. */
diff --git a/src/data/hardware/hddtemp.cc b/src/data/hardware/hddtemp.cc
index e2bab99f1..e8bb2331d 100644
--- a/src/data/hardware/hddtemp.cc
+++ b/src/data/hardware/hddtemp.cc
@@ -34,10 +34,10 @@
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <unistd.h>
-#include "conky.h"
-#include "logging.h"
-#include "temphelper.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/temphelper.h"
+#include "../../content/text_object.h"
 
 #define BUFLEN 512
 
diff --git a/src/data/hardware/i8k.cc b/src/data/hardware/i8k.cc
index fed53983e..1edd6f93f 100644
--- a/src/data/hardware/i8k.cc
+++ b/src/data/hardware/i8k.cc
@@ -31,10 +31,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "conky.h"
-#include "logging.h"
-#include "temphelper.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/temphelper.h"
+#include "../../content/text_object.h"
 
 struct _i8k {
   char *version;
diff --git a/src/data/hardware/ibm.cc b/src/data/hardware/ibm.cc
index 5b4448753..d715818c5 100644
--- a/src/data/hardware/ibm.cc
+++ b/src/data/hardware/ibm.cc
@@ -35,9 +35,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
-#include "temphelper.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/temphelper.h"
 
 static int ibm_acpi_temps[8];
 
diff --git a/src/data/hardware/intel_backlight.cc b/src/data/hardware/intel_backlight.cc
index 92852cf75..ff8f2a4d0 100644
--- a/src/data/hardware/intel_backlight.cc
+++ b/src/data/hardware/intel_backlight.cc
@@ -26,7 +26,7 @@
  */
 
 #include "intel_backlight.h"
-#include "logging.h"
+#include "../../logging.h"
 
 #define FS_BRIGHTNESS_MAX "/sys/class/backlight/intel_backlight/max_brightness"
 #define FS_BRIGHTNESS_CURRENT "/sys/class/backlight/intel_backlight/brightness"
diff --git a/src/data/hardware/intel_backlight.h b/src/data/hardware/intel_backlight.h
index 6c2238239..2881118dc 100644
--- a/src/data/hardware/intel_backlight.h
+++ b/src/data/hardware/intel_backlight.h
@@ -28,8 +28,8 @@
 #ifndef _INTEL_BACKLIGHT_H
 #define _INTEL_BACKLIGHT_H
 
-#include "conky.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../content/text_object.h"
 
 void init_intel_backlight(struct text_object *obj);
 void free_intel_backlight(struct text_object *obj);
diff --git a/src/data/hardware/nvidia.cc b/src/data/hardware/nvidia.cc
index 763720511..d4f6a21c6 100644
--- a/src/data/hardware/nvidia.cc
+++ b/src/data/hardware/nvidia.cc
@@ -96,12 +96,12 @@
 #include <X11/Xlib.h>
 #include "NVCtrl/NVCtrl.h"
 #include "NVCtrl/NVCtrlLib.h"
-#include "conky.h"
-#include "logging.h"
-#include "temphelper.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/temphelper.h"
 
 // Current implementation uses X11 specific system utils
-#include "x11.h"
+#include "../../output/x11.h"
 
 #include <memory>
 
diff --git a/src/data/hardware/nvidia.h b/src/data/hardware/nvidia.h
index 492274d7a..47cf9d7f3 100644
--- a/src/data/hardware/nvidia.h
+++ b/src/data/hardware/nvidia.h
@@ -30,7 +30,7 @@
 #ifndef NVIDIA_CONKY_H
 #define NVIDIA_CONKY_H
 
-#include "specials.h"
+#include "../../content/specials.h"
 
 int set_nvidia_query(struct text_object *, const char *, text_node_t);
 void print_nvidia_value(struct text_object *, char *, unsigned int);
diff --git a/src/data/hardware/smapi.cc b/src/data/hardware/smapi.cc
index bc86c076b..8ea07624d 100644
--- a/src/data/hardware/smapi.cc
+++ b/src/data/hardware/smapi.cc
@@ -26,9 +26,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "conky.h" /* text_buffer_size, PACKAGE_NAME, maybe more */
-#include "logging.h"
-#include "temphelper.h"
+#include "../../conky.h" /* text_buffer_size, PACKAGE_NAME, maybe more */
+#include "../../logging.h"
+#include "../../content/temphelper.h"
 
 #define SYS_SMAPI_PATH "/sys/devices/platform/smapi"
 
diff --git a/src/data/hardware/sony.cc b/src/data/hardware/sony.cc
index 8bda0fd8c..58208b9f3 100644
--- a/src/data/hardware/sony.cc
+++ b/src/data/hardware/sony.cc
@@ -34,9 +34,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #define SONY_LAPTOP_DIR "/sys/devices/platform/sony-laptop"
 
diff --git a/src/data/ical.cc b/src/data/ical.cc
index fb39ac1ed..53b40d862 100644
--- a/src/data/ical.cc
+++ b/src/data/ical.cc
@@ -23,8 +23,8 @@
  */
 
 #include <libical/ical.h>
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 struct ical_event {
   icaltimetype start;
diff --git a/src/data/iconv_tools.cc b/src/data/iconv_tools.cc
index 5e4d99dc2..d1d77f3cf 100644
--- a/src/data/iconv_tools.cc
+++ b/src/data/iconv_tools.cc
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "config.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../logging.h"
+#include "../content/text_object.h"
 
 #define ICONV_CODEPAGE_LENGTH 20
 
diff --git a/src/data/misc.cc b/src/data/misc.cc
index c945633cc..9ee905a36 100644
--- a/src/data/misc.cc
+++ b/src/data/misc.cc
@@ -34,11 +34,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "conky.h"
-#include "core.h"
-#include "logging.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../core.h"
+#include "../logging.h"
+#include "../content/specials.h"
+#include "../content/text_object.h"
 
 static inline void read_file(const char *data, char *buf, const int size) {
   FILE *fp;
diff --git a/src/data/misc.h b/src/data/misc.h
index 5a813d22b..903340966 100644
--- a/src/data/misc.h
+++ b/src/data/misc.h
@@ -31,7 +31,7 @@
 #ifndef _MISC_H
 #define _MISC_H
 
-#include "text_object.h"
+#include "../content/text_object.h"
 
 void print_cat(struct text_object *, char *, unsigned int);
 void print_catp(struct text_object *, char *, unsigned int);
diff --git a/src/data/mysql.cc b/src/data/mysql.cc
index fa31c74f6..f2f94da33 100644
--- a/src/data/mysql.cc
+++ b/src/data/mysql.cc
@@ -27,12 +27,12 @@
  */
 
 #include "mysql.h"
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 #include <mysql.h>
 
-#include "setting.hh"
+#include "../lua/setting.hh"
 
 namespace {
 conky::simple_config_setting<std::string> host("mysql_host", "localhost",
diff --git a/src/data/network/ccurl_thread.cc b/src/data/network/ccurl_thread.cc
index fc4caa63a..e89aecf7d 100644
--- a/src/data/network/ccurl_thread.cc
+++ b/src/data/network/ccurl_thread.cc
@@ -25,9 +25,9 @@
 #include "ccurl_thread.h"
 #include <cmath>
 #include <mutex>
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #ifdef DEBUG
 #include <assert.h>
diff --git a/src/data/network/ccurl_thread.h b/src/data/network/ccurl_thread.h
index da54272ec..ee5dd21ad 100644
--- a/src/data/network/ccurl_thread.h
+++ b/src/data/network/ccurl_thread.h
@@ -27,8 +27,8 @@
 
 #include <curl/curl.h>
 
-#include "logging.h"
-#include "update-cb.hh"
+#include "../../logging.h"
+#include "../../update-cb.hh"
 
 namespace priv {
 // factored out stuff that does not depend on the template parameters
diff --git a/src/data/network/irc.cc b/src/data/network/irc.cc
index 90cd2b95d..4389f622d 100644
--- a/src/data/network/irc.cc
+++ b/src/data/network/irc.cc
@@ -26,9 +26,9 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 struct ll_text {
   char *text;
diff --git a/src/data/network/mail.cc b/src/data/network/mail.cc
index d17e84d5b..55e7aff86 100644
--- a/src/data/network/mail.cc
+++ b/src/data/network/mail.cc
@@ -31,10 +31,10 @@
 
 #include "mail.h"
 
-#include "common.h"
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../common.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #include <netdb.h>
 #include <netinet/in.h>
@@ -57,7 +57,7 @@
 #include <mutex>
 #include <sstream>
 
-#include "update-cb.hh"
+#include "../../update-cb.hh"
 
 struct local_mail_s {
   char *mbox;
diff --git a/src/data/network/mail.h b/src/data/network/mail.h
index c3c71765a..7cd16aeb2 100644
--- a/src/data/network/mail.h
+++ b/src/data/network/mail.h
@@ -25,7 +25,7 @@
 #ifndef _MAIL_H
 #define _MAIL_H
 
-#include "setting.hh"
+#include "../../lua/setting.hh"
 
 void parse_local_mail_args(struct text_object *, const char *);
 
diff --git a/src/data/network/mboxscan.cc b/src/data/network/mboxscan.cc
index 568241892..1e3bbb9c9 100644
--- a/src/data/network/mboxscan.cc
+++ b/src/data/network/mboxscan.cc
@@ -31,10 +31,10 @@
 #include <sys/time.h>
 #include <cerrno>
 #include <memory>
-#include "conky.h"
-#include "logging.h"
+#include "../../conky.h"
+#include "../../logging.h"
 #include "mail.h"
-#include "text_object.h"
+#include "../../content/text_object.h"
 
 #define FROM_WIDTH 10
 #define SUBJECT_WIDTH 22
diff --git a/src/data/network/net_stat.cc b/src/data/network/net_stat.cc
index 4cfc55c6f..4ae8c2aee 100644
--- a/src/data/network/net_stat.cc
+++ b/src/data/network/net_stat.cc
@@ -34,11 +34,11 @@
 #include <unistd.h>
 #include <cerrno>
 #include <cstring>
-#include "conky.h"
-#include "logging.h"
+#include "../../conky.h"
+#include "../../logging.h"
 #include "net/if.h"
-#include "specials.h"
-#include "text_object.h"
+#include "../../content/specials.h"
+#include "../../content/text_object.h"
 #if defined(__sun)
 #include <sys/sockio.h>
 #endif
@@ -51,7 +51,7 @@
 #endif /* SOCK_CLOEXEC */
 
 #if defined(__linux__)
-#include "linux.h"
+#include "../os/linux.h"
 #else
 static char e_iface[50] = "empty";
 static char interfaces_arr[MAX_NET_INTERFACES][64] = {""};
diff --git a/src/data/network/prss.cc b/src/data/network/prss.cc
index 600ecea8c..f4ac6c35b 100644
--- a/src/data/network/prss.cc
+++ b/src/data/network/prss.cc
@@ -20,8 +20,8 @@
 #include "prss.h"
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include "conky.h"
-#include "logging.h"
+#include "../../conky.h"
+#include "../../logging.h"
 
 #ifndef PARSE_OPTIONS
 #define PARSE_OPTIONS 0
diff --git a/src/data/network/read_tcpip.cc b/src/data/network/read_tcpip.cc
index dccd30106..f08a68cd7 100644
--- a/src/data/network/read_tcpip.cc
+++ b/src/data/network/read_tcpip.cc
@@ -36,9 +36,9 @@
 #include <cinttypes>
 #include <cstdlib>
 #include <string>
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #ifndef SOCK_CLOEXEC
 #define SOCK_CLOEXEC O_CLOEXEC
diff --git a/src/data/network/rss.cc b/src/data/network/rss.cc
index d85831977..7ef2a30d1 100644
--- a/src/data/network/rss.cc
+++ b/src/data/network/rss.cc
@@ -28,10 +28,10 @@
 #include <cmath>
 #include <mutex>
 #include "ccurl_thread.h"
-#include "conky.h"
-#include "logging.h"
+#include "../../conky.h"
+#include "../../logging.h"
 #include "prss.h"
-#include "text_object.h"
+#include "../../content/text_object.h"
 
 struct rss_data {
   char uri[128];
diff --git a/src/data/network/tcp-portmon.cc b/src/data/network/tcp-portmon.cc
index c8554faa0..ebb784399 100644
--- a/src/data/network/tcp-portmon.cc
+++ b/src/data/network/tcp-portmon.cc
@@ -18,10 +18,10 @@
  *
  */
 #include "tcp-portmon.h"
-#include "conky.h"
+#include "../../conky.h"
 #include "libtcp-portmon.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 static tcp_port_monitor_collection_t *pmc = nullptr;
 
diff --git a/src/data/os/bsdcommon.cc b/src/data/os/bsdcommon.cc
index e70e14aaa..feb51998a 100644
--- a/src/data/os/bsdcommon.cc
+++ b/src/data/os/bsdcommon.cc
@@ -23,7 +23,7 @@
  */
 
 #include "bsdcommon.h"
-#include "logging.h"
+#include "../../logging.h"
 
 #include <kvm.h>
 
@@ -37,7 +37,7 @@
   #include <uvm/uvm_extern.h>
 #endif
 
-#include "top.h"
+#include "../top.h"
 
 static kvm_t *kd = nullptr;
 static char kvm_errbuf[_POSIX2_LINE_MAX];
diff --git a/src/data/os/bsdcommon.h b/src/data/os/bsdcommon.h
index b167de881..dac5bfd60 100644
--- a/src/data/os/bsdcommon.h
+++ b/src/data/os/bsdcommon.h
@@ -40,7 +40,7 @@
 
 #include <stdint.h>
 
-#include "conky.h"
+#include "../../conky.h"
 
 namespace bsdcommon {
   struct cpu_load {
diff --git a/src/data/os/darwin.mm b/src/data/os/darwin.mm
index a30b5904c..188eb4118 100644
--- a/src/data/os/darwin.mm
+++ b/src/data/os/darwin.mm
@@ -42,6 +42,7 @@
  *is available. patched the _csr_check function to return the bool bit instead.
  */
 
+#include "../../conky.h"  // for struct info
 #include "darwin.h"
 
 #include <AvailabilityMacros.h>
@@ -60,8 +61,10 @@
 
 #include <dispatch/dispatch.h>  // get_top_info
 #include <libproc.h>            // get_top_info
+#include "../top.h"                // get_top_info
 
 #include <ifaddrs.h>   // update_net_stats
+#include "../network/net_stat.h"  // update_net_stats
 
 #include "darwin_sip.h"  // sip status
 
diff --git a/src/data/os/dragonfly.cc b/src/data/os/dragonfly.cc
index b7743091a..4fde05b20 100644
--- a/src/data/os/dragonfly.cc
+++ b/src/data/os/dragonfly.cc
@@ -51,12 +51,12 @@
 
 #include <dev/acpica/acpiio.h>
 
-#include "conky.h"
-#include "diskio.h"
+#include "../../conky.h"
+#include "../hardware/diskio.h"
 #include "dragonfly.h"
-#include "logging.h"
-#include "net_stat.h"
-#include "top.h"
+#include "../../logging.h"
+#include "../network/net_stat.h"
+#include "../top.h"
 
 #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
 #define KELVTOC(x) ((x - 2732) / 10.0)
diff --git a/src/data/os/dragonfly.h b/src/data/os/dragonfly.h
index 52a39cc54..93cd8a92e 100644
--- a/src/data/os/dragonfly.h
+++ b/src/data/os/dragonfly.h
@@ -8,7 +8,7 @@
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/ucred.h>
-#include "common.h"
+#include "../../common.h"
 #if (defined(i386) || defined(__i386__))
 #include <machine/apm_bios.h>
 #endif /* i386 || __i386__ */
diff --git a/src/data/os/freebsd.cc b/src/data/os/freebsd.cc
index f5913c55c..57e54c158 100644
--- a/src/data/os/freebsd.cc
+++ b/src/data/os/freebsd.cc
@@ -56,13 +56,13 @@
 
 #include <mutex>
 
-#include "conky.h"
-#include "diskio.h"
+#include "../../conky.h"
+#include "../hardware/diskio.h"
 #include "freebsd.h"
-#include "logging.h"
-#include "net_stat.h"
-#include "text_object.h"
-#include "top.h"
+#include "../../logging.h"
+#include "../network/net_stat.h"
+#include "../../content/text_object.h"
+#include "../top.h"
 
 #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
 #define KELVTOC(x) ((x - 2732) / 10.0)
diff --git a/src/data/os/freebsd.h b/src/data/os/freebsd.h
index d64cf569c..82d1600b6 100644
--- a/src/data/os/freebsd.h
+++ b/src/data/os/freebsd.h
@@ -36,7 +36,7 @@
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/ucred.h>
-#include "common.h"
+#include "../../common.h"
 #if (defined(i386) || defined(__i386__))
 #include <machine/apm_bios.h>
 #endif /* i386 || __i386__ */
diff --git a/src/data/os/haiku.cc b/src/data/os/haiku.cc
index 7029df192..735eae62c 100644
--- a/src/data/os/haiku.cc
+++ b/src/data/os/haiku.cc
@@ -29,10 +29,10 @@
 
 #include <OS.h>
 
-#include "conky.h"
+#include "../../conky.h"
 #include "haiku.h"
-#include "net_stat.h"
-#include "top.h"
+#include "../network/net_stat.h"
+#include "../top.h"
 
 static short cpu_setup = 0;
 
diff --git a/src/data/os/haiku.h b/src/data/os/haiku.h
index 84c93208c..965a882da 100644
--- a/src/data/os/haiku.h
+++ b/src/data/os/haiku.h
@@ -20,8 +20,8 @@
 
 #include <OS.h>
 
-#include "common.h"
-#include "conky.h"
+#include "../../common.h"
+#include "../../conky.h"
 
 int get_entropy_avail(unsigned int *);
 int get_entropy_poolsize(unsigned int *);
diff --git a/src/data/os/journal.cc b/src/data/os/journal.cc
index 3695ae930..a3cd664a9 100644
--- a/src/data/os/journal.cc
+++ b/src/data/os/journal.cc
@@ -33,11 +33,11 @@
 #include <time.h>
 #include <unistd.h>
 #include <memory>
-#include "common.h"
+#include "../../common.h"
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../../conky.h"
+#include "../../logging.h"
+#include "../../content/text_object.h"
 
 #define MAX_JOURNAL_LINES 200
 
diff --git a/src/data/os/linux.cc b/src/data/os/linux.cc
index 4bf689a10..5956d8c2a 100644
--- a/src/data/os/linux.cc
+++ b/src/data/os/linux.cc
@@ -33,13 +33,13 @@
 #include <sys/sysinfo.h>
 #include <sys/types.h>
 #include <clocale>
-#include "common.h"
-#include "conky.h"
-#include "diskio.h"
-#include "logging.h"
-#include "net_stat.h"
-#include "proc.h"
-#include "temphelper.h"
+#include "../../common.h"
+#include "../../conky.h"
+#include "../hardware/diskio.h"
+#include "../../logging.h"
+#include "../network/net_stat.h"
+#include "../proc.h"
+#include "../../content/temphelper.h"
 #ifndef HAVE_CLOCK_GETTIME
 #include <sys/time.h>
 #endif
@@ -48,8 +48,8 @@
 // #include <assert.h>
 #include <time.h>
 #include <unordered_map>
-#include "setting.hh"
-#include "top.h"
+#include "../../lua/setting.hh"
+#include "../top.h"
 
 #include <arpa/inet.h>
 #include <linux/sockios.h>
diff --git a/src/data/os/linux.h b/src/data/os/linux.h
index f5b9f4097..aabf77932 100644
--- a/src/data/os/linux.h
+++ b/src/data/os/linux.h
@@ -25,7 +25,7 @@
 #ifndef _LINUX_H
 #define _LINUX_H
 
-#include "common.h"
+#include "../../common.h"
 
 void print_disk_protect_queue(struct text_object *, char *, unsigned int);
 
diff --git a/src/data/os/netbsd.cc b/src/data/os/netbsd.cc
index 1da8a9cd1..e16dacc7b 100644
--- a/src/data/os/netbsd.cc
+++ b/src/data/os/netbsd.cc
@@ -28,7 +28,7 @@
  */
 
 #include "netbsd.h"
-#include "net_stat.h"
+#include "../network/net_stat.h"
 #include "bsdcommon.h"
 
 #include <err.h>
diff --git a/src/data/os/netbsd.h b/src/data/os/netbsd.h
index e9fb7deb9..384dc1c8b 100644
--- a/src/data/os/netbsd.h
+++ b/src/data/os/netbsd.h
@@ -12,8 +12,8 @@
 #include <sys/mount.h>
 #include <sys/statvfs.h>
 
-#include "common.h"
-#include "conky.h"
+#include "../../common.h"
+#include "../../conky.h"
 
 #include "bsdcommon.h"
 
diff --git a/src/data/os/openbsd.cc b/src/data/os/openbsd.cc
index 0343654c4..169a1f4c0 100644
--- a/src/data/os/openbsd.cc
+++ b/src/data/os/openbsd.cc
@@ -58,13 +58,13 @@
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include "conky.h"
-#include "diskio.h"
-#include "logging.h"
-#include "net_stat.h"
+#include "../../conky.h"
+#include "../hardware/diskio.h"
+#include "../../logging.h"
+#include "../network/net_stat.h"
 #include "openbsd.h"
-#include "temphelper.h"
-#include "top.h"
+#include "../../content/temphelper.h"
+#include "../top.h"
 
 #define MAXSHOWDEVS 16
 
diff --git a/src/data/os/openbsd.h b/src/data/os/openbsd.h
index 56d949687..93be60233 100644
--- a/src/data/os/openbsd.h
+++ b/src/data/os/openbsd.h
@@ -10,7 +10,7 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 
-#include "common.h"
+#include "../../common.h"
 
 void parse_obsd_sensor(struct text_object *, const char *);
 void print_obsd_sensors_temp(struct text_object *, char *, unsigned int);
diff --git a/src/data/os/solaris.cc b/src/data/os/solaris.cc
index 35a0e322d..6ca7f7667 100644
--- a/src/data/os/solaris.cc
+++ b/src/data/os/solaris.cc
@@ -40,14 +40,14 @@
 #include <sys/sysinfo.h>
 #include <sys/task.h>
 #include <unistd.h>
-#include "common.h"
-#include "conky.h"
-#include "diskio.h"
-#include "top.h"
+#include "../../common.h"
+#include "../../conky.h"
+#include "../hardware/diskio.h"
+#include "../top.h"
 
 #include <assert.h>
 
-#include "net_stat.h"
+#include "../network/net_stat.h"
 #include "solaris.h"
 
 static kstat_ctl_t *kstat;
diff --git a/src/data/proc.cc b/src/data/proc.cc
index 2807b4c1d..30d6e9541 100644
--- a/src/data/proc.cc
+++ b/src/data/proc.cc
@@ -33,9 +33,9 @@
 #include <cctype>
 #include <memory>
 #include <sstream>
-#include "conky.h"
-#include "core.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../core.h"
+#include "../logging.h"
 
 char *readfile(const char *filename, int *total_read, char showerror) {
   FILE *file;
diff --git a/src/data/tailhead.cc b/src/data/tailhead.cc
index 973398659..f3f7fe0ba 100644
--- a/src/data/tailhead.cc
+++ b/src/data/tailhead.cc
@@ -33,11 +33,11 @@
 #include <cctype>
 #include <cstring>
 #include <memory>
-#include "common.h"
+#include "../common.h"
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../logging.h"
+#include "../content/text_object.h"
 
 #define MAX_HEADTAIL_LINES 30
 #define DEFAULT_MAX_HEADTAIL_USES 2
diff --git a/src/data/timeinfo.cc b/src/data/timeinfo.cc
index bd6665b61..56aca995f 100644
--- a/src/data/timeinfo.cc
+++ b/src/data/timeinfo.cc
@@ -36,9 +36,9 @@
 #include <clocale>
 #include <cstring>
 #include <ctime>
-#include "conky.h"
-#include "logging.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../logging.h"
+#include "../content/text_object.h"
 
 #include <memory>
 
diff --git a/src/data/timeinfo.h b/src/data/timeinfo.h
index ccf958816..afe9e227a 100644
--- a/src/data/timeinfo.h
+++ b/src/data/timeinfo.h
@@ -29,7 +29,7 @@
 #ifndef _TIMEINFO_H
 #define _TIMEINFO_H
 
-#include "setting.hh"
+#include "../lua/setting.hh"
 
 extern conky::simple_config_setting<bool> times_in_seconds;
 
diff --git a/src/data/top.cc b/src/data/top.cc
index 493e8b152..703289267 100644
--- a/src/data/top.cc
+++ b/src/data/top.cc
@@ -29,8 +29,8 @@
  */
 
 #include "top.h"
-#include "logging.h"
-#include "prioqueue.h"
+#include "../logging.h"
+#include "../prioqueue.h"
 
 /* hash table size - always a power of 2 */
 #define HTABSIZE 256
diff --git a/src/data/top.h b/src/data/top.h
index 41a05244d..b19a61eb1 100644
--- a/src/data/top.h
+++ b/src/data/top.h
@@ -40,8 +40,8 @@
  * Includes								  *
  ******************************************/
 
-#include "conky.h"
-#include "text_object.h"
+#include "../conky.h"
+#include "../content/text_object.h"
 #define CPU_THRESHHOLD 0 /* threshold for the cpu diff to appear */
 #include <assert.h>
 #include <ctype.h>
diff --git a/src/data/user.cc b/src/data/user.cc
index c5912262f..8fb037bdc 100644
--- a/src/data/user.cc
+++ b/src/data/user.cc
@@ -33,8 +33,8 @@
 #include <pwd.h>
 #include <cerrno>
 #include <memory>
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 void print_uid_name(struct text_object *obj, char *p, unsigned int p_max_size) {
   struct passwd *pw;
diff --git a/src/data/users.cc b/src/data/users.cc
index f0d2921a3..76389d96a 100644
--- a/src/data/users.cc
+++ b/src/data/users.cc
@@ -30,7 +30,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <utmp.h>
-#include "conky.h"
+#include "../conky.h"
 
 #define BUFLEN 512
 
diff --git a/src/lua/colour-settings.cc b/src/lua/colour-settings.cc
index b17fd1ba4..a95c35772 100644
--- a/src/lua/colour-settings.cc
+++ b/src/lua/colour-settings.cc
@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include "colour-settings.h"
+#include "colour-settings.hh"
 
 namespace priv {
 void colour_setting::lua_setter(lua::state &l, bool init) {
diff --git a/src/lua/colour-settings.hh b/src/lua/colour-settings.hh
index 3af8fac1b..873580720 100644
--- a/src/lua/colour-settings.hh
+++ b/src/lua/colour-settings.hh
@@ -23,7 +23,7 @@
  */
 #pragma once
 
-#include "colours.h"
+#include "../content/colours.hh"
 #include "config.h"
 #include "setting.hh"
 
diff --git a/src/lua/fonts.cc b/src/lua/fonts.cc
index 0cfadba4e..501ea308f 100644
--- a/src/lua/fonts.cc
+++ b/src/lua/fonts.cc
@@ -28,9 +28,9 @@
  */
 
 #include "fonts.h"
-#include "display-output.hh"
-#include "gui.h"
-#include "logging.h"
+#include "../output/display-output.hh"
+#include "../output/gui.h"
+#include "../logging.h"
 
 unsigned int selected_font = 0;
 std::vector<font_list> fonts;
diff --git a/src/lua/fonts.h b/src/lua/fonts.h
index fde446761..0e2deeb19 100644
--- a/src/lua/fonts.h
+++ b/src/lua/fonts.h
@@ -31,7 +31,7 @@
 
 #include <vector>
 
-#include "conky.h"
+#include "../conky.h"
 
 /* for fonts */
 struct font_list {
diff --git a/src/lua/llua.cc b/src/lua/llua.cc
index ab1516c09..f6557eb27 100644
--- a/src/lua/llua.cc
+++ b/src/lua/llua.cc
@@ -23,21 +23,21 @@
 #include "config.h"
 
 #include "build.h"
-#include "conky.h"
-#include "geometry.h"
+#include "../conky.h"
+#include "../geometry.h"
 #include "llua.h"
-#include "logging.h"
+#include "../logging.h"
 
 #ifdef BUILD_GUI
-#include "gui.h"
+#include "../output/gui.h"
 
 #ifdef BUILD_X11
 #include "x11-settings.h"
-#include "x11.h"
+#include "../output/x11.h"
 #endif /* BUILD_X11 */
 
 #ifdef BUILD_MOUSE_EVENTS
-#include "mouse-events.h"
+#include "../mouse-events.h"
 #endif /* BUILD_MOUSE_EVENTS */
 #endif /* BUILD_GUI */
 
diff --git a/src/lua/llua.h b/src/lua/llua.h
index f901ba082..282f035aa 100644
--- a/src/lua/llua.h
+++ b/src/lua/llua.h
@@ -31,10 +31,10 @@ extern "C" {
 }
 
 #include <config.h>
-#include "geometry.h"
+#include "../geometry.h"
 
 #ifdef BUILD_MOUSE_EVENTS
-#include "mouse-events.h"
+#include "../mouse-events.h"
 #endif /* BUILD_MOUSE_EVENTS */
 
 #define LUAPREFIX "conky_"
diff --git a/src/lua/lua-config.cc b/src/lua/lua-config.cc
index b05ee4e56..2da47e59f 100644
--- a/src/lua/lua-config.cc
+++ b/src/lua/lua-config.cc
@@ -24,7 +24,7 @@
 
 #include "lua-config.hh"
 
-#include "data-source.hh"
+#include "../data/data-source.hh"
 #include "setting.hh"
 
 namespace conky {
diff --git a/src/lua/setting.hh b/src/lua/setting.hh
index 195dccbbd..c964ace6e 100644
--- a/src/lua/setting.hh
+++ b/src/lua/setting.hh
@@ -27,7 +27,7 @@
 #include <string>
 #include <type_traits>
 
-#include "logging.h"
+#include "../logging.h"
 #include "luamm.hh"
 
 namespace conky {
diff --git a/src/lua/x11-settings.cc b/src/lua/x11-settings.cc
index 63e971b42..930786080 100644
--- a/src/lua/x11-settings.cc
+++ b/src/lua/x11-settings.cc
@@ -1,8 +1,8 @@
 #include "x11-settings.h"
 
-#include "x11.h"
+#include "../output/x11.h"
 
-#include "conky-imlib2.h"
+#include "../conky-imlib2.h"
 
 #include <X11/Xlib.h>
 
diff --git a/src/main.cc b/src/main.cc
index b7a8545fe..2a557100b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -33,31 +33,31 @@
 #include "build.h"
 #include "config.h"
 #include "conky.h"
-#include "display-output.hh"
-#include "lua-config.hh"
+#include "output/display-output.hh"
+#include "lua/lua-config.hh"
 
 #ifdef BUILD_X11
-#include "x11.h"
+#include "output/x11.h"
 #endif /* BUILD_X11 */
 
 #ifdef BUILD_CURL
-#include "ccurl_thread.h"
+#include "data/network/ccurl_thread.h"
 #endif /* BUILD_CURL */
 
 #if defined(__linux__)
-#include "linux.h"
+#include "data/os/linux.h"
 #endif /* Linux */
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#include "freebsd.h"
+#include "data/os/freebsd.h"
 #endif /* FreeBSD */
 
 #if defined(__NetBSD__)
-#include "netbsd.h"
+#include "data/os/netbsd.h"
 #endif /* NetBSD */
 
 #if defined(__HAIKU__)
-#include "haiku.h"
+#include "data/os/haiku.h"
 #endif /* Haiku */
 
 #ifdef BUILD_BUILTIN_CONFIG
diff --git a/src/output/display-console.cc b/src/output/display-console.cc
index 0a0898091..293cfff4a 100644
--- a/src/output/display-console.cc
+++ b/src/output/display-console.cc
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "conky.h"
+#include "../conky.h"
 #include "display-console.hh"
 #include "nc.h"
 
diff --git a/src/output/display-console.hh b/src/output/display-console.hh
index d366c1220..e977a0bc9 100644
--- a/src/output/display-console.hh
+++ b/src/output/display-console.hh
@@ -28,7 +28,7 @@
 #include <type_traits>
 
 #include "display-output.hh"
-#include "luamm.hh"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/display-file.cc b/src/output/display-file.cc
index aed6a6c39..af7809205 100644
--- a/src/output/display-file.cc
+++ b/src/output/display-file.cc
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "conky.h"
+#include "../conky.h"
 #include "display-file.hh"
 #include "nc.h"
 
diff --git a/src/output/display-file.hh b/src/output/display-file.hh
index bc6437291..901cbdc8b 100644
--- a/src/output/display-file.hh
+++ b/src/output/display-file.hh
@@ -28,7 +28,7 @@
 #include <type_traits>
 
 #include "display-output.hh"
-#include "luamm.hh"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/display-http.cc b/src/output/display-http.cc
index c93e8e6b5..cb6d0fadb 100644
--- a/src/output/display-http.cc
+++ b/src/output/display-http.cc
@@ -26,7 +26,7 @@
 
 #include <config.h>
 
-#include "conky.h"
+#include "../conky.h"
 #include "display-http.hh"
 
 #include <iostream>
diff --git a/src/output/display-http.hh b/src/output/display-http.hh
index 300028600..36b241c76 100644
--- a/src/output/display-http.hh
+++ b/src/output/display-http.hh
@@ -30,7 +30,7 @@
 #include <type_traits>
 
 #include "display-output.hh"
-#include "luamm.hh"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/display-ncurses.cc b/src/output/display-ncurses.cc
index 05f854035..87d4dc535 100644
--- a/src/output/display-ncurses.cc
+++ b/src/output/display-ncurses.cc
@@ -26,8 +26,8 @@
 
 #include <config.h>
 
-#include "colours.h"
-#include "conky.h"
+#include "../conky.h"
+#include "../content/colours.hh"
 #include "display-ncurses.hh"
 #include "gui.h"
 #include "nc.h"
diff --git a/src/output/display-ncurses.hh b/src/output/display-ncurses.hh
index 2d1c1a0b8..619939b92 100644
--- a/src/output/display-ncurses.hh
+++ b/src/output/display-ncurses.hh
@@ -29,9 +29,9 @@
 #include <string>
 #include <type_traits>
 
-#include "colours.h"
+#include "../content/colours.hh"
+#include "../lua/luamm.hh"
 #include "display-console.hh"
-#include "luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/display-output.hh b/src/output/display-output.hh
index 55cc83b61..8d5bfe80c 100644
--- a/src/output/display-output.hh
+++ b/src/output/display-output.hh
@@ -30,9 +30,9 @@
 #include <type_traits>
 #include <vector>
 
-#include "colours.h"
-#include "logging.h"
-#include "luamm.hh"
+#include "../content/colours.hh"
+#include "../logging.h"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/display-wayland.cc b/src/output/display-wayland.cc
index f7c7a5009..c98fc15a5 100644
--- a/src/output/display-wayland.cc
+++ b/src/output/display-wayland.cc
@@ -47,19 +47,19 @@
 #include <iostream>
 #include <sstream>
 
-#include "conky.h"
+#include "../conky.h"
 #include "display-output.hh"
-#include "geometry.h"
+#include "../geometry.h"
 #include "gui.h"
-#include "llua.h"
-#include "logging.h"
+#include "../lua/llua.h"
+#include "../logging.h"
 
-#include "fonts.h"
+#include "../lua/fonts.h"
 
 #ifdef BUILD_MOUSE_EVENTS
 #include <array>
 #include <map>
-#include "mouse-events.h"
+#include "../mouse-events.h"
 #endif
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
diff --git a/src/output/display-wayland.hh b/src/output/display-wayland.hh
index 0cc2098b4..d8dfbbf03 100644
--- a/src/output/display-wayland.hh
+++ b/src/output/display-wayland.hh
@@ -29,9 +29,9 @@
 #include <string>
 #include <type_traits>
 
-#include "colours.h"
+#include "../content/colours.hh"
+#include "../lua/luamm.hh"
 #include "display-output.hh"
-#include "luamm.hh"
 #include "wl.h"
 
 namespace conky {
diff --git a/src/output/display-x11.cc b/src/output/display-x11.cc
index 1f0e74199..1e3a58068 100644
--- a/src/output/display-x11.cc
+++ b/src/output/display-x11.cc
@@ -39,12 +39,12 @@
 #ifdef BUILD_XDAMAGE
 #include <X11/extensions/Xdamage.h>
 #endif /* BUILD_XDAMAGE */
-#include "fonts.h"
+#include "../lua/fonts.h"
 #ifdef BUILD_IMLIB2
-#include "conky-imlib2.h"
+#include "../conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #if defined(BUILD_MOUSE_EVENTS) || defined(BUILD_XINPUT)
-#include "mouse-events.h"
+#include "../mouse-events.h"
 #endif /* BUILD_MOUSE_EVENTS || BUILD_XINPUT */
 #ifdef BUILD_XINPUT
 #include <X11/extensions/XI2.h>
@@ -61,14 +61,14 @@
 #include <unordered_map>
 #include <vector>
 
-#include "colours.h"
-#include "conky.h"
-#include "geometry.h"
+#include "../conky.h"
+#include "../content/colours.hh"
+#include "../geometry.h"
+#include "../logging.h"
+#include "../lua/llua.h"
 #include "gui.h"
-#include "llua.h"
-#include "logging.h"
 
-#include "x11-settings.h"
+#include "../lua/x11-settings.h"
 #include "x11.h"
 
 // TODO: cleanup externs (move to conky.h ?)
diff --git a/src/output/display-x11.hh b/src/output/display-x11.hh
index c48373973..58379195e 100644
--- a/src/output/display-x11.hh
+++ b/src/output/display-x11.hh
@@ -30,7 +30,7 @@
 #include <type_traits>
 
 #include "display-output.hh"
-#include "luamm.hh"
+#include "../lua/luamm.hh"
 
 namespace conky {
 
diff --git a/src/output/gui.cc b/src/output/gui.cc
index f73265d0a..7e063736b 100644
--- a/src/output/gui.cc
+++ b/src/output/gui.cc
@@ -27,14 +27,13 @@
  *
  */
 #include "gui.h"
-#include "colour-settings.h"
-#include "common.h"
+#include "../common.h"
 #include "config.h"
-#include "conky.h"
-#include "logging.h"
+#include "../conky.h"
+#include "../logging.h"
 
 #ifdef BUILD_X11
-#include "x11-settings.h"
+#include "../lua/x11-settings.h"
 #endif /* BUILD_X11 */
 
 #ifdef BUILD_WAYLAND
@@ -42,7 +41,7 @@
 #endif /* BUILD_WAYLAND */
 
 // #ifdef BUILD_IMLIB2
-// #include "conky-imlib2.h"
+// #include "../conky-imlib2.h"
 // #endif /* BUILD_IMLIB2 */
 #ifndef OWN_WINDOW
 #include <iostream>
diff --git a/src/output/gui.h b/src/output/gui.h
index 98ffaf5a8..6ae1d5322 100644
--- a/src/output/gui.h
+++ b/src/output/gui.h
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
-#include "geometry.h"
-#include "setting.hh"
+#include "../geometry.h"
+#include "../lua/setting.hh"
 
-#include "colour-settings.h"
+#include "../lua/colour-settings.hh"
 
 /// @brief Represents alignment on a single axis.
 enum class axis_align : uint8_t {
diff --git a/src/output/nc.h b/src/output/nc.h
index ee4030c1b..1d2f5fe7b 100644
--- a/src/output/nc.h
+++ b/src/output/nc.h
@@ -32,7 +32,7 @@
 
 #include <ncurses.h>
 
-#include "setting.hh"
+#include "../lua/setting.hh"
 
 #ifdef LEAKFREE_NCURSES
 extern "C" {
diff --git a/src/output/wl.cc b/src/output/wl.cc
index d5487cea2..1ddac006f 100644
--- a/src/output/wl.cc
+++ b/src/output/wl.cc
@@ -30,7 +30,7 @@
 #include <config.h>
 #include <cstring>
 
-#include "conky.h"
+#include "../conky.h"
 #include "wl.h"
 
 #ifdef BUILD_WAYLAND
diff --git a/src/output/wl.h b/src/output/wl.h
index 6123680dd..e693e27bf 100644
--- a/src/output/wl.h
+++ b/src/output/wl.h
@@ -38,7 +38,7 @@
 
 #include <wayland-client.h>
 
-#include "setting.hh"
+#include "../lua/setting.hh"
 
 namespace priv {
 class out_to_wayland_setting : public conky::simple_config_setting<bool> {
diff --git a/src/output/x11-color.cc b/src/output/x11-color.cc
index fa081abf7..08d7a0fe6 100644
--- a/src/output/x11-color.cc
+++ b/src/output/x11-color.cc
@@ -1,4 +1,4 @@
-#include "colours.h"
+#include "../content/colours.hh"
 
 #include <X11/Xlib.h>
 
diff --git a/src/output/x11.cc b/src/output/x11.cc
index db6c7a5ac..88c5209c4 100644
--- a/src/output/x11.cc
+++ b/src/output/x11.cc
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include "x11-settings.h"
+#include "../lua/x11-settings.h"
 #include "x11.h"
 
 #include <X11/X.h>
@@ -38,14 +38,14 @@
 #undef max
 #include <sys/types.h>
 
-#include "common.h"
-#include "conky.h"
-#include "geometry.h"
+#include "../common.h"
+#include "../conky.h"
+#include "../geometry.h"
 #include "gui.h"
-#include "logging.h"
+#include "../logging.h"
 
 #ifdef BUILD_XINPUT
-#include "mouse-events.h"
+#include "../mouse-events.h"
 
 #include <vector>
 #endif
@@ -75,7 +75,7 @@ extern "C" {
 #include <X11/Xutil.h>
 
 #ifdef BUILD_IMLIB2
-#include "conky-imlib2.h"
+#include "../conky-imlib2.h"
 #endif /* BUILD_IMLIB2 */
 #ifdef BUILD_XFT
 #include <X11/Xft/Xft.h>
diff --git a/src/output/x11.h b/src/output/x11.h
index 7108cfc41..02dc17bc0 100644
--- a/src/output/x11.h
+++ b/src/output/x11.h
@@ -49,9 +49,9 @@
 #include <vector>
 
 // TODO: remove lua requirement from x11_init_window
-#include "llua.h"
+#include "../lua/llua.h"
 
-#include "geometry.h"
+#include "../geometry.h"
 #include "gui.h"
 
 /* true if use_argb_visual=true and argb visual was found*/
diff --git a/tests/test-algebra.cc b/tests/test-algebra.cc
index fcd0d48f9..6f7c787bc 100644
--- a/tests/test-algebra.cc
+++ b/tests/test-algebra.cc
@@ -1,6 +1,6 @@
 #include "catch2/catch.hpp"
 
-#include <algebra.h>
+#include <content/algebra.h>
 #include <config.h>
 
 TEST_CASE("GetMatchTypeTest - ValidOperators") {
diff --git a/tests/test-colours.cc b/tests/test-colours.cc
index 886f13b89..ecd319138 100644
--- a/tests/test-colours.cc
+++ b/tests/test-colours.cc
@@ -1,6 +1,6 @@
 #include "catch2/catch.hpp"
 
-#include <colours.h>
+#include <content/colours.hh>
 #include <config.h>
 
 TEST_CASE("parse_color correctly parses colours", "[colours][parse_color]") {
diff --git a/tests/test-conky.cc b/tests/test-conky.cc
index a1d841b0c..685a56123 100644
--- a/tests/test-conky.cc
+++ b/tests/test-conky.cc
@@ -27,8 +27,9 @@
  */
 
 #include "catch2/catch.hpp"
-#include "conky.h"
-#include "lua-config.hh"
+
+#include <conky.h>
+#include <lua/lua-config.hh>
 
 TEST_CASE("Expressions can be evaluated", "[evaluate]") {
   state = std::make_unique<lua::state>();
diff --git a/tests/test-darwin.cc b/tests/test-darwin.cc
index b598706d4..96cdc62e6 100644
--- a/tests/test-darwin.cc
+++ b/tests/test-darwin.cc
@@ -28,7 +28,7 @@
 
 #include "catch2/catch.hpp"
 
-#include <darwin.h>
+#include <data/os/darwin.h>
 
 TEST_CASE("get_entropy_avail returns 1", "[get_entropy_avail]") {
   unsigned int unused = 0;
diff --git a/tests/test-diskio.cc b/tests/test-diskio.cc
index e5312834c..d094e6cf9 100644
--- a/tests/test-diskio.cc
+++ b/tests/test-diskio.cc
@@ -30,7 +30,7 @@
 
 #include <config.h>
 #include <conky.h>
-#include <diskio.h>
+#include <data/hardware/diskio.h>
 
 #if BUILD_X11
 TEST_CASE("diskiographval returns correct value") {
diff --git a/tests/test-fs.cc b/tests/test-fs.cc
index 5533f807c..977d8fbc2 100644
--- a/tests/test-fs.cc
+++ b/tests/test-fs.cc
@@ -28,7 +28,7 @@
 
 #include "catch2/catch.hpp"
 
-#include <fs.h>
+#include <data/fs.h>
 
 TEST_CASE("fs_free_percentage returns correct value") {
   struct text_object obj;
diff --git a/tests/test-gradient.cc b/tests/test-gradient.cc
index fee3247ac..40812d387 100644
--- a/tests/test-gradient.cc
+++ b/tests/test-gradient.cc
@@ -28,9 +28,9 @@
 
 #include "catch2/catch.hpp"
 
-#include <colours.h>
 #include <conky.h>
-#include <gradient.h>
+#include <content/colours.hh>
+#include <content/gradient.hh>
 
 #include <iomanip>
 #include <iostream>
diff --git a/tests/test-graph.cc b/tests/test-graph.cc
index 4478b001d..84b34437a 100644
--- a/tests/test-graph.cc
+++ b/tests/test-graph.cc
@@ -28,9 +28,10 @@
 
 #include <tuple>
 #include "catch2/catch.hpp"
-#include "conky.h"
-#include "lua-config.hh"
-#include "specials.h"
+
+#include <conky.h>
+#include <content/specials.h>
+#include <lua/lua-config.hh>
 
 #ifdef BUILD_GUI
 
diff --git a/tests/test-linux.cc b/tests/test-linux.cc
index 79ef45238..a3b0b787d 100644
--- a/tests/test-linux.cc
+++ b/tests/test-linux.cc
@@ -28,7 +28,7 @@
 
 #include "catch2/catch.hpp"
 
-#include <linux.h>
+#include <data/os/linux.h>
 
 TEST_CASE("get_entropy_avail returns 0", "[get_entropy_avail]") {
   unsigned int unused = 0;