From ececac65c23ef06243814725c49553ca94f676a2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 12 Jan 2021 11:57:58 +0100 Subject: [PATCH] Userland: Move command-line utilities to Userland/Utilities/ --- Meta/Lagom/CMakeLists.txt | 16 +++--- Userland/CMakeLists.txt | 51 +------------------ Userland/Utilities/CMakeLists.txt | 49 ++++++++++++++++++ Userland/{ => Utilities}/adjtime.cpp | 0 Userland/{ => Utilities}/allocate.cpp | 0 Userland/{ => Utilities}/aplay.cpp | 0 Userland/{ => Utilities}/arp.cpp | 0 Userland/{ => Utilities}/avol.cpp | 0 Userland/{ => Utilities}/base64.cpp | 0 Userland/{ => Utilities}/basename.cpp | 0 Userland/{ => Utilities}/beep.cpp | 0 Userland/{ => Utilities}/cal.cpp | 0 Userland/{ => Utilities}/cat.cpp | 0 Userland/{ => Utilities}/checksum.cpp | 0 Userland/{ => Utilities}/chgrp.cpp | 0 Userland/{ => Utilities}/chmod.cpp | 0 Userland/{ => Utilities}/chown.cpp | 0 Userland/{ => Utilities}/chroot.cpp | 0 Userland/{ => Utilities}/clear.cpp | 0 Userland/{ => Utilities}/copy.cpp | 0 Userland/{ => Utilities}/cp.cpp | 0 Userland/{ => Utilities}/crash.cpp | 0 Userland/{ => Utilities}/cut.cpp | 0 Userland/{ => Utilities}/date.cpp | 0 Userland/{ => Utilities}/ddate.cpp | 0 Userland/{ => Utilities}/df.cpp | 0 Userland/{ => Utilities}/dirname.cpp | 0 Userland/{ => Utilities}/disasm.cpp | 0 Userland/{ => Utilities}/disk_benchmark.cpp | 0 Userland/{ => Utilities}/dmesg.cpp | 0 Userland/{ => Utilities}/du.cpp | 0 Userland/{ => Utilities}/echo.cpp | 0 Userland/{ => Utilities}/env.cpp | 0 Userland/{ => Utilities}/expr.cpp | 0 Userland/{ => Utilities}/false.cpp | 0 Userland/{ => Utilities}/fgrep.cpp | 0 Userland/{ => Utilities}/find.cpp | 0 Userland/{ => Utilities}/flock.cpp | 0 Userland/{ => Utilities}/functrace.cpp | 0 Userland/{ => Utilities}/gml-format.cpp | 0 Userland/{ => Utilities}/grep.cpp | 0 Userland/{ => Utilities}/gron.cpp | 0 Userland/{ => Utilities}/gunzip.cpp | 0 Userland/{ => Utilities}/head.cpp | 0 Userland/{ => Utilities}/hexdump.cpp | 0 Userland/{ => Utilities}/host.cpp | 0 Userland/{ => Utilities}/hostname.cpp | 0 Userland/{ => Utilities}/html.cpp | 0 Userland/{ => Utilities}/id.cpp | 0 Userland/{ => Utilities}/ifconfig.cpp | 0 Userland/{ => Utilities}/ini.cpp | 0 Userland/{ => Utilities}/jp.cpp | 0 Userland/{ => Utilities}/js.cpp | 0 Userland/{ => Utilities}/keymap.cpp | 0 Userland/{ => Utilities}/kill.cpp | 0 Userland/{ => Utilities}/killall.cpp | 0 Userland/{ => Utilities}/ln.cpp | 0 Userland/{ => Utilities}/ls.cpp | 0 Userland/{ => Utilities}/lsirq.cpp | 0 Userland/{ => Utilities}/lsof.cpp | 0 Userland/{ => Utilities}/lspci.cpp | 0 Userland/{ => Utilities}/man.cpp | 0 Userland/{ => Utilities}/md.cpp | 0 .../misbehaving-application.cpp | 0 Userland/{ => Utilities}/mkdir.cpp | 0 Userland/{ => Utilities}/mkfifo.cpp | 0 Userland/{ => Utilities}/mknod.cpp | 0 Userland/{ => Utilities}/modload.cpp | 0 Userland/{ => Utilities}/modunload.cpp | 0 Userland/{ => Utilities}/more.cpp | 0 Userland/{ => Utilities}/mount.cpp | 0 Userland/{ => Utilities}/mv.cpp | 0 Userland/{ => Utilities}/nc.cpp | 0 Userland/{ => Utilities}/nl.cpp | 0 Userland/{ => Utilities}/notify.cpp | 0 Userland/{ => Utilities}/ntpquery.cpp | 0 Userland/{ => Utilities}/open.cpp | 0 Userland/{ => Utilities}/pape.cpp | 0 Userland/{ => Utilities}/passwd.cpp | 0 Userland/{ => Utilities}/paste.cpp | 0 Userland/{ => Utilities}/pidof.cpp | 0 Userland/{ => Utilities}/ping.cpp | 0 Userland/{ => Utilities}/pmap.cpp | 0 Userland/{ => Utilities}/printf.cpp | 0 Userland/{ => Utilities}/pro.cpp | 0 Userland/{ => Utilities}/profile.cpp | 0 Userland/{ => Utilities}/ps.cpp | 0 Userland/{ => Utilities}/purge.cpp | 0 Userland/{ => Utilities}/readelf.cpp | 0 Userland/{ => Utilities}/readlink.cpp | 0 Userland/{ => Utilities}/realpath.cpp | 0 Userland/{ => Utilities}/reboot.cpp | 0 Userland/{ => Utilities}/rm.cpp | 0 Userland/{ => Utilities}/rmdir.cpp | 0 Userland/{ => Utilities}/seq.cpp | 0 Userland/{ => Utilities}/shutdown.cpp | 0 Userland/{ => Utilities}/sleep.cpp | 0 Userland/{ => Utilities}/sort.cpp | 0 Userland/{ => Utilities}/stat.cpp | 0 Userland/{ => Utilities}/strace.cpp | 0 Userland/{ => Utilities}/su.cpp | 0 Userland/{ => Utilities}/sync.cpp | 0 Userland/{ => Utilities}/syscall.cpp | 0 Userland/{ => Utilities}/sysctl.cpp | 0 Userland/{ => Utilities}/tail.cpp | 0 Userland/{ => Utilities}/tar.cpp | 0 Userland/{ => Utilities}/tee.cpp | 0 .../{ => Utilities}/test-bindtodevice.cpp | 0 Userland/{ => Utilities}/test-compress.cpp | 0 Userland/{ => Utilities}/test-crypto.cpp | 0 Userland/{ => Utilities}/test-gfx-font.cpp | 0 Userland/{ => Utilities}/test-js.cpp | 0 Userland/{ => Utilities}/test-pthread.cpp | 0 Userland/{ => Utilities}/test-unveil.cpp | 0 Userland/{ => Utilities}/test-web.cpp | 0 Userland/{ => Utilities}/test.cpp | 0 Userland/{ => Utilities}/test_efault.cpp | 0 Userland/{ => Utilities}/test_env.cpp | 0 Userland/{ => Utilities}/test_io.cpp | 0 Userland/{ => Utilities}/top.cpp | 0 Userland/{ => Utilities}/touch.cpp | 0 Userland/{ => Utilities}/tr.cpp | 0 Userland/{ => Utilities}/tree.cpp | 0 Userland/{ => Utilities}/true.cpp | 0 Userland/{ => Utilities}/truncate.cpp | 0 Userland/{ => Utilities}/tt.cpp | 0 Userland/{ => Utilities}/tty.cpp | 0 Userland/{ => Utilities}/umount.cpp | 0 Userland/{ => Utilities}/uname.cpp | 0 Userland/{ => Utilities}/uniq.cpp | 0 Userland/{ => Utilities}/unzip.cpp | 0 Userland/{ => Utilities}/uptime.cpp | 0 Userland/{ => Utilities}/useradd.cpp | 0 Userland/{ => Utilities}/userdel.cpp | 0 Userland/{ => Utilities}/utmpupdate.cpp | 0 Userland/{ => Utilities}/w.cpp | 0 Userland/{ => Utilities}/watch.cpp | 0 Userland/{ => Utilities}/wc.cpp | 0 Userland/{ => Utilities}/which.cpp | 0 Userland/{ => Utilities}/whoami.cpp | 0 Userland/{ => Utilities}/xargs.cpp | 0 Userland/{ => Utilities}/yes.cpp | 0 142 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 Userland/Utilities/CMakeLists.txt rename Userland/{ => Utilities}/adjtime.cpp (100%) rename Userland/{ => Utilities}/allocate.cpp (100%) rename Userland/{ => Utilities}/aplay.cpp (100%) rename Userland/{ => Utilities}/arp.cpp (100%) rename Userland/{ => Utilities}/avol.cpp (100%) rename Userland/{ => Utilities}/base64.cpp (100%) rename Userland/{ => Utilities}/basename.cpp (100%) rename Userland/{ => Utilities}/beep.cpp (100%) rename Userland/{ => Utilities}/cal.cpp (100%) rename Userland/{ => Utilities}/cat.cpp (100%) rename Userland/{ => Utilities}/checksum.cpp (100%) rename Userland/{ => Utilities}/chgrp.cpp (100%) rename Userland/{ => Utilities}/chmod.cpp (100%) rename Userland/{ => Utilities}/chown.cpp (100%) rename Userland/{ => Utilities}/chroot.cpp (100%) rename Userland/{ => Utilities}/clear.cpp (100%) rename Userland/{ => Utilities}/copy.cpp (100%) rename Userland/{ => Utilities}/cp.cpp (100%) rename Userland/{ => Utilities}/crash.cpp (100%) rename Userland/{ => Utilities}/cut.cpp (100%) rename Userland/{ => Utilities}/date.cpp (100%) rename Userland/{ => Utilities}/ddate.cpp (100%) rename Userland/{ => Utilities}/df.cpp (100%) rename Userland/{ => Utilities}/dirname.cpp (100%) rename Userland/{ => Utilities}/disasm.cpp (100%) rename Userland/{ => Utilities}/disk_benchmark.cpp (100%) rename Userland/{ => Utilities}/dmesg.cpp (100%) rename Userland/{ => Utilities}/du.cpp (100%) rename Userland/{ => Utilities}/echo.cpp (100%) rename Userland/{ => Utilities}/env.cpp (100%) rename Userland/{ => Utilities}/expr.cpp (100%) rename Userland/{ => Utilities}/false.cpp (100%) rename Userland/{ => Utilities}/fgrep.cpp (100%) rename Userland/{ => Utilities}/find.cpp (100%) rename Userland/{ => Utilities}/flock.cpp (100%) rename Userland/{ => Utilities}/functrace.cpp (100%) rename Userland/{ => Utilities}/gml-format.cpp (100%) rename Userland/{ => Utilities}/grep.cpp (100%) rename Userland/{ => Utilities}/gron.cpp (100%) rename Userland/{ => Utilities}/gunzip.cpp (100%) rename Userland/{ => Utilities}/head.cpp (100%) rename Userland/{ => Utilities}/hexdump.cpp (100%) rename Userland/{ => Utilities}/host.cpp (100%) rename Userland/{ => Utilities}/hostname.cpp (100%) rename Userland/{ => Utilities}/html.cpp (100%) rename Userland/{ => Utilities}/id.cpp (100%) rename Userland/{ => Utilities}/ifconfig.cpp (100%) rename Userland/{ => Utilities}/ini.cpp (100%) rename Userland/{ => Utilities}/jp.cpp (100%) rename Userland/{ => Utilities}/js.cpp (100%) rename Userland/{ => Utilities}/keymap.cpp (100%) rename Userland/{ => Utilities}/kill.cpp (100%) rename Userland/{ => Utilities}/killall.cpp (100%) rename Userland/{ => Utilities}/ln.cpp (100%) rename Userland/{ => Utilities}/ls.cpp (100%) rename Userland/{ => Utilities}/lsirq.cpp (100%) rename Userland/{ => Utilities}/lsof.cpp (100%) rename Userland/{ => Utilities}/lspci.cpp (100%) rename Userland/{ => Utilities}/man.cpp (100%) rename Userland/{ => Utilities}/md.cpp (100%) rename Userland/{ => Utilities}/misbehaving-application.cpp (100%) rename Userland/{ => Utilities}/mkdir.cpp (100%) rename Userland/{ => Utilities}/mkfifo.cpp (100%) rename Userland/{ => Utilities}/mknod.cpp (100%) rename Userland/{ => Utilities}/modload.cpp (100%) rename Userland/{ => Utilities}/modunload.cpp (100%) rename Userland/{ => Utilities}/more.cpp (100%) rename Userland/{ => Utilities}/mount.cpp (100%) rename Userland/{ => Utilities}/mv.cpp (100%) rename Userland/{ => Utilities}/nc.cpp (100%) rename Userland/{ => Utilities}/nl.cpp (100%) rename Userland/{ => Utilities}/notify.cpp (100%) rename Userland/{ => Utilities}/ntpquery.cpp (100%) rename Userland/{ => Utilities}/open.cpp (100%) rename Userland/{ => Utilities}/pape.cpp (100%) rename Userland/{ => Utilities}/passwd.cpp (100%) rename Userland/{ => Utilities}/paste.cpp (100%) rename Userland/{ => Utilities}/pidof.cpp (100%) rename Userland/{ => Utilities}/ping.cpp (100%) rename Userland/{ => Utilities}/pmap.cpp (100%) rename Userland/{ => Utilities}/printf.cpp (100%) rename Userland/{ => Utilities}/pro.cpp (100%) rename Userland/{ => Utilities}/profile.cpp (100%) rename Userland/{ => Utilities}/ps.cpp (100%) rename Userland/{ => Utilities}/purge.cpp (100%) rename Userland/{ => Utilities}/readelf.cpp (100%) rename Userland/{ => Utilities}/readlink.cpp (100%) rename Userland/{ => Utilities}/realpath.cpp (100%) rename Userland/{ => Utilities}/reboot.cpp (100%) rename Userland/{ => Utilities}/rm.cpp (100%) rename Userland/{ => Utilities}/rmdir.cpp (100%) rename Userland/{ => Utilities}/seq.cpp (100%) rename Userland/{ => Utilities}/shutdown.cpp (100%) rename Userland/{ => Utilities}/sleep.cpp (100%) rename Userland/{ => Utilities}/sort.cpp (100%) rename Userland/{ => Utilities}/stat.cpp (100%) rename Userland/{ => Utilities}/strace.cpp (100%) rename Userland/{ => Utilities}/su.cpp (100%) rename Userland/{ => Utilities}/sync.cpp (100%) rename Userland/{ => Utilities}/syscall.cpp (100%) rename Userland/{ => Utilities}/sysctl.cpp (100%) rename Userland/{ => Utilities}/tail.cpp (100%) rename Userland/{ => Utilities}/tar.cpp (100%) rename Userland/{ => Utilities}/tee.cpp (100%) rename Userland/{ => Utilities}/test-bindtodevice.cpp (100%) rename Userland/{ => Utilities}/test-compress.cpp (100%) rename Userland/{ => Utilities}/test-crypto.cpp (100%) rename Userland/{ => Utilities}/test-gfx-font.cpp (100%) rename Userland/{ => Utilities}/test-js.cpp (100%) rename Userland/{ => Utilities}/test-pthread.cpp (100%) rename Userland/{ => Utilities}/test-unveil.cpp (100%) rename Userland/{ => Utilities}/test-web.cpp (100%) rename Userland/{ => Utilities}/test.cpp (100%) rename Userland/{ => Utilities}/test_efault.cpp (100%) rename Userland/{ => Utilities}/test_env.cpp (100%) rename Userland/{ => Utilities}/test_io.cpp (100%) rename Userland/{ => Utilities}/top.cpp (100%) rename Userland/{ => Utilities}/touch.cpp (100%) rename Userland/{ => Utilities}/tr.cpp (100%) rename Userland/{ => Utilities}/tree.cpp (100%) rename Userland/{ => Utilities}/true.cpp (100%) rename Userland/{ => Utilities}/truncate.cpp (100%) rename Userland/{ => Utilities}/tt.cpp (100%) rename Userland/{ => Utilities}/tty.cpp (100%) rename Userland/{ => Utilities}/umount.cpp (100%) rename Userland/{ => Utilities}/uname.cpp (100%) rename Userland/{ => Utilities}/uniq.cpp (100%) rename Userland/{ => Utilities}/unzip.cpp (100%) rename Userland/{ => Utilities}/uptime.cpp (100%) rename Userland/{ => Utilities}/useradd.cpp (100%) rename Userland/{ => Utilities}/userdel.cpp (100%) rename Userland/{ => Utilities}/utmpupdate.cpp (100%) rename Userland/{ => Utilities}/w.cpp (100%) rename Userland/{ => Utilities}/watch.cpp (100%) rename Userland/{ => Utilities}/wc.cpp (100%) rename Userland/{ => Utilities}/which.cpp (100%) rename Userland/{ => Utilities}/whoami.cpp (100%) rename Userland/{ => Utilities}/xargs.cpp (100%) rename Userland/{ => Utilities}/yes.cpp (100%) diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index fe29f3ec6e..222a55ff60 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -91,27 +91,27 @@ if (BUILD_LAGOM) target_link_libraries(TestJson Lagom) target_link_libraries(TestJson stdc++) - add_executable(adjtime_lagom ../../Userland/adjtime.cpp) + add_executable(adjtime_lagom ../../Userland/Utilities/adjtime.cpp) set_target_properties(adjtime_lagom PROPERTIES OUTPUT_NAME adjtime) target_link_libraries(adjtime_lagom Lagom) - add_executable(js_lagom ../../Userland/js.cpp) + add_executable(js_lagom ../../Userland/Utilities/js.cpp) set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js) target_link_libraries(js_lagom Lagom) target_link_libraries(js_lagom stdc++) target_link_libraries(js_lagom pthread) - add_executable(ntpquery_lagom ../../Userland/ntpquery.cpp) + add_executable(ntpquery_lagom ../../Userland/Utilities/ntpquery.cpp) set_target_properties(ntpquery_lagom PROPERTIES OUTPUT_NAME ntpquery) target_link_libraries(ntpquery_lagom Lagom) - add_executable(test-js_lagom ../../Userland/test-js.cpp) + add_executable(test-js_lagom ../../Userland/Utilities/test-js.cpp) set_target_properties(test-js_lagom PROPERTIES OUTPUT_NAME test-js) target_link_libraries(test-js_lagom Lagom) target_link_libraries(test-js_lagom stdc++) target_link_libraries(test-js_lagom pthread) - add_executable(test-crypto_lagom ../../Userland/test-crypto.cpp) + add_executable(test-crypto_lagom ../../Userland/Utilities/test-crypto.cpp) set_target_properties(test-crypto_lagom PROPERTIES OUTPUT_NAME test-crypto) target_link_libraries(test-crypto_lagom Lagom) target_link_libraries(test-crypto_lagom stdc++) @@ -121,12 +121,12 @@ if (BUILD_LAGOM) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - add_executable(test-compress_lagom ../../Userland/test-compress.cpp) + add_executable(test-compress_lagom ../../Userland/Utilities/test-compress.cpp) set_target_properties(test-compress_lagom PROPERTIES OUTPUT_NAME test-compress) target_link_libraries(test-compress_lagom Lagom) target_link_libraries(test-compress_lagom stdc++) - add_executable(disasm_lagom ../../Userland/disasm.cpp) + add_executable(disasm_lagom ../../Userland/Utilities/disasm.cpp) set_target_properties(disasm_lagom PROPERTIES OUTPUT_NAME disasm) target_link_libraries(disasm_lagom Lagom) target_link_libraries(disasm_lagom stdc++) @@ -137,7 +137,7 @@ if (BUILD_LAGOM) target_link_libraries(shell_lagom stdc++) target_link_libraries(shell_lagom pthread) - add_executable(gml-format_lagom ../../Userland/gml-format.cpp) + add_executable(gml-format_lagom ../../Userland/Utilities/gml-format.cpp) set_target_properties(gml-format_lagom PROPERTIES OUTPUT_NAME gml-format) target_link_libraries(gml-format_lagom Lagom) target_link_libraries(gml-format_lagom stdc++) diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt index 2551a923c0..33717025e3 100644 --- a/Userland/CMakeLists.txt +++ b/Userland/CMakeLists.txt @@ -1,53 +1,4 @@ -file(GLOB CMD_SOURCES CONFIGURE_DEPENDS "*.cpp") -list(APPEND SPECIAL_TARGETS "test" "install") - -foreach(CMD_SRC ${CMD_SOURCES}) - get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE) - if (CMD_NAME IN_LIST SPECIAL_TARGETS) - add_executable("${CMD_NAME}-bin" ${CMD_SRC}) - target_link_libraries("${CMD_NAME}-bin" LibCore) - install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin) - install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)") - else () - add_executable(${CMD_NAME} ${CMD_SRC}) - target_link_libraries(${CMD_NAME} LibCore) - install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin) - endif() -endforeach() - -target_link_libraries(aplay LibAudio) -target_link_libraries(avol LibAudio) -target_link_libraries(checksum LibCrypto) -target_link_libraries(copy LibGUI) -target_link_libraries(disasm LibX86) -target_link_libraries(expr LibRegex) -target_link_libraries(functrace LibDebug LibX86) -target_link_libraries(gml-format LibGUI) -target_link_libraries(html LibWeb) -target_link_libraries(js LibJS LibLine) -target_link_libraries(keymap LibKeyboard) -target_link_libraries(lspci LibPCIDB) -target_link_libraries(man LibMarkdown) -target_link_libraries(md LibMarkdown) -target_link_libraries(misbehaving-application LibCore) -target_link_libraries(notify LibGUI) -target_link_libraries(open LibDesktop) -target_link_libraries(pape LibGUI) -target_link_libraries(passwd LibCrypt) -target_link_libraries(paste LibGUI) -target_link_libraries(pro LibProtocol) -target_link_libraries(su LibCrypt) -target_link_libraries(tar LibTar LibCompress) -target_link_libraries(test-crypto LibCrypto LibTLS LibLine) -target_link_libraries(test-compress LibCompress) -target_link_libraries(test-gfx-font LibGUI LibCore) -target_link_libraries(test-js LibJS LibLine LibCore) -target_link_libraries(test-pthread LibThread) -target_link_libraries(test-web LibWeb) -target_link_libraries(tt LibPthread) -target_link_libraries(grep LibRegex) -target_link_libraries(gunzip LibCompress) - add_subdirectory(DynamicLoader) add_subdirectory(Shell) add_subdirectory(Tests) +add_subdirectory(Utilities) diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt new file mode 100644 index 0000000000..6dc2c78079 --- /dev/null +++ b/Userland/Utilities/CMakeLists.txt @@ -0,0 +1,49 @@ +file(GLOB CMD_SOURCES CONFIGURE_DEPENDS "*.cpp") +list(APPEND SPECIAL_TARGETS "test" "install") + +foreach(CMD_SRC ${CMD_SOURCES}) + get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE) + if (CMD_NAME IN_LIST SPECIAL_TARGETS) + add_executable("${CMD_NAME}-bin" ${CMD_SRC}) + target_link_libraries("${CMD_NAME}-bin" LibCore) + install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin) + install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)") + else () + add_executable(${CMD_NAME} ${CMD_SRC}) + target_link_libraries(${CMD_NAME} LibCore) + install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin) + endif() +endforeach() + +target_link_libraries(aplay LibAudio) +target_link_libraries(avol LibAudio) +target_link_libraries(checksum LibCrypto) +target_link_libraries(copy LibGUI) +target_link_libraries(disasm LibX86) +target_link_libraries(expr LibRegex) +target_link_libraries(functrace LibDebug LibX86) +target_link_libraries(gml-format LibGUI) +target_link_libraries(html LibWeb) +target_link_libraries(js LibJS LibLine) +target_link_libraries(keymap LibKeyboard) +target_link_libraries(lspci LibPCIDB) +target_link_libraries(man LibMarkdown) +target_link_libraries(md LibMarkdown) +target_link_libraries(misbehaving-application LibCore) +target_link_libraries(notify LibGUI) +target_link_libraries(open LibDesktop) +target_link_libraries(pape LibGUI) +target_link_libraries(passwd LibCrypt) +target_link_libraries(paste LibGUI) +target_link_libraries(pro LibProtocol) +target_link_libraries(su LibCrypt) +target_link_libraries(tar LibTar LibCompress) +target_link_libraries(test-crypto LibCrypto LibTLS LibLine) +target_link_libraries(test-compress LibCompress) +target_link_libraries(test-gfx-font LibGUI LibCore) +target_link_libraries(test-js LibJS LibLine LibCore) +target_link_libraries(test-pthread LibThread) +target_link_libraries(test-web LibWeb) +target_link_libraries(tt LibPthread) +target_link_libraries(grep LibRegex) +target_link_libraries(gunzip LibCompress) diff --git a/Userland/adjtime.cpp b/Userland/Utilities/adjtime.cpp similarity index 100% rename from Userland/adjtime.cpp rename to Userland/Utilities/adjtime.cpp diff --git a/Userland/allocate.cpp b/Userland/Utilities/allocate.cpp similarity index 100% rename from Userland/allocate.cpp rename to Userland/Utilities/allocate.cpp diff --git a/Userland/aplay.cpp b/Userland/Utilities/aplay.cpp similarity index 100% rename from Userland/aplay.cpp rename to Userland/Utilities/aplay.cpp diff --git a/Userland/arp.cpp b/Userland/Utilities/arp.cpp similarity index 100% rename from Userland/arp.cpp rename to Userland/Utilities/arp.cpp diff --git a/Userland/avol.cpp b/Userland/Utilities/avol.cpp similarity index 100% rename from Userland/avol.cpp rename to Userland/Utilities/avol.cpp diff --git a/Userland/base64.cpp b/Userland/Utilities/base64.cpp similarity index 100% rename from Userland/base64.cpp rename to Userland/Utilities/base64.cpp diff --git a/Userland/basename.cpp b/Userland/Utilities/basename.cpp similarity index 100% rename from Userland/basename.cpp rename to Userland/Utilities/basename.cpp diff --git a/Userland/beep.cpp b/Userland/Utilities/beep.cpp similarity index 100% rename from Userland/beep.cpp rename to Userland/Utilities/beep.cpp diff --git a/Userland/cal.cpp b/Userland/Utilities/cal.cpp similarity index 100% rename from Userland/cal.cpp rename to Userland/Utilities/cal.cpp diff --git a/Userland/cat.cpp b/Userland/Utilities/cat.cpp similarity index 100% rename from Userland/cat.cpp rename to Userland/Utilities/cat.cpp diff --git a/Userland/checksum.cpp b/Userland/Utilities/checksum.cpp similarity index 100% rename from Userland/checksum.cpp rename to Userland/Utilities/checksum.cpp diff --git a/Userland/chgrp.cpp b/Userland/Utilities/chgrp.cpp similarity index 100% rename from Userland/chgrp.cpp rename to Userland/Utilities/chgrp.cpp diff --git a/Userland/chmod.cpp b/Userland/Utilities/chmod.cpp similarity index 100% rename from Userland/chmod.cpp rename to Userland/Utilities/chmod.cpp diff --git a/Userland/chown.cpp b/Userland/Utilities/chown.cpp similarity index 100% rename from Userland/chown.cpp rename to Userland/Utilities/chown.cpp diff --git a/Userland/chroot.cpp b/Userland/Utilities/chroot.cpp similarity index 100% rename from Userland/chroot.cpp rename to Userland/Utilities/chroot.cpp diff --git a/Userland/clear.cpp b/Userland/Utilities/clear.cpp similarity index 100% rename from Userland/clear.cpp rename to Userland/Utilities/clear.cpp diff --git a/Userland/copy.cpp b/Userland/Utilities/copy.cpp similarity index 100% rename from Userland/copy.cpp rename to Userland/Utilities/copy.cpp diff --git a/Userland/cp.cpp b/Userland/Utilities/cp.cpp similarity index 100% rename from Userland/cp.cpp rename to Userland/Utilities/cp.cpp diff --git a/Userland/crash.cpp b/Userland/Utilities/crash.cpp similarity index 100% rename from Userland/crash.cpp rename to Userland/Utilities/crash.cpp diff --git a/Userland/cut.cpp b/Userland/Utilities/cut.cpp similarity index 100% rename from Userland/cut.cpp rename to Userland/Utilities/cut.cpp diff --git a/Userland/date.cpp b/Userland/Utilities/date.cpp similarity index 100% rename from Userland/date.cpp rename to Userland/Utilities/date.cpp diff --git a/Userland/ddate.cpp b/Userland/Utilities/ddate.cpp similarity index 100% rename from Userland/ddate.cpp rename to Userland/Utilities/ddate.cpp diff --git a/Userland/df.cpp b/Userland/Utilities/df.cpp similarity index 100% rename from Userland/df.cpp rename to Userland/Utilities/df.cpp diff --git a/Userland/dirname.cpp b/Userland/Utilities/dirname.cpp similarity index 100% rename from Userland/dirname.cpp rename to Userland/Utilities/dirname.cpp diff --git a/Userland/disasm.cpp b/Userland/Utilities/disasm.cpp similarity index 100% rename from Userland/disasm.cpp rename to Userland/Utilities/disasm.cpp diff --git a/Userland/disk_benchmark.cpp b/Userland/Utilities/disk_benchmark.cpp similarity index 100% rename from Userland/disk_benchmark.cpp rename to Userland/Utilities/disk_benchmark.cpp diff --git a/Userland/dmesg.cpp b/Userland/Utilities/dmesg.cpp similarity index 100% rename from Userland/dmesg.cpp rename to Userland/Utilities/dmesg.cpp diff --git a/Userland/du.cpp b/Userland/Utilities/du.cpp similarity index 100% rename from Userland/du.cpp rename to Userland/Utilities/du.cpp diff --git a/Userland/echo.cpp b/Userland/Utilities/echo.cpp similarity index 100% rename from Userland/echo.cpp rename to Userland/Utilities/echo.cpp diff --git a/Userland/env.cpp b/Userland/Utilities/env.cpp similarity index 100% rename from Userland/env.cpp rename to Userland/Utilities/env.cpp diff --git a/Userland/expr.cpp b/Userland/Utilities/expr.cpp similarity index 100% rename from Userland/expr.cpp rename to Userland/Utilities/expr.cpp diff --git a/Userland/false.cpp b/Userland/Utilities/false.cpp similarity index 100% rename from Userland/false.cpp rename to Userland/Utilities/false.cpp diff --git a/Userland/fgrep.cpp b/Userland/Utilities/fgrep.cpp similarity index 100% rename from Userland/fgrep.cpp rename to Userland/Utilities/fgrep.cpp diff --git a/Userland/find.cpp b/Userland/Utilities/find.cpp similarity index 100% rename from Userland/find.cpp rename to Userland/Utilities/find.cpp diff --git a/Userland/flock.cpp b/Userland/Utilities/flock.cpp similarity index 100% rename from Userland/flock.cpp rename to Userland/Utilities/flock.cpp diff --git a/Userland/functrace.cpp b/Userland/Utilities/functrace.cpp similarity index 100% rename from Userland/functrace.cpp rename to Userland/Utilities/functrace.cpp diff --git a/Userland/gml-format.cpp b/Userland/Utilities/gml-format.cpp similarity index 100% rename from Userland/gml-format.cpp rename to Userland/Utilities/gml-format.cpp diff --git a/Userland/grep.cpp b/Userland/Utilities/grep.cpp similarity index 100% rename from Userland/grep.cpp rename to Userland/Utilities/grep.cpp diff --git a/Userland/gron.cpp b/Userland/Utilities/gron.cpp similarity index 100% rename from Userland/gron.cpp rename to Userland/Utilities/gron.cpp diff --git a/Userland/gunzip.cpp b/Userland/Utilities/gunzip.cpp similarity index 100% rename from Userland/gunzip.cpp rename to Userland/Utilities/gunzip.cpp diff --git a/Userland/head.cpp b/Userland/Utilities/head.cpp similarity index 100% rename from Userland/head.cpp rename to Userland/Utilities/head.cpp diff --git a/Userland/hexdump.cpp b/Userland/Utilities/hexdump.cpp similarity index 100% rename from Userland/hexdump.cpp rename to Userland/Utilities/hexdump.cpp diff --git a/Userland/host.cpp b/Userland/Utilities/host.cpp similarity index 100% rename from Userland/host.cpp rename to Userland/Utilities/host.cpp diff --git a/Userland/hostname.cpp b/Userland/Utilities/hostname.cpp similarity index 100% rename from Userland/hostname.cpp rename to Userland/Utilities/hostname.cpp diff --git a/Userland/html.cpp b/Userland/Utilities/html.cpp similarity index 100% rename from Userland/html.cpp rename to Userland/Utilities/html.cpp diff --git a/Userland/id.cpp b/Userland/Utilities/id.cpp similarity index 100% rename from Userland/id.cpp rename to Userland/Utilities/id.cpp diff --git a/Userland/ifconfig.cpp b/Userland/Utilities/ifconfig.cpp similarity index 100% rename from Userland/ifconfig.cpp rename to Userland/Utilities/ifconfig.cpp diff --git a/Userland/ini.cpp b/Userland/Utilities/ini.cpp similarity index 100% rename from Userland/ini.cpp rename to Userland/Utilities/ini.cpp diff --git a/Userland/jp.cpp b/Userland/Utilities/jp.cpp similarity index 100% rename from Userland/jp.cpp rename to Userland/Utilities/jp.cpp diff --git a/Userland/js.cpp b/Userland/Utilities/js.cpp similarity index 100% rename from Userland/js.cpp rename to Userland/Utilities/js.cpp diff --git a/Userland/keymap.cpp b/Userland/Utilities/keymap.cpp similarity index 100% rename from Userland/keymap.cpp rename to Userland/Utilities/keymap.cpp diff --git a/Userland/kill.cpp b/Userland/Utilities/kill.cpp similarity index 100% rename from Userland/kill.cpp rename to Userland/Utilities/kill.cpp diff --git a/Userland/killall.cpp b/Userland/Utilities/killall.cpp similarity index 100% rename from Userland/killall.cpp rename to Userland/Utilities/killall.cpp diff --git a/Userland/ln.cpp b/Userland/Utilities/ln.cpp similarity index 100% rename from Userland/ln.cpp rename to Userland/Utilities/ln.cpp diff --git a/Userland/ls.cpp b/Userland/Utilities/ls.cpp similarity index 100% rename from Userland/ls.cpp rename to Userland/Utilities/ls.cpp diff --git a/Userland/lsirq.cpp b/Userland/Utilities/lsirq.cpp similarity index 100% rename from Userland/lsirq.cpp rename to Userland/Utilities/lsirq.cpp diff --git a/Userland/lsof.cpp b/Userland/Utilities/lsof.cpp similarity index 100% rename from Userland/lsof.cpp rename to Userland/Utilities/lsof.cpp diff --git a/Userland/lspci.cpp b/Userland/Utilities/lspci.cpp similarity index 100% rename from Userland/lspci.cpp rename to Userland/Utilities/lspci.cpp diff --git a/Userland/man.cpp b/Userland/Utilities/man.cpp similarity index 100% rename from Userland/man.cpp rename to Userland/Utilities/man.cpp diff --git a/Userland/md.cpp b/Userland/Utilities/md.cpp similarity index 100% rename from Userland/md.cpp rename to Userland/Utilities/md.cpp diff --git a/Userland/misbehaving-application.cpp b/Userland/Utilities/misbehaving-application.cpp similarity index 100% rename from Userland/misbehaving-application.cpp rename to Userland/Utilities/misbehaving-application.cpp diff --git a/Userland/mkdir.cpp b/Userland/Utilities/mkdir.cpp similarity index 100% rename from Userland/mkdir.cpp rename to Userland/Utilities/mkdir.cpp diff --git a/Userland/mkfifo.cpp b/Userland/Utilities/mkfifo.cpp similarity index 100% rename from Userland/mkfifo.cpp rename to Userland/Utilities/mkfifo.cpp diff --git a/Userland/mknod.cpp b/Userland/Utilities/mknod.cpp similarity index 100% rename from Userland/mknod.cpp rename to Userland/Utilities/mknod.cpp diff --git a/Userland/modload.cpp b/Userland/Utilities/modload.cpp similarity index 100% rename from Userland/modload.cpp rename to Userland/Utilities/modload.cpp diff --git a/Userland/modunload.cpp b/Userland/Utilities/modunload.cpp similarity index 100% rename from Userland/modunload.cpp rename to Userland/Utilities/modunload.cpp diff --git a/Userland/more.cpp b/Userland/Utilities/more.cpp similarity index 100% rename from Userland/more.cpp rename to Userland/Utilities/more.cpp diff --git a/Userland/mount.cpp b/Userland/Utilities/mount.cpp similarity index 100% rename from Userland/mount.cpp rename to Userland/Utilities/mount.cpp diff --git a/Userland/mv.cpp b/Userland/Utilities/mv.cpp similarity index 100% rename from Userland/mv.cpp rename to Userland/Utilities/mv.cpp diff --git a/Userland/nc.cpp b/Userland/Utilities/nc.cpp similarity index 100% rename from Userland/nc.cpp rename to Userland/Utilities/nc.cpp diff --git a/Userland/nl.cpp b/Userland/Utilities/nl.cpp similarity index 100% rename from Userland/nl.cpp rename to Userland/Utilities/nl.cpp diff --git a/Userland/notify.cpp b/Userland/Utilities/notify.cpp similarity index 100% rename from Userland/notify.cpp rename to Userland/Utilities/notify.cpp diff --git a/Userland/ntpquery.cpp b/Userland/Utilities/ntpquery.cpp similarity index 100% rename from Userland/ntpquery.cpp rename to Userland/Utilities/ntpquery.cpp diff --git a/Userland/open.cpp b/Userland/Utilities/open.cpp similarity index 100% rename from Userland/open.cpp rename to Userland/Utilities/open.cpp diff --git a/Userland/pape.cpp b/Userland/Utilities/pape.cpp similarity index 100% rename from Userland/pape.cpp rename to Userland/Utilities/pape.cpp diff --git a/Userland/passwd.cpp b/Userland/Utilities/passwd.cpp similarity index 100% rename from Userland/passwd.cpp rename to Userland/Utilities/passwd.cpp diff --git a/Userland/paste.cpp b/Userland/Utilities/paste.cpp similarity index 100% rename from Userland/paste.cpp rename to Userland/Utilities/paste.cpp diff --git a/Userland/pidof.cpp b/Userland/Utilities/pidof.cpp similarity index 100% rename from Userland/pidof.cpp rename to Userland/Utilities/pidof.cpp diff --git a/Userland/ping.cpp b/Userland/Utilities/ping.cpp similarity index 100% rename from Userland/ping.cpp rename to Userland/Utilities/ping.cpp diff --git a/Userland/pmap.cpp b/Userland/Utilities/pmap.cpp similarity index 100% rename from Userland/pmap.cpp rename to Userland/Utilities/pmap.cpp diff --git a/Userland/printf.cpp b/Userland/Utilities/printf.cpp similarity index 100% rename from Userland/printf.cpp rename to Userland/Utilities/printf.cpp diff --git a/Userland/pro.cpp b/Userland/Utilities/pro.cpp similarity index 100% rename from Userland/pro.cpp rename to Userland/Utilities/pro.cpp diff --git a/Userland/profile.cpp b/Userland/Utilities/profile.cpp similarity index 100% rename from Userland/profile.cpp rename to Userland/Utilities/profile.cpp diff --git a/Userland/ps.cpp b/Userland/Utilities/ps.cpp similarity index 100% rename from Userland/ps.cpp rename to Userland/Utilities/ps.cpp diff --git a/Userland/purge.cpp b/Userland/Utilities/purge.cpp similarity index 100% rename from Userland/purge.cpp rename to Userland/Utilities/purge.cpp diff --git a/Userland/readelf.cpp b/Userland/Utilities/readelf.cpp similarity index 100% rename from Userland/readelf.cpp rename to Userland/Utilities/readelf.cpp diff --git a/Userland/readlink.cpp b/Userland/Utilities/readlink.cpp similarity index 100% rename from Userland/readlink.cpp rename to Userland/Utilities/readlink.cpp diff --git a/Userland/realpath.cpp b/Userland/Utilities/realpath.cpp similarity index 100% rename from Userland/realpath.cpp rename to Userland/Utilities/realpath.cpp diff --git a/Userland/reboot.cpp b/Userland/Utilities/reboot.cpp similarity index 100% rename from Userland/reboot.cpp rename to Userland/Utilities/reboot.cpp diff --git a/Userland/rm.cpp b/Userland/Utilities/rm.cpp similarity index 100% rename from Userland/rm.cpp rename to Userland/Utilities/rm.cpp diff --git a/Userland/rmdir.cpp b/Userland/Utilities/rmdir.cpp similarity index 100% rename from Userland/rmdir.cpp rename to Userland/Utilities/rmdir.cpp diff --git a/Userland/seq.cpp b/Userland/Utilities/seq.cpp similarity index 100% rename from Userland/seq.cpp rename to Userland/Utilities/seq.cpp diff --git a/Userland/shutdown.cpp b/Userland/Utilities/shutdown.cpp similarity index 100% rename from Userland/shutdown.cpp rename to Userland/Utilities/shutdown.cpp diff --git a/Userland/sleep.cpp b/Userland/Utilities/sleep.cpp similarity index 100% rename from Userland/sleep.cpp rename to Userland/Utilities/sleep.cpp diff --git a/Userland/sort.cpp b/Userland/Utilities/sort.cpp similarity index 100% rename from Userland/sort.cpp rename to Userland/Utilities/sort.cpp diff --git a/Userland/stat.cpp b/Userland/Utilities/stat.cpp similarity index 100% rename from Userland/stat.cpp rename to Userland/Utilities/stat.cpp diff --git a/Userland/strace.cpp b/Userland/Utilities/strace.cpp similarity index 100% rename from Userland/strace.cpp rename to Userland/Utilities/strace.cpp diff --git a/Userland/su.cpp b/Userland/Utilities/su.cpp similarity index 100% rename from Userland/su.cpp rename to Userland/Utilities/su.cpp diff --git a/Userland/sync.cpp b/Userland/Utilities/sync.cpp similarity index 100% rename from Userland/sync.cpp rename to Userland/Utilities/sync.cpp diff --git a/Userland/syscall.cpp b/Userland/Utilities/syscall.cpp similarity index 100% rename from Userland/syscall.cpp rename to Userland/Utilities/syscall.cpp diff --git a/Userland/sysctl.cpp b/Userland/Utilities/sysctl.cpp similarity index 100% rename from Userland/sysctl.cpp rename to Userland/Utilities/sysctl.cpp diff --git a/Userland/tail.cpp b/Userland/Utilities/tail.cpp similarity index 100% rename from Userland/tail.cpp rename to Userland/Utilities/tail.cpp diff --git a/Userland/tar.cpp b/Userland/Utilities/tar.cpp similarity index 100% rename from Userland/tar.cpp rename to Userland/Utilities/tar.cpp diff --git a/Userland/tee.cpp b/Userland/Utilities/tee.cpp similarity index 100% rename from Userland/tee.cpp rename to Userland/Utilities/tee.cpp diff --git a/Userland/test-bindtodevice.cpp b/Userland/Utilities/test-bindtodevice.cpp similarity index 100% rename from Userland/test-bindtodevice.cpp rename to Userland/Utilities/test-bindtodevice.cpp diff --git a/Userland/test-compress.cpp b/Userland/Utilities/test-compress.cpp similarity index 100% rename from Userland/test-compress.cpp rename to Userland/Utilities/test-compress.cpp diff --git a/Userland/test-crypto.cpp b/Userland/Utilities/test-crypto.cpp similarity index 100% rename from Userland/test-crypto.cpp rename to Userland/Utilities/test-crypto.cpp diff --git a/Userland/test-gfx-font.cpp b/Userland/Utilities/test-gfx-font.cpp similarity index 100% rename from Userland/test-gfx-font.cpp rename to Userland/Utilities/test-gfx-font.cpp diff --git a/Userland/test-js.cpp b/Userland/Utilities/test-js.cpp similarity index 100% rename from Userland/test-js.cpp rename to Userland/Utilities/test-js.cpp diff --git a/Userland/test-pthread.cpp b/Userland/Utilities/test-pthread.cpp similarity index 100% rename from Userland/test-pthread.cpp rename to Userland/Utilities/test-pthread.cpp diff --git a/Userland/test-unveil.cpp b/Userland/Utilities/test-unveil.cpp similarity index 100% rename from Userland/test-unveil.cpp rename to Userland/Utilities/test-unveil.cpp diff --git a/Userland/test-web.cpp b/Userland/Utilities/test-web.cpp similarity index 100% rename from Userland/test-web.cpp rename to Userland/Utilities/test-web.cpp diff --git a/Userland/test.cpp b/Userland/Utilities/test.cpp similarity index 100% rename from Userland/test.cpp rename to Userland/Utilities/test.cpp diff --git a/Userland/test_efault.cpp b/Userland/Utilities/test_efault.cpp similarity index 100% rename from Userland/test_efault.cpp rename to Userland/Utilities/test_efault.cpp diff --git a/Userland/test_env.cpp b/Userland/Utilities/test_env.cpp similarity index 100% rename from Userland/test_env.cpp rename to Userland/Utilities/test_env.cpp diff --git a/Userland/test_io.cpp b/Userland/Utilities/test_io.cpp similarity index 100% rename from Userland/test_io.cpp rename to Userland/Utilities/test_io.cpp diff --git a/Userland/top.cpp b/Userland/Utilities/top.cpp similarity index 100% rename from Userland/top.cpp rename to Userland/Utilities/top.cpp diff --git a/Userland/touch.cpp b/Userland/Utilities/touch.cpp similarity index 100% rename from Userland/touch.cpp rename to Userland/Utilities/touch.cpp diff --git a/Userland/tr.cpp b/Userland/Utilities/tr.cpp similarity index 100% rename from Userland/tr.cpp rename to Userland/Utilities/tr.cpp diff --git a/Userland/tree.cpp b/Userland/Utilities/tree.cpp similarity index 100% rename from Userland/tree.cpp rename to Userland/Utilities/tree.cpp diff --git a/Userland/true.cpp b/Userland/Utilities/true.cpp similarity index 100% rename from Userland/true.cpp rename to Userland/Utilities/true.cpp diff --git a/Userland/truncate.cpp b/Userland/Utilities/truncate.cpp similarity index 100% rename from Userland/truncate.cpp rename to Userland/Utilities/truncate.cpp diff --git a/Userland/tt.cpp b/Userland/Utilities/tt.cpp similarity index 100% rename from Userland/tt.cpp rename to Userland/Utilities/tt.cpp diff --git a/Userland/tty.cpp b/Userland/Utilities/tty.cpp similarity index 100% rename from Userland/tty.cpp rename to Userland/Utilities/tty.cpp diff --git a/Userland/umount.cpp b/Userland/Utilities/umount.cpp similarity index 100% rename from Userland/umount.cpp rename to Userland/Utilities/umount.cpp diff --git a/Userland/uname.cpp b/Userland/Utilities/uname.cpp similarity index 100% rename from Userland/uname.cpp rename to Userland/Utilities/uname.cpp diff --git a/Userland/uniq.cpp b/Userland/Utilities/uniq.cpp similarity index 100% rename from Userland/uniq.cpp rename to Userland/Utilities/uniq.cpp diff --git a/Userland/unzip.cpp b/Userland/Utilities/unzip.cpp similarity index 100% rename from Userland/unzip.cpp rename to Userland/Utilities/unzip.cpp diff --git a/Userland/uptime.cpp b/Userland/Utilities/uptime.cpp similarity index 100% rename from Userland/uptime.cpp rename to Userland/Utilities/uptime.cpp diff --git a/Userland/useradd.cpp b/Userland/Utilities/useradd.cpp similarity index 100% rename from Userland/useradd.cpp rename to Userland/Utilities/useradd.cpp diff --git a/Userland/userdel.cpp b/Userland/Utilities/userdel.cpp similarity index 100% rename from Userland/userdel.cpp rename to Userland/Utilities/userdel.cpp diff --git a/Userland/utmpupdate.cpp b/Userland/Utilities/utmpupdate.cpp similarity index 100% rename from Userland/utmpupdate.cpp rename to Userland/Utilities/utmpupdate.cpp diff --git a/Userland/w.cpp b/Userland/Utilities/w.cpp similarity index 100% rename from Userland/w.cpp rename to Userland/Utilities/w.cpp diff --git a/Userland/watch.cpp b/Userland/Utilities/watch.cpp similarity index 100% rename from Userland/watch.cpp rename to Userland/Utilities/watch.cpp diff --git a/Userland/wc.cpp b/Userland/Utilities/wc.cpp similarity index 100% rename from Userland/wc.cpp rename to Userland/Utilities/wc.cpp diff --git a/Userland/which.cpp b/Userland/Utilities/which.cpp similarity index 100% rename from Userland/which.cpp rename to Userland/Utilities/which.cpp diff --git a/Userland/whoami.cpp b/Userland/Utilities/whoami.cpp similarity index 100% rename from Userland/whoami.cpp rename to Userland/Utilities/whoami.cpp diff --git a/Userland/xargs.cpp b/Userland/Utilities/xargs.cpp similarity index 100% rename from Userland/xargs.cpp rename to Userland/Utilities/xargs.cpp diff --git a/Userland/yes.cpp b/Userland/Utilities/yes.cpp similarity index 100% rename from Userland/yes.cpp rename to Userland/Utilities/yes.cpp