Userland: Move command-line utilities to Userland/Utilities/

abyesilyurt · Jan 12, 2021 · ececac6 · ececac6
1 parent c4e2fd8
commit ececac6
Show file tree

Hide file tree

Showing 142 changed files with 58 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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 → Userland/Utilities/adjtime.cpp b/Userland/adjtime.cpp → Userland/Utilities/adjtime.cpp
diff --git a/Userland/allocate.cpp → Userland/Utilities/allocate.cpp b/Userland/allocate.cpp → Userland/Utilities/allocate.cpp
diff --git a/Userland/aplay.cpp → Userland/Utilities/aplay.cpp b/Userland/aplay.cpp → Userland/Utilities/aplay.cpp
diff --git a/Userland/arp.cpp → Userland/Utilities/arp.cpp b/Userland/arp.cpp → Userland/Utilities/arp.cpp
diff --git a/Userland/avol.cpp → Userland/Utilities/avol.cpp b/Userland/avol.cpp → Userland/Utilities/avol.cpp
diff --git a/Userland/base64.cpp → Userland/Utilities/base64.cpp b/Userland/base64.cpp → Userland/Utilities/base64.cpp
diff --git a/Userland/basename.cpp → Userland/Utilities/basename.cpp b/Userland/basename.cpp → Userland/Utilities/basename.cpp
diff --git a/Userland/beep.cpp → Userland/Utilities/beep.cpp b/Userland/beep.cpp → Userland/Utilities/beep.cpp
diff --git a/Userland/cal.cpp → Userland/Utilities/cal.cpp b/Userland/cal.cpp → Userland/Utilities/cal.cpp
diff --git a/Userland/cat.cpp → Userland/Utilities/cat.cpp b/Userland/cat.cpp → Userland/Utilities/cat.cpp
diff --git a/Userland/checksum.cpp → Userland/Utilities/checksum.cpp b/Userland/checksum.cpp → Userland/Utilities/checksum.cpp
diff --git a/Userland/chgrp.cpp → Userland/Utilities/chgrp.cpp b/Userland/chgrp.cpp → Userland/Utilities/chgrp.cpp
diff --git a/Userland/chmod.cpp → Userland/Utilities/chmod.cpp b/Userland/chmod.cpp → Userland/Utilities/chmod.cpp
diff --git a/Userland/chown.cpp → Userland/Utilities/chown.cpp b/Userland/chown.cpp → Userland/Utilities/chown.cpp
diff --git a/Userland/chroot.cpp → Userland/Utilities/chroot.cpp b/Userland/chroot.cpp → Userland/Utilities/chroot.cpp
diff --git a/Userland/clear.cpp → Userland/Utilities/clear.cpp b/Userland/clear.cpp → Userland/Utilities/clear.cpp
diff --git a/Userland/copy.cpp → Userland/Utilities/copy.cpp b/Userland/copy.cpp → Userland/Utilities/copy.cpp
diff --git a/Userland/cp.cpp → Userland/Utilities/cp.cpp b/Userland/cp.cpp → Userland/Utilities/cp.cpp
diff --git a/Userland/crash.cpp → Userland/Utilities/crash.cpp b/Userland/crash.cpp → Userland/Utilities/crash.cpp
diff --git a/Userland/cut.cpp → Userland/Utilities/cut.cpp b/Userland/cut.cpp → Userland/Utilities/cut.cpp
diff --git a/Userland/date.cpp → Userland/Utilities/date.cpp b/Userland/date.cpp → Userland/Utilities/date.cpp
diff --git a/Userland/ddate.cpp → Userland/Utilities/ddate.cpp b/Userland/ddate.cpp → Userland/Utilities/ddate.cpp
diff --git a/Userland/df.cpp → Userland/Utilities/df.cpp b/Userland/df.cpp → Userland/Utilities/df.cpp
diff --git a/Userland/dirname.cpp → Userland/Utilities/dirname.cpp b/Userland/dirname.cpp → Userland/Utilities/dirname.cpp
diff --git a/Userland/disasm.cpp → Userland/Utilities/disasm.cpp b/Userland/disasm.cpp → Userland/Utilities/disasm.cpp
diff --git a/Userland/disk_benchmark.cpp → Userland/Utilities/disk_benchmark.cpp b/Userland/disk_benchmark.cpp → Userland/Utilities/disk_benchmark.cpp
diff --git a/Userland/dmesg.cpp → Userland/Utilities/dmesg.cpp b/Userland/dmesg.cpp → Userland/Utilities/dmesg.cpp
diff --git a/Userland/du.cpp → Userland/Utilities/du.cpp b/Userland/du.cpp → Userland/Utilities/du.cpp
diff --git a/Userland/echo.cpp → Userland/Utilities/echo.cpp b/Userland/echo.cpp → Userland/Utilities/echo.cpp
diff --git a/Userland/env.cpp → Userland/Utilities/env.cpp b/Userland/env.cpp → Userland/Utilities/env.cpp
diff --git a/Userland/expr.cpp → Userland/Utilities/expr.cpp b/Userland/expr.cpp → Userland/Utilities/expr.cpp
diff --git a/Userland/false.cpp → Userland/Utilities/false.cpp b/Userland/false.cpp → Userland/Utilities/false.cpp
diff --git a/Userland/fgrep.cpp → Userland/Utilities/fgrep.cpp b/Userland/fgrep.cpp → Userland/Utilities/fgrep.cpp
diff --git a/Userland/find.cpp → Userland/Utilities/find.cpp b/Userland/find.cpp → Userland/Utilities/find.cpp
diff --git a/Userland/flock.cpp → Userland/Utilities/flock.cpp b/Userland/flock.cpp → Userland/Utilities/flock.cpp
diff --git a/Userland/functrace.cpp → Userland/Utilities/functrace.cpp b/Userland/functrace.cpp → Userland/Utilities/functrace.cpp
diff --git a/Userland/gml-format.cpp → Userland/Utilities/gml-format.cpp b/Userland/gml-format.cpp → Userland/Utilities/gml-format.cpp
diff --git a/Userland/grep.cpp → Userland/Utilities/grep.cpp b/Userland/grep.cpp → Userland/Utilities/grep.cpp
diff --git a/Userland/gron.cpp → Userland/Utilities/gron.cpp b/Userland/gron.cpp → Userland/Utilities/gron.cpp
diff --git a/Userland/gunzip.cpp → Userland/Utilities/gunzip.cpp b/Userland/gunzip.cpp → Userland/Utilities/gunzip.cpp
diff --git a/Userland/head.cpp → Userland/Utilities/head.cpp b/Userland/head.cpp → Userland/Utilities/head.cpp
diff --git a/Userland/hexdump.cpp → Userland/Utilities/hexdump.cpp b/Userland/hexdump.cpp → Userland/Utilities/hexdump.cpp
diff --git a/Userland/host.cpp → Userland/Utilities/host.cpp b/Userland/host.cpp → Userland/Utilities/host.cpp
diff --git a/Userland/hostname.cpp → Userland/Utilities/hostname.cpp b/Userland/hostname.cpp → Userland/Utilities/hostname.cpp
diff --git a/Userland/html.cpp → Userland/Utilities/html.cpp b/Userland/html.cpp → Userland/Utilities/html.cpp
diff --git a/Userland/id.cpp → Userland/Utilities/id.cpp b/Userland/id.cpp → Userland/Utilities/id.cpp
diff --git a/Userland/ifconfig.cpp → Userland/Utilities/ifconfig.cpp b/Userland/ifconfig.cpp → Userland/Utilities/ifconfig.cpp
diff --git a/Userland/ini.cpp → Userland/Utilities/ini.cpp b/Userland/ini.cpp → Userland/Utilities/ini.cpp
diff --git a/Userland/jp.cpp → Userland/Utilities/jp.cpp b/Userland/jp.cpp → Userland/Utilities/jp.cpp
diff --git a/Userland/js.cpp → Userland/Utilities/js.cpp b/Userland/js.cpp → Userland/Utilities/js.cpp
diff --git a/Userland/keymap.cpp → Userland/Utilities/keymap.cpp b/Userland/keymap.cpp → Userland/Utilities/keymap.cpp
diff --git a/Userland/kill.cpp → Userland/Utilities/kill.cpp b/Userland/kill.cpp → Userland/Utilities/kill.cpp
diff --git a/Userland/killall.cpp → Userland/Utilities/killall.cpp b/Userland/killall.cpp → Userland/Utilities/killall.cpp
diff --git a/Userland/ln.cpp → Userland/Utilities/ln.cpp b/Userland/ln.cpp → Userland/Utilities/ln.cpp
diff --git a/Userland/ls.cpp → Userland/Utilities/ls.cpp b/Userland/ls.cpp → Userland/Utilities/ls.cpp
diff --git a/Userland/lsirq.cpp → Userland/Utilities/lsirq.cpp b/Userland/lsirq.cpp → Userland/Utilities/lsirq.cpp
diff --git a/Userland/lsof.cpp → Userland/Utilities/lsof.cpp b/Userland/lsof.cpp → Userland/Utilities/lsof.cpp
diff --git a/Userland/lspci.cpp → Userland/Utilities/lspci.cpp b/Userland/lspci.cpp → Userland/Utilities/lspci.cpp
diff --git a/Userland/man.cpp → Userland/Utilities/man.cpp b/Userland/man.cpp → Userland/Utilities/man.cpp
diff --git a/Userland/md.cpp → Userland/Utilities/md.cpp b/Userland/md.cpp → Userland/Utilities/md.cpp
diff --git a/Userland/misbehaving-application.cpp → ...and/Utilities/misbehaving-application.cpp b/Userland/misbehaving-application.cpp → ...and/Utilities/misbehaving-application.cpp
diff --git a/Userland/mkdir.cpp → Userland/Utilities/mkdir.cpp b/Userland/mkdir.cpp → Userland/Utilities/mkdir.cpp
diff --git a/Userland/mkfifo.cpp → Userland/Utilities/mkfifo.cpp b/Userland/mkfifo.cpp → Userland/Utilities/mkfifo.cpp
diff --git a/Userland/mknod.cpp → Userland/Utilities/mknod.cpp b/Userland/mknod.cpp → Userland/Utilities/mknod.cpp
diff --git a/Userland/modload.cpp → Userland/Utilities/modload.cpp b/Userland/modload.cpp → Userland/Utilities/modload.cpp
diff --git a/Userland/modunload.cpp → Userland/Utilities/modunload.cpp b/Userland/modunload.cpp → Userland/Utilities/modunload.cpp
diff --git a/Userland/more.cpp → Userland/Utilities/more.cpp b/Userland/more.cpp → Userland/Utilities/more.cpp
diff --git a/Userland/mount.cpp → Userland/Utilities/mount.cpp b/Userland/mount.cpp → Userland/Utilities/mount.cpp
diff --git a/Userland/mv.cpp → Userland/Utilities/mv.cpp b/Userland/mv.cpp → Userland/Utilities/mv.cpp
diff --git a/Userland/nc.cpp → Userland/Utilities/nc.cpp b/Userland/nc.cpp → Userland/Utilities/nc.cpp
diff --git a/Userland/nl.cpp → Userland/Utilities/nl.cpp b/Userland/nl.cpp → Userland/Utilities/nl.cpp
diff --git a/Userland/notify.cpp → Userland/Utilities/notify.cpp b/Userland/notify.cpp → Userland/Utilities/notify.cpp
diff --git a/Userland/ntpquery.cpp → Userland/Utilities/ntpquery.cpp b/Userland/ntpquery.cpp → Userland/Utilities/ntpquery.cpp
diff --git a/Userland/open.cpp → Userland/Utilities/open.cpp b/Userland/open.cpp → Userland/Utilities/open.cpp
diff --git a/Userland/pape.cpp → Userland/Utilities/pape.cpp b/Userland/pape.cpp → Userland/Utilities/pape.cpp
diff --git a/Userland/passwd.cpp → Userland/Utilities/passwd.cpp b/Userland/passwd.cpp → Userland/Utilities/passwd.cpp
diff --git a/Userland/paste.cpp → Userland/Utilities/paste.cpp b/Userland/paste.cpp → Userland/Utilities/paste.cpp
diff --git a/Userland/pidof.cpp → Userland/Utilities/pidof.cpp b/Userland/pidof.cpp → Userland/Utilities/pidof.cpp
diff --git a/Userland/ping.cpp → Userland/Utilities/ping.cpp b/Userland/ping.cpp → Userland/Utilities/ping.cpp
diff --git a/Userland/pmap.cpp → Userland/Utilities/pmap.cpp b/Userland/pmap.cpp → Userland/Utilities/pmap.cpp
diff --git a/Userland/printf.cpp → Userland/Utilities/printf.cpp b/Userland/printf.cpp → Userland/Utilities/printf.cpp
diff --git a/Userland/pro.cpp → Userland/Utilities/pro.cpp b/Userland/pro.cpp → Userland/Utilities/pro.cpp
diff --git a/Userland/profile.cpp → Userland/Utilities/profile.cpp b/Userland/profile.cpp → Userland/Utilities/profile.cpp
diff --git a/Userland/ps.cpp → Userland/Utilities/ps.cpp b/Userland/ps.cpp → Userland/Utilities/ps.cpp
diff --git a/Userland/purge.cpp → Userland/Utilities/purge.cpp b/Userland/purge.cpp → Userland/Utilities/purge.cpp
diff --git a/Userland/readelf.cpp → Userland/Utilities/readelf.cpp b/Userland/readelf.cpp → Userland/Utilities/readelf.cpp
diff --git a/Userland/readlink.cpp → Userland/Utilities/readlink.cpp b/Userland/readlink.cpp → Userland/Utilities/readlink.cpp
diff --git a/Userland/realpath.cpp → Userland/Utilities/realpath.cpp b/Userland/realpath.cpp → Userland/Utilities/realpath.cpp
diff --git a/Userland/reboot.cpp → Userland/Utilities/reboot.cpp b/Userland/reboot.cpp → Userland/Utilities/reboot.cpp
diff --git a/Userland/rm.cpp → Userland/Utilities/rm.cpp b/Userland/rm.cpp → Userland/Utilities/rm.cpp
diff --git a/Userland/rmdir.cpp → Userland/Utilities/rmdir.cpp b/Userland/rmdir.cpp → Userland/Utilities/rmdir.cpp
diff --git a/Userland/seq.cpp → Userland/Utilities/seq.cpp b/Userland/seq.cpp → Userland/Utilities/seq.cpp
diff --git a/Userland/shutdown.cpp → Userland/Utilities/shutdown.cpp b/Userland/shutdown.cpp → Userland/Utilities/shutdown.cpp
diff --git a/Userland/sleep.cpp → Userland/Utilities/sleep.cpp b/Userland/sleep.cpp → Userland/Utilities/sleep.cpp
diff --git a/Userland/sort.cpp → Userland/Utilities/sort.cpp b/Userland/sort.cpp → Userland/Utilities/sort.cpp
diff --git a/Userland/stat.cpp → Userland/Utilities/stat.cpp b/Userland/stat.cpp → Userland/Utilities/stat.cpp
diff --git a/Userland/strace.cpp → Userland/Utilities/strace.cpp b/Userland/strace.cpp → Userland/Utilities/strace.cpp
diff --git a/Userland/su.cpp → Userland/Utilities/su.cpp b/Userland/su.cpp → Userland/Utilities/su.cpp
diff --git a/Userland/sync.cpp → Userland/Utilities/sync.cpp b/Userland/sync.cpp → Userland/Utilities/sync.cpp
diff --git a/Userland/syscall.cpp → Userland/Utilities/syscall.cpp b/Userland/syscall.cpp → Userland/Utilities/syscall.cpp
diff --git a/Userland/sysctl.cpp → Userland/Utilities/sysctl.cpp b/Userland/sysctl.cpp → Userland/Utilities/sysctl.cpp
diff --git a/Userland/tail.cpp → Userland/Utilities/tail.cpp b/Userland/tail.cpp → Userland/Utilities/tail.cpp
diff --git a/Userland/tar.cpp → Userland/Utilities/tar.cpp b/Userland/tar.cpp → Userland/Utilities/tar.cpp
diff --git a/Userland/tee.cpp → Userland/Utilities/tee.cpp b/Userland/tee.cpp → Userland/Utilities/tee.cpp
diff --git a/Userland/test-bindtodevice.cpp → Userland/Utilities/test-bindtodevice.cpp b/Userland/test-bindtodevice.cpp → Userland/Utilities/test-bindtodevice.cpp
diff --git a/Userland/test-compress.cpp → Userland/Utilities/test-compress.cpp b/Userland/test-compress.cpp → Userland/Utilities/test-compress.cpp
diff --git a/Userland/test-crypto.cpp → Userland/Utilities/test-crypto.cpp b/Userland/test-crypto.cpp → Userland/Utilities/test-crypto.cpp
diff --git a/Userland/test-gfx-font.cpp → Userland/Utilities/test-gfx-font.cpp b/Userland/test-gfx-font.cpp → Userland/Utilities/test-gfx-font.cpp
diff --git a/Userland/test-js.cpp → Userland/Utilities/test-js.cpp b/Userland/test-js.cpp → Userland/Utilities/test-js.cpp
diff --git a/Userland/test-pthread.cpp → Userland/Utilities/test-pthread.cpp b/Userland/test-pthread.cpp → Userland/Utilities/test-pthread.cpp
diff --git a/Userland/test-unveil.cpp → Userland/Utilities/test-unveil.cpp b/Userland/test-unveil.cpp → Userland/Utilities/test-unveil.cpp
diff --git a/Userland/test-web.cpp → Userland/Utilities/test-web.cpp b/Userland/test-web.cpp → Userland/Utilities/test-web.cpp
diff --git a/Userland/test.cpp → Userland/Utilities/test.cpp b/Userland/test.cpp → Userland/Utilities/test.cpp
diff --git a/Userland/test_efault.cpp → Userland/Utilities/test_efault.cpp b/Userland/test_efault.cpp → Userland/Utilities/test_efault.cpp
diff --git a/Userland/test_env.cpp → Userland/Utilities/test_env.cpp b/Userland/test_env.cpp → Userland/Utilities/test_env.cpp
diff --git a/Userland/test_io.cpp → Userland/Utilities/test_io.cpp b/Userland/test_io.cpp → Userland/Utilities/test_io.cpp
diff --git a/Userland/top.cpp → Userland/Utilities/top.cpp b/Userland/top.cpp → Userland/Utilities/top.cpp
diff --git a/Userland/touch.cpp → Userland/Utilities/touch.cpp b/Userland/touch.cpp → Userland/Utilities/touch.cpp
diff --git a/Userland/tr.cpp → Userland/Utilities/tr.cpp b/Userland/tr.cpp → Userland/Utilities/tr.cpp
diff --git a/Userland/tree.cpp → Userland/Utilities/tree.cpp b/Userland/tree.cpp → Userland/Utilities/tree.cpp
diff --git a/Userland/true.cpp → Userland/Utilities/true.cpp b/Userland/true.cpp → Userland/Utilities/true.cpp
diff --git a/Userland/truncate.cpp → Userland/Utilities/truncate.cpp b/Userland/truncate.cpp → Userland/Utilities/truncate.cpp
diff --git a/Userland/tt.cpp → Userland/Utilities/tt.cpp b/Userland/tt.cpp → Userland/Utilities/tt.cpp
diff --git a/Userland/tty.cpp → Userland/Utilities/tty.cpp b/Userland/tty.cpp → Userland/Utilities/tty.cpp
diff --git a/Userland/umount.cpp → Userland/Utilities/umount.cpp b/Userland/umount.cpp → Userland/Utilities/umount.cpp
diff --git a/Userland/uname.cpp → Userland/Utilities/uname.cpp b/Userland/uname.cpp → Userland/Utilities/uname.cpp
diff --git a/Userland/uniq.cpp → Userland/Utilities/uniq.cpp b/Userland/uniq.cpp → Userland/Utilities/uniq.cpp
diff --git a/Userland/unzip.cpp → Userland/Utilities/unzip.cpp b/Userland/unzip.cpp → Userland/Utilities/unzip.cpp
diff --git a/Userland/uptime.cpp → Userland/Utilities/uptime.cpp b/Userland/uptime.cpp → Userland/Utilities/uptime.cpp
diff --git a/Userland/useradd.cpp → Userland/Utilities/useradd.cpp b/Userland/useradd.cpp → Userland/Utilities/useradd.cpp
diff --git a/Userland/userdel.cpp → Userland/Utilities/userdel.cpp b/Userland/userdel.cpp → Userland/Utilities/userdel.cpp
diff --git a/Userland/utmpupdate.cpp → Userland/Utilities/utmpupdate.cpp b/Userland/utmpupdate.cpp → Userland/Utilities/utmpupdate.cpp
diff --git a/Userland/w.cpp → Userland/Utilities/w.cpp b/Userland/w.cpp → Userland/Utilities/w.cpp
diff --git a/Userland/watch.cpp → Userland/Utilities/watch.cpp b/Userland/watch.cpp → Userland/Utilities/watch.cpp
diff --git a/Userland/wc.cpp → Userland/Utilities/wc.cpp b/Userland/wc.cpp → Userland/Utilities/wc.cpp
diff --git a/Userland/which.cpp → Userland/Utilities/which.cpp b/Userland/which.cpp → Userland/Utilities/which.cpp
diff --git a/Userland/whoami.cpp → Userland/Utilities/whoami.cpp b/Userland/whoami.cpp → Userland/Utilities/whoami.cpp
diff --git a/Userland/xargs.cpp → Userland/Utilities/xargs.cpp b/Userland/xargs.cpp → Userland/Utilities/xargs.cpp
diff --git a/Userland/yes.cpp → Userland/Utilities/yes.cpp b/Userland/yes.cpp → Userland/Utilities/yes.cpp