From 0499a7e2a60c64af9de9a24922fb5edce765f567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tin=20=C5=A0vagelj?= Date: Mon, 16 Dec 2024 07:55:40 +0100 Subject: [PATCH] Move sources into appropriate subdirectories (#2119) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part 1 of refactor commit. This commit only renames the files to preserve git history. Signed-off-by: Tin Švagelj --- src/{ => content}/algebra.cc | 0 src/{ => content}/algebra.h | 0 src/{ => content}/colour-names-stub.hh | 2 +- src/{ => content}/colours.cc | 0 src/{colours.h => content/colours.hh} | 0 src/{ => content}/combine.cc | 0 src/{ => content}/combine.h | 0 src/{ => content}/gradient.cc | 0 src/{gradient.h => content/gradient.hh} | 0 src/{ => content}/scroll.cc | 0 src/{ => content}/scroll.h | 0 src/{ => content}/specials.cc | 0 src/{ => content}/specials.h | 0 src/{ => content}/temphelper.cc | 0 src/{ => content}/temphelper.h | 0 src/{ => content}/template.cc | 0 src/{ => content}/template.h | 0 src/{ => content}/text_object.cc | 0 src/{ => content}/text_object.h | 0 src/{ => data/audio}/audacious.cc | 0 src/{ => data/audio}/audacious.h | 0 src/{ => data/audio}/cmus.cc | 0 src/{ => data/audio}/cmus.h | 0 src/{ => data/audio}/libmpdclient.cc | 0 src/{ => data/audio}/libmpdclient.h | 0 src/{ => data/audio}/mixer.cc | 0 src/{ => data/audio}/mixer.h | 0 src/{ => data/audio}/moc.cc | 0 src/{ => data/audio}/moc.h | 0 src/{ => data/audio}/mpd.cc | 0 src/{ => data/audio}/mpd.h | 0 src/{ => data/audio}/pulseaudio.cc | 0 src/{ => data/audio}/pulseaudio.h | 0 src/{ => data/audio}/xmms2.cc | 0 src/{ => data/audio}/xmms2.h | 0 src/{ => data}/darwin.h | 0 src/{ => data}/darwin.mm | 0 src/{ => data}/darwin_sip.h | 0 src/{ => data}/data-source.cc | 0 src/{ => data}/data-source.hh | 0 src/{ => data}/entropy.cc | 0 src/{ => data}/entropy.h | 0 src/{ => data}/exec.cc | 0 src/{ => data}/exec.h | 0 src/{ => data}/fs.cc | 0 src/{ => data}/fs.h | 0 src/{ => data/hardware}/apcupsd.cc | 0 src/{ => data/hardware}/apcupsd.h | 0 src/{ => data/hardware}/bsdapm.cc | 0 src/{ => data/hardware}/bsdapm.h | 0 src/{ => data/hardware}/cpu.cc | 0 src/{ => data/hardware}/cpu.h | 0 src/{ => data/hardware}/diskio.cc | 0 src/{ => data/hardware}/diskio.h | 0 src/{ => data/hardware}/hddtemp.cc | 0 src/{ => data/hardware}/hddtemp.h | 0 src/{ => data/hardware}/i8k.cc | 0 src/{ => data/hardware}/i8k.h | 0 src/{ => data/hardware}/ibm.cc | 0 src/{ => data/hardware}/ibm.h | 0 src/{ => data/hardware}/intel_backlight.cc | 0 src/{ => data/hardware}/intel_backlight.h | 0 src/{ => data/hardware}/nvidia.cc | 0 src/{ => data/hardware}/nvidia.h | 0 src/{ => data/hardware}/smapi.cc | 0 src/{ => data/hardware}/smapi.h | 0 src/{ => data/hardware}/sony.cc | 0 src/{ => data/hardware}/sony.h | 0 src/{ => data}/ical.cc | 0 src/{ => data}/ical.h | 0 src/{ => data}/iconv_tools.cc | 0 src/{ => data}/iconv_tools.h | 0 src/{ => data}/misc.cc | 0 src/{ => data}/misc.h | 0 src/{ => data}/mysql.cc | 0 src/{ => data}/mysql.h | 0 src/{ => data/network}/ccurl_thread.cc | 0 src/{ => data/network}/ccurl_thread.h | 0 src/{ => data/network}/irc.cc | 0 src/{ => data/network}/irc.h | 0 src/{ => data/network}/libtcp-portmon.cc | 0 src/{ => data/network}/libtcp-portmon.h | 0 src/{ => data/network}/mail.cc | 0 src/{ => data/network}/mail.h | 0 src/{ => data/network}/mboxscan.cc | 0 src/{ => data/network}/mboxscan.h | 0 src/{ => data/network}/net_stat.cc | 0 src/{ => data/network}/net_stat.h | 0 src/{ => data/network}/prss.cc | 0 src/{ => data/network}/prss.h | 0 src/{ => data/network}/read_tcpip.cc | 0 src/{ => data/network}/read_tcpip.h | 0 src/{ => data/network}/rss.cc | 0 src/{ => data/network}/rss.h | 0 src/{ => data/network}/tcp-portmon.cc | 0 src/{ => data/network}/tcp-portmon.h | 0 src/{ => data/os}/bsdcommon.cc | 0 src/{ => data/os}/bsdcommon.h | 0 src/{ => data/os}/dragonfly.cc | 0 src/{ => data/os}/dragonfly.h | 0 src/{ => data/os}/freebsd.cc | 0 src/{ => data/os}/freebsd.h | 0 src/{ => data/os}/haiku.cc | 0 src/{ => data/os}/haiku.h | 0 src/{ => data/os}/journal.cc | 0 src/{ => data/os}/journal.h | 0 src/{ => data/os}/linux.cc | 0 src/{ => data/os}/linux.h | 0 src/{ => data/os}/netbsd.cc | 0 src/{ => data/os}/netbsd.h | 0 src/{ => data/os}/openbsd.cc | 0 src/{ => data/os}/openbsd.h | 0 src/{ => data/os}/solaris.cc | 0 src/{ => data/os}/solaris.h | 0 src/{ => data}/proc.cc | 0 src/{ => data}/proc.h | 0 src/{ => data}/tailhead.cc | 0 src/{ => data}/tailhead.h | 0 src/{ => data}/timeinfo.cc | 0 src/{ => data}/timeinfo.h | 0 src/{ => data}/top.cc | 0 src/{ => data}/top.h | 0 src/{ => data}/user.cc | 0 src/{ => data}/user.h | 0 src/{ => data}/users.cc | 0 src/{ => data}/users.h | 0 src/{ => lua}/colour-settings.cc | 0 src/{colour-settings.h => lua/colour-settings.hh} | 0 src/{ => lua}/fonts.cc | 0 src/{ => lua}/fonts.h | 0 src/{ => lua}/llua.cc | 0 src/{ => lua}/llua.h | 0 src/{ => lua}/lua-config.cc | 0 src/{ => lua}/lua-config.hh | 0 src/{ => lua}/luamm.cc | 0 src/{ => lua}/luamm.hh | 0 src/{ => lua}/setting.cc | 0 src/{ => lua}/setting.hh | 0 src/{ => lua}/x11-settings.cc | 0 src/{ => lua}/x11-settings.h | 0 src/{ => output}/display-console.cc | 0 src/{ => output}/display-console.hh | 0 src/{ => output}/display-file.cc | 0 src/{ => output}/display-file.hh | 0 src/{ => output}/display-http.cc | 0 src/{ => output}/display-http.hh | 0 src/{ => output}/display-ncurses.cc | 0 src/{ => output}/display-ncurses.hh | 0 src/{ => output}/display-output.cc | 0 src/{ => output}/display-output.hh | 0 src/{ => output}/display-wayland.cc | 0 src/{ => output}/display-wayland.hh | 0 src/{ => output}/display-x11.cc | 0 src/{ => output}/display-x11.hh | 0 src/{ => output}/gui.cc | 0 src/{ => output}/gui.h | 0 src/{ => output}/nc.cc | 0 src/{ => output}/nc.h | 0 src/{ => output}/wl.cc | 0 src/{ => output}/wl.h | 0 src/{ => output}/x11-color.cc | 0 src/{ => output}/x11.cc | 0 src/{ => output}/x11.h | 0 163 files changed, 1 insertion(+), 1 deletion(-) rename src/{ => content}/algebra.cc (100%) rename src/{ => content}/algebra.h (100%) rename src/{ => content}/colour-names-stub.hh (92%) rename src/{ => content}/colours.cc (100%) rename src/{colours.h => content/colours.hh} (100%) rename src/{ => content}/combine.cc (100%) rename src/{ => content}/combine.h (100%) rename src/{ => content}/gradient.cc (100%) rename src/{gradient.h => content/gradient.hh} (100%) rename src/{ => content}/scroll.cc (100%) rename src/{ => content}/scroll.h (100%) rename src/{ => content}/specials.cc (100%) rename src/{ => content}/specials.h (100%) rename src/{ => content}/temphelper.cc (100%) rename src/{ => content}/temphelper.h (100%) rename src/{ => content}/template.cc (100%) rename src/{ => content}/template.h (100%) rename src/{ => content}/text_object.cc (100%) rename src/{ => content}/text_object.h (100%) rename src/{ => data/audio}/audacious.cc (100%) rename src/{ => data/audio}/audacious.h (100%) rename src/{ => data/audio}/cmus.cc (100%) rename src/{ => data/audio}/cmus.h (100%) rename src/{ => data/audio}/libmpdclient.cc (100%) rename src/{ => data/audio}/libmpdclient.h (100%) rename src/{ => data/audio}/mixer.cc (100%) rename src/{ => data/audio}/mixer.h (100%) rename src/{ => data/audio}/moc.cc (100%) rename src/{ => data/audio}/moc.h (100%) rename src/{ => data/audio}/mpd.cc (100%) rename src/{ => data/audio}/mpd.h (100%) rename src/{ => data/audio}/pulseaudio.cc (100%) rename src/{ => data/audio}/pulseaudio.h (100%) rename src/{ => data/audio}/xmms2.cc (100%) rename src/{ => data/audio}/xmms2.h (100%) rename src/{ => data}/darwin.h (100%) rename src/{ => data}/darwin.mm (100%) rename src/{ => data}/darwin_sip.h (100%) rename src/{ => data}/data-source.cc (100%) rename src/{ => data}/data-source.hh (100%) rename src/{ => data}/entropy.cc (100%) rename src/{ => data}/entropy.h (100%) rename src/{ => data}/exec.cc (100%) rename src/{ => data}/exec.h (100%) rename src/{ => data}/fs.cc (100%) rename src/{ => data}/fs.h (100%) rename src/{ => data/hardware}/apcupsd.cc (100%) rename src/{ => data/hardware}/apcupsd.h (100%) rename src/{ => data/hardware}/bsdapm.cc (100%) rename src/{ => data/hardware}/bsdapm.h (100%) rename src/{ => data/hardware}/cpu.cc (100%) rename src/{ => data/hardware}/cpu.h (100%) rename src/{ => data/hardware}/diskio.cc (100%) rename src/{ => data/hardware}/diskio.h (100%) rename src/{ => data/hardware}/hddtemp.cc (100%) rename src/{ => data/hardware}/hddtemp.h (100%) rename src/{ => data/hardware}/i8k.cc (100%) rename src/{ => data/hardware}/i8k.h (100%) rename src/{ => data/hardware}/ibm.cc (100%) rename src/{ => data/hardware}/ibm.h (100%) rename src/{ => data/hardware}/intel_backlight.cc (100%) rename src/{ => data/hardware}/intel_backlight.h (100%) rename src/{ => data/hardware}/nvidia.cc (100%) rename src/{ => data/hardware}/nvidia.h (100%) rename src/{ => data/hardware}/smapi.cc (100%) rename src/{ => data/hardware}/smapi.h (100%) rename src/{ => data/hardware}/sony.cc (100%) rename src/{ => data/hardware}/sony.h (100%) rename src/{ => data}/ical.cc (100%) rename src/{ => data}/ical.h (100%) rename src/{ => data}/iconv_tools.cc (100%) rename src/{ => data}/iconv_tools.h (100%) rename src/{ => data}/misc.cc (100%) rename src/{ => data}/misc.h (100%) rename src/{ => data}/mysql.cc (100%) rename src/{ => data}/mysql.h (100%) rename src/{ => data/network}/ccurl_thread.cc (100%) rename src/{ => data/network}/ccurl_thread.h (100%) rename src/{ => data/network}/irc.cc (100%) rename src/{ => data/network}/irc.h (100%) rename src/{ => data/network}/libtcp-portmon.cc (100%) rename src/{ => data/network}/libtcp-portmon.h (100%) rename src/{ => data/network}/mail.cc (100%) rename src/{ => data/network}/mail.h (100%) rename src/{ => data/network}/mboxscan.cc (100%) rename src/{ => data/network}/mboxscan.h (100%) rename src/{ => data/network}/net_stat.cc (100%) rename src/{ => data/network}/net_stat.h (100%) rename src/{ => data/network}/prss.cc (100%) rename src/{ => data/network}/prss.h (100%) rename src/{ => data/network}/read_tcpip.cc (100%) rename src/{ => data/network}/read_tcpip.h (100%) rename src/{ => data/network}/rss.cc (100%) rename src/{ => data/network}/rss.h (100%) rename src/{ => data/network}/tcp-portmon.cc (100%) rename src/{ => data/network}/tcp-portmon.h (100%) rename src/{ => data/os}/bsdcommon.cc (100%) rename src/{ => data/os}/bsdcommon.h (100%) rename src/{ => data/os}/dragonfly.cc (100%) rename src/{ => data/os}/dragonfly.h (100%) rename src/{ => data/os}/freebsd.cc (100%) rename src/{ => data/os}/freebsd.h (100%) rename src/{ => data/os}/haiku.cc (100%) rename src/{ => data/os}/haiku.h (100%) rename src/{ => data/os}/journal.cc (100%) rename src/{ => data/os}/journal.h (100%) rename src/{ => data/os}/linux.cc (100%) rename src/{ => data/os}/linux.h (100%) rename src/{ => data/os}/netbsd.cc (100%) rename src/{ => data/os}/netbsd.h (100%) rename src/{ => data/os}/openbsd.cc (100%) rename src/{ => data/os}/openbsd.h (100%) rename src/{ => data/os}/solaris.cc (100%) rename src/{ => data/os}/solaris.h (100%) rename src/{ => data}/proc.cc (100%) rename src/{ => data}/proc.h (100%) rename src/{ => data}/tailhead.cc (100%) rename src/{ => data}/tailhead.h (100%) rename src/{ => data}/timeinfo.cc (100%) rename src/{ => data}/timeinfo.h (100%) rename src/{ => data}/top.cc (100%) rename src/{ => data}/top.h (100%) rename src/{ => data}/user.cc (100%) rename src/{ => data}/user.h (100%) rename src/{ => data}/users.cc (100%) rename src/{ => data}/users.h (100%) rename src/{ => lua}/colour-settings.cc (100%) rename src/{colour-settings.h => lua/colour-settings.hh} (100%) rename src/{ => lua}/fonts.cc (100%) rename src/{ => lua}/fonts.h (100%) rename src/{ => lua}/llua.cc (100%) rename src/{ => lua}/llua.h (100%) rename src/{ => lua}/lua-config.cc (100%) rename src/{ => lua}/lua-config.hh (100%) rename src/{ => lua}/luamm.cc (100%) rename src/{ => lua}/luamm.hh (100%) rename src/{ => lua}/setting.cc (100%) rename src/{ => lua}/setting.hh (100%) rename src/{ => lua}/x11-settings.cc (100%) rename src/{ => lua}/x11-settings.h (100%) rename src/{ => output}/display-console.cc (100%) rename src/{ => output}/display-console.hh (100%) rename src/{ => output}/display-file.cc (100%) rename src/{ => output}/display-file.hh (100%) rename src/{ => output}/display-http.cc (100%) rename src/{ => output}/display-http.hh (100%) rename src/{ => output}/display-ncurses.cc (100%) rename src/{ => output}/display-ncurses.hh (100%) rename src/{ => output}/display-output.cc (100%) rename src/{ => output}/display-output.hh (100%) rename src/{ => output}/display-wayland.cc (100%) rename src/{ => output}/display-wayland.hh (100%) rename src/{ => output}/display-x11.cc (100%) rename src/{ => output}/display-x11.hh (100%) rename src/{ => output}/gui.cc (100%) rename src/{ => output}/gui.h (100%) rename src/{ => output}/nc.cc (100%) rename src/{ => output}/nc.h (100%) rename src/{ => output}/wl.cc (100%) rename src/{ => output}/wl.h (100%) rename src/{ => output}/x11-color.cc (100%) rename src/{ => output}/x11.cc (100%) rename src/{ => output}/x11.h (100%) diff --git a/src/algebra.cc b/src/content/algebra.cc similarity index 100% rename from src/algebra.cc rename to src/content/algebra.cc diff --git a/src/algebra.h b/src/content/algebra.h similarity index 100% rename from src/algebra.h rename to src/content/algebra.h diff --git a/src/colour-names-stub.hh b/src/content/colour-names-stub.hh similarity index 92% rename from src/colour-names-stub.hh rename to src/content/colour-names-stub.hh index 7008d07658..62cf6926fa 100644 --- a/src/colour-names-stub.hh +++ b/src/content/colour-names-stub.hh @@ -23,6 +23,6 @@ class color_name_hash { }; const struct rgb *color_name_hash::in_word_set(const char *str, size_t len) { - DBGP2("color parsing not supported"); + NORM_ERR("color parsing not supported"); return nullptr; } diff --git a/src/colours.cc b/src/content/colours.cc similarity index 100% rename from src/colours.cc rename to src/content/colours.cc diff --git a/src/colours.h b/src/content/colours.hh similarity index 100% rename from src/colours.h rename to src/content/colours.hh diff --git a/src/combine.cc b/src/content/combine.cc similarity index 100% rename from src/combine.cc rename to src/content/combine.cc diff --git a/src/combine.h b/src/content/combine.h similarity index 100% rename from src/combine.h rename to src/content/combine.h diff --git a/src/gradient.cc b/src/content/gradient.cc similarity index 100% rename from src/gradient.cc rename to src/content/gradient.cc diff --git a/src/gradient.h b/src/content/gradient.hh similarity index 100% rename from src/gradient.h rename to src/content/gradient.hh diff --git a/src/scroll.cc b/src/content/scroll.cc similarity index 100% rename from src/scroll.cc rename to src/content/scroll.cc diff --git a/src/scroll.h b/src/content/scroll.h similarity index 100% rename from src/scroll.h rename to src/content/scroll.h diff --git a/src/specials.cc b/src/content/specials.cc similarity index 100% rename from src/specials.cc rename to src/content/specials.cc diff --git a/src/specials.h b/src/content/specials.h similarity index 100% rename from src/specials.h rename to src/content/specials.h diff --git a/src/temphelper.cc b/src/content/temphelper.cc similarity index 100% rename from src/temphelper.cc rename to src/content/temphelper.cc diff --git a/src/temphelper.h b/src/content/temphelper.h similarity index 100% rename from src/temphelper.h rename to src/content/temphelper.h diff --git a/src/template.cc b/src/content/template.cc similarity index 100% rename from src/template.cc rename to src/content/template.cc diff --git a/src/template.h b/src/content/template.h similarity index 100% rename from src/template.h rename to src/content/template.h diff --git a/src/text_object.cc b/src/content/text_object.cc similarity index 100% rename from src/text_object.cc rename to src/content/text_object.cc diff --git a/src/text_object.h b/src/content/text_object.h similarity index 100% rename from src/text_object.h rename to src/content/text_object.h diff --git a/src/audacious.cc b/src/data/audio/audacious.cc similarity index 100% rename from src/audacious.cc rename to src/data/audio/audacious.cc diff --git a/src/audacious.h b/src/data/audio/audacious.h similarity index 100% rename from src/audacious.h rename to src/data/audio/audacious.h diff --git a/src/cmus.cc b/src/data/audio/cmus.cc similarity index 100% rename from src/cmus.cc rename to src/data/audio/cmus.cc diff --git a/src/cmus.h b/src/data/audio/cmus.h similarity index 100% rename from src/cmus.h rename to src/data/audio/cmus.h diff --git a/src/libmpdclient.cc b/src/data/audio/libmpdclient.cc similarity index 100% rename from src/libmpdclient.cc rename to src/data/audio/libmpdclient.cc diff --git a/src/libmpdclient.h b/src/data/audio/libmpdclient.h similarity index 100% rename from src/libmpdclient.h rename to src/data/audio/libmpdclient.h diff --git a/src/mixer.cc b/src/data/audio/mixer.cc similarity index 100% rename from src/mixer.cc rename to src/data/audio/mixer.cc diff --git a/src/mixer.h b/src/data/audio/mixer.h similarity index 100% rename from src/mixer.h rename to src/data/audio/mixer.h diff --git a/src/moc.cc b/src/data/audio/moc.cc similarity index 100% rename from src/moc.cc rename to src/data/audio/moc.cc diff --git a/src/moc.h b/src/data/audio/moc.h similarity index 100% rename from src/moc.h rename to src/data/audio/moc.h diff --git a/src/mpd.cc b/src/data/audio/mpd.cc similarity index 100% rename from src/mpd.cc rename to src/data/audio/mpd.cc diff --git a/src/mpd.h b/src/data/audio/mpd.h similarity index 100% rename from src/mpd.h rename to src/data/audio/mpd.h diff --git a/src/pulseaudio.cc b/src/data/audio/pulseaudio.cc similarity index 100% rename from src/pulseaudio.cc rename to src/data/audio/pulseaudio.cc diff --git a/src/pulseaudio.h b/src/data/audio/pulseaudio.h similarity index 100% rename from src/pulseaudio.h rename to src/data/audio/pulseaudio.h diff --git a/src/xmms2.cc b/src/data/audio/xmms2.cc similarity index 100% rename from src/xmms2.cc rename to src/data/audio/xmms2.cc diff --git a/src/xmms2.h b/src/data/audio/xmms2.h similarity index 100% rename from src/xmms2.h rename to src/data/audio/xmms2.h diff --git a/src/darwin.h b/src/data/darwin.h similarity index 100% rename from src/darwin.h rename to src/data/darwin.h diff --git a/src/darwin.mm b/src/data/darwin.mm similarity index 100% rename from src/darwin.mm rename to src/data/darwin.mm diff --git a/src/darwin_sip.h b/src/data/darwin_sip.h similarity index 100% rename from src/darwin_sip.h rename to src/data/darwin_sip.h diff --git a/src/data-source.cc b/src/data/data-source.cc similarity index 100% rename from src/data-source.cc rename to src/data/data-source.cc diff --git a/src/data-source.hh b/src/data/data-source.hh similarity index 100% rename from src/data-source.hh rename to src/data/data-source.hh diff --git a/src/entropy.cc b/src/data/entropy.cc similarity index 100% rename from src/entropy.cc rename to src/data/entropy.cc diff --git a/src/entropy.h b/src/data/entropy.h similarity index 100% rename from src/entropy.h rename to src/data/entropy.h diff --git a/src/exec.cc b/src/data/exec.cc similarity index 100% rename from src/exec.cc rename to src/data/exec.cc diff --git a/src/exec.h b/src/data/exec.h similarity index 100% rename from src/exec.h rename to src/data/exec.h diff --git a/src/fs.cc b/src/data/fs.cc similarity index 100% rename from src/fs.cc rename to src/data/fs.cc diff --git a/src/fs.h b/src/data/fs.h similarity index 100% rename from src/fs.h rename to src/data/fs.h diff --git a/src/apcupsd.cc b/src/data/hardware/apcupsd.cc similarity index 100% rename from src/apcupsd.cc rename to src/data/hardware/apcupsd.cc diff --git a/src/apcupsd.h b/src/data/hardware/apcupsd.h similarity index 100% rename from src/apcupsd.h rename to src/data/hardware/apcupsd.h diff --git a/src/bsdapm.cc b/src/data/hardware/bsdapm.cc similarity index 100% rename from src/bsdapm.cc rename to src/data/hardware/bsdapm.cc diff --git a/src/bsdapm.h b/src/data/hardware/bsdapm.h similarity index 100% rename from src/bsdapm.h rename to src/data/hardware/bsdapm.h diff --git a/src/cpu.cc b/src/data/hardware/cpu.cc similarity index 100% rename from src/cpu.cc rename to src/data/hardware/cpu.cc diff --git a/src/cpu.h b/src/data/hardware/cpu.h similarity index 100% rename from src/cpu.h rename to src/data/hardware/cpu.h diff --git a/src/diskio.cc b/src/data/hardware/diskio.cc similarity index 100% rename from src/diskio.cc rename to src/data/hardware/diskio.cc diff --git a/src/diskio.h b/src/data/hardware/diskio.h similarity index 100% rename from src/diskio.h rename to src/data/hardware/diskio.h diff --git a/src/hddtemp.cc b/src/data/hardware/hddtemp.cc similarity index 100% rename from src/hddtemp.cc rename to src/data/hardware/hddtemp.cc diff --git a/src/hddtemp.h b/src/data/hardware/hddtemp.h similarity index 100% rename from src/hddtemp.h rename to src/data/hardware/hddtemp.h diff --git a/src/i8k.cc b/src/data/hardware/i8k.cc similarity index 100% rename from src/i8k.cc rename to src/data/hardware/i8k.cc diff --git a/src/i8k.h b/src/data/hardware/i8k.h similarity index 100% rename from src/i8k.h rename to src/data/hardware/i8k.h diff --git a/src/ibm.cc b/src/data/hardware/ibm.cc similarity index 100% rename from src/ibm.cc rename to src/data/hardware/ibm.cc diff --git a/src/ibm.h b/src/data/hardware/ibm.h similarity index 100% rename from src/ibm.h rename to src/data/hardware/ibm.h diff --git a/src/intel_backlight.cc b/src/data/hardware/intel_backlight.cc similarity index 100% rename from src/intel_backlight.cc rename to src/data/hardware/intel_backlight.cc diff --git a/src/intel_backlight.h b/src/data/hardware/intel_backlight.h similarity index 100% rename from src/intel_backlight.h rename to src/data/hardware/intel_backlight.h diff --git a/src/nvidia.cc b/src/data/hardware/nvidia.cc similarity index 100% rename from src/nvidia.cc rename to src/data/hardware/nvidia.cc diff --git a/src/nvidia.h b/src/data/hardware/nvidia.h similarity index 100% rename from src/nvidia.h rename to src/data/hardware/nvidia.h diff --git a/src/smapi.cc b/src/data/hardware/smapi.cc similarity index 100% rename from src/smapi.cc rename to src/data/hardware/smapi.cc diff --git a/src/smapi.h b/src/data/hardware/smapi.h similarity index 100% rename from src/smapi.h rename to src/data/hardware/smapi.h diff --git a/src/sony.cc b/src/data/hardware/sony.cc similarity index 100% rename from src/sony.cc rename to src/data/hardware/sony.cc diff --git a/src/sony.h b/src/data/hardware/sony.h similarity index 100% rename from src/sony.h rename to src/data/hardware/sony.h diff --git a/src/ical.cc b/src/data/ical.cc similarity index 100% rename from src/ical.cc rename to src/data/ical.cc diff --git a/src/ical.h b/src/data/ical.h similarity index 100% rename from src/ical.h rename to src/data/ical.h diff --git a/src/iconv_tools.cc b/src/data/iconv_tools.cc similarity index 100% rename from src/iconv_tools.cc rename to src/data/iconv_tools.cc diff --git a/src/iconv_tools.h b/src/data/iconv_tools.h similarity index 100% rename from src/iconv_tools.h rename to src/data/iconv_tools.h diff --git a/src/misc.cc b/src/data/misc.cc similarity index 100% rename from src/misc.cc rename to src/data/misc.cc diff --git a/src/misc.h b/src/data/misc.h similarity index 100% rename from src/misc.h rename to src/data/misc.h diff --git a/src/mysql.cc b/src/data/mysql.cc similarity index 100% rename from src/mysql.cc rename to src/data/mysql.cc diff --git a/src/mysql.h b/src/data/mysql.h similarity index 100% rename from src/mysql.h rename to src/data/mysql.h diff --git a/src/ccurl_thread.cc b/src/data/network/ccurl_thread.cc similarity index 100% rename from src/ccurl_thread.cc rename to src/data/network/ccurl_thread.cc diff --git a/src/ccurl_thread.h b/src/data/network/ccurl_thread.h similarity index 100% rename from src/ccurl_thread.h rename to src/data/network/ccurl_thread.h diff --git a/src/irc.cc b/src/data/network/irc.cc similarity index 100% rename from src/irc.cc rename to src/data/network/irc.cc diff --git a/src/irc.h b/src/data/network/irc.h similarity index 100% rename from src/irc.h rename to src/data/network/irc.h diff --git a/src/libtcp-portmon.cc b/src/data/network/libtcp-portmon.cc similarity index 100% rename from src/libtcp-portmon.cc rename to src/data/network/libtcp-portmon.cc diff --git a/src/libtcp-portmon.h b/src/data/network/libtcp-portmon.h similarity index 100% rename from src/libtcp-portmon.h rename to src/data/network/libtcp-portmon.h diff --git a/src/mail.cc b/src/data/network/mail.cc similarity index 100% rename from src/mail.cc rename to src/data/network/mail.cc diff --git a/src/mail.h b/src/data/network/mail.h similarity index 100% rename from src/mail.h rename to src/data/network/mail.h diff --git a/src/mboxscan.cc b/src/data/network/mboxscan.cc similarity index 100% rename from src/mboxscan.cc rename to src/data/network/mboxscan.cc diff --git a/src/mboxscan.h b/src/data/network/mboxscan.h similarity index 100% rename from src/mboxscan.h rename to src/data/network/mboxscan.h diff --git a/src/net_stat.cc b/src/data/network/net_stat.cc similarity index 100% rename from src/net_stat.cc rename to src/data/network/net_stat.cc diff --git a/src/net_stat.h b/src/data/network/net_stat.h similarity index 100% rename from src/net_stat.h rename to src/data/network/net_stat.h diff --git a/src/prss.cc b/src/data/network/prss.cc similarity index 100% rename from src/prss.cc rename to src/data/network/prss.cc diff --git a/src/prss.h b/src/data/network/prss.h similarity index 100% rename from src/prss.h rename to src/data/network/prss.h diff --git a/src/read_tcpip.cc b/src/data/network/read_tcpip.cc similarity index 100% rename from src/read_tcpip.cc rename to src/data/network/read_tcpip.cc diff --git a/src/read_tcpip.h b/src/data/network/read_tcpip.h similarity index 100% rename from src/read_tcpip.h rename to src/data/network/read_tcpip.h diff --git a/src/rss.cc b/src/data/network/rss.cc similarity index 100% rename from src/rss.cc rename to src/data/network/rss.cc diff --git a/src/rss.h b/src/data/network/rss.h similarity index 100% rename from src/rss.h rename to src/data/network/rss.h diff --git a/src/tcp-portmon.cc b/src/data/network/tcp-portmon.cc similarity index 100% rename from src/tcp-portmon.cc rename to src/data/network/tcp-portmon.cc diff --git a/src/tcp-portmon.h b/src/data/network/tcp-portmon.h similarity index 100% rename from src/tcp-portmon.h rename to src/data/network/tcp-portmon.h diff --git a/src/bsdcommon.cc b/src/data/os/bsdcommon.cc similarity index 100% rename from src/bsdcommon.cc rename to src/data/os/bsdcommon.cc diff --git a/src/bsdcommon.h b/src/data/os/bsdcommon.h similarity index 100% rename from src/bsdcommon.h rename to src/data/os/bsdcommon.h diff --git a/src/dragonfly.cc b/src/data/os/dragonfly.cc similarity index 100% rename from src/dragonfly.cc rename to src/data/os/dragonfly.cc diff --git a/src/dragonfly.h b/src/data/os/dragonfly.h similarity index 100% rename from src/dragonfly.h rename to src/data/os/dragonfly.h diff --git a/src/freebsd.cc b/src/data/os/freebsd.cc similarity index 100% rename from src/freebsd.cc rename to src/data/os/freebsd.cc diff --git a/src/freebsd.h b/src/data/os/freebsd.h similarity index 100% rename from src/freebsd.h rename to src/data/os/freebsd.h diff --git a/src/haiku.cc b/src/data/os/haiku.cc similarity index 100% rename from src/haiku.cc rename to src/data/os/haiku.cc diff --git a/src/haiku.h b/src/data/os/haiku.h similarity index 100% rename from src/haiku.h rename to src/data/os/haiku.h diff --git a/src/journal.cc b/src/data/os/journal.cc similarity index 100% rename from src/journal.cc rename to src/data/os/journal.cc diff --git a/src/journal.h b/src/data/os/journal.h similarity index 100% rename from src/journal.h rename to src/data/os/journal.h diff --git a/src/linux.cc b/src/data/os/linux.cc similarity index 100% rename from src/linux.cc rename to src/data/os/linux.cc diff --git a/src/linux.h b/src/data/os/linux.h similarity index 100% rename from src/linux.h rename to src/data/os/linux.h diff --git a/src/netbsd.cc b/src/data/os/netbsd.cc similarity index 100% rename from src/netbsd.cc rename to src/data/os/netbsd.cc diff --git a/src/netbsd.h b/src/data/os/netbsd.h similarity index 100% rename from src/netbsd.h rename to src/data/os/netbsd.h diff --git a/src/openbsd.cc b/src/data/os/openbsd.cc similarity index 100% rename from src/openbsd.cc rename to src/data/os/openbsd.cc diff --git a/src/openbsd.h b/src/data/os/openbsd.h similarity index 100% rename from src/openbsd.h rename to src/data/os/openbsd.h diff --git a/src/solaris.cc b/src/data/os/solaris.cc similarity index 100% rename from src/solaris.cc rename to src/data/os/solaris.cc diff --git a/src/solaris.h b/src/data/os/solaris.h similarity index 100% rename from src/solaris.h rename to src/data/os/solaris.h diff --git a/src/proc.cc b/src/data/proc.cc similarity index 100% rename from src/proc.cc rename to src/data/proc.cc diff --git a/src/proc.h b/src/data/proc.h similarity index 100% rename from src/proc.h rename to src/data/proc.h diff --git a/src/tailhead.cc b/src/data/tailhead.cc similarity index 100% rename from src/tailhead.cc rename to src/data/tailhead.cc diff --git a/src/tailhead.h b/src/data/tailhead.h similarity index 100% rename from src/tailhead.h rename to src/data/tailhead.h diff --git a/src/timeinfo.cc b/src/data/timeinfo.cc similarity index 100% rename from src/timeinfo.cc rename to src/data/timeinfo.cc diff --git a/src/timeinfo.h b/src/data/timeinfo.h similarity index 100% rename from src/timeinfo.h rename to src/data/timeinfo.h diff --git a/src/top.cc b/src/data/top.cc similarity index 100% rename from src/top.cc rename to src/data/top.cc diff --git a/src/top.h b/src/data/top.h similarity index 100% rename from src/top.h rename to src/data/top.h diff --git a/src/user.cc b/src/data/user.cc similarity index 100% rename from src/user.cc rename to src/data/user.cc diff --git a/src/user.h b/src/data/user.h similarity index 100% rename from src/user.h rename to src/data/user.h diff --git a/src/users.cc b/src/data/users.cc similarity index 100% rename from src/users.cc rename to src/data/users.cc diff --git a/src/users.h b/src/data/users.h similarity index 100% rename from src/users.h rename to src/data/users.h diff --git a/src/colour-settings.cc b/src/lua/colour-settings.cc similarity index 100% rename from src/colour-settings.cc rename to src/lua/colour-settings.cc diff --git a/src/colour-settings.h b/src/lua/colour-settings.hh similarity index 100% rename from src/colour-settings.h rename to src/lua/colour-settings.hh diff --git a/src/fonts.cc b/src/lua/fonts.cc similarity index 100% rename from src/fonts.cc rename to src/lua/fonts.cc diff --git a/src/fonts.h b/src/lua/fonts.h similarity index 100% rename from src/fonts.h rename to src/lua/fonts.h diff --git a/src/llua.cc b/src/lua/llua.cc similarity index 100% rename from src/llua.cc rename to src/lua/llua.cc diff --git a/src/llua.h b/src/lua/llua.h similarity index 100% rename from src/llua.h rename to src/lua/llua.h diff --git a/src/lua-config.cc b/src/lua/lua-config.cc similarity index 100% rename from src/lua-config.cc rename to src/lua/lua-config.cc diff --git a/src/lua-config.hh b/src/lua/lua-config.hh similarity index 100% rename from src/lua-config.hh rename to src/lua/lua-config.hh diff --git a/src/luamm.cc b/src/lua/luamm.cc similarity index 100% rename from src/luamm.cc rename to src/lua/luamm.cc diff --git a/src/luamm.hh b/src/lua/luamm.hh similarity index 100% rename from src/luamm.hh rename to src/lua/luamm.hh diff --git a/src/setting.cc b/src/lua/setting.cc similarity index 100% rename from src/setting.cc rename to src/lua/setting.cc diff --git a/src/setting.hh b/src/lua/setting.hh similarity index 100% rename from src/setting.hh rename to src/lua/setting.hh diff --git a/src/x11-settings.cc b/src/lua/x11-settings.cc similarity index 100% rename from src/x11-settings.cc rename to src/lua/x11-settings.cc diff --git a/src/x11-settings.h b/src/lua/x11-settings.h similarity index 100% rename from src/x11-settings.h rename to src/lua/x11-settings.h diff --git a/src/display-console.cc b/src/output/display-console.cc similarity index 100% rename from src/display-console.cc rename to src/output/display-console.cc diff --git a/src/display-console.hh b/src/output/display-console.hh similarity index 100% rename from src/display-console.hh rename to src/output/display-console.hh diff --git a/src/display-file.cc b/src/output/display-file.cc similarity index 100% rename from src/display-file.cc rename to src/output/display-file.cc diff --git a/src/display-file.hh b/src/output/display-file.hh similarity index 100% rename from src/display-file.hh rename to src/output/display-file.hh diff --git a/src/display-http.cc b/src/output/display-http.cc similarity index 100% rename from src/display-http.cc rename to src/output/display-http.cc diff --git a/src/display-http.hh b/src/output/display-http.hh similarity index 100% rename from src/display-http.hh rename to src/output/display-http.hh diff --git a/src/display-ncurses.cc b/src/output/display-ncurses.cc similarity index 100% rename from src/display-ncurses.cc rename to src/output/display-ncurses.cc diff --git a/src/display-ncurses.hh b/src/output/display-ncurses.hh similarity index 100% rename from src/display-ncurses.hh rename to src/output/display-ncurses.hh diff --git a/src/display-output.cc b/src/output/display-output.cc similarity index 100% rename from src/display-output.cc rename to src/output/display-output.cc diff --git a/src/display-output.hh b/src/output/display-output.hh similarity index 100% rename from src/display-output.hh rename to src/output/display-output.hh diff --git a/src/display-wayland.cc b/src/output/display-wayland.cc similarity index 100% rename from src/display-wayland.cc rename to src/output/display-wayland.cc diff --git a/src/display-wayland.hh b/src/output/display-wayland.hh similarity index 100% rename from src/display-wayland.hh rename to src/output/display-wayland.hh diff --git a/src/display-x11.cc b/src/output/display-x11.cc similarity index 100% rename from src/display-x11.cc rename to src/output/display-x11.cc diff --git a/src/display-x11.hh b/src/output/display-x11.hh similarity index 100% rename from src/display-x11.hh rename to src/output/display-x11.hh diff --git a/src/gui.cc b/src/output/gui.cc similarity index 100% rename from src/gui.cc rename to src/output/gui.cc diff --git a/src/gui.h b/src/output/gui.h similarity index 100% rename from src/gui.h rename to src/output/gui.h diff --git a/src/nc.cc b/src/output/nc.cc similarity index 100% rename from src/nc.cc rename to src/output/nc.cc diff --git a/src/nc.h b/src/output/nc.h similarity index 100% rename from src/nc.h rename to src/output/nc.h diff --git a/src/wl.cc b/src/output/wl.cc similarity index 100% rename from src/wl.cc rename to src/output/wl.cc diff --git a/src/wl.h b/src/output/wl.h similarity index 100% rename from src/wl.h rename to src/output/wl.h diff --git a/src/x11-color.cc b/src/output/x11-color.cc similarity index 100% rename from src/x11-color.cc rename to src/output/x11-color.cc diff --git a/src/x11.cc b/src/output/x11.cc similarity index 100% rename from src/x11.cc rename to src/output/x11.cc diff --git a/src/x11.h b/src/output/x11.h similarity index 100% rename from src/x11.h rename to src/output/x11.h