diff --git a/CMakeLists.txt b/CMakeLists.txt
index b721800bfa..54fe121b0d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,9 +137,11 @@ add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root)
 include_directories(Libraries/LibC)
 include_directories(Libraries/LibM)
 include_directories(Services)
+include_directories(Userland)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Libraries)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland)
 
 add_subdirectory(AK)
 add_subdirectory(Kernel)
@@ -149,6 +151,5 @@ add_subdirectory(Applications)
 add_subdirectory(Games)
 add_subdirectory(DevTools)
 add_subdirectory(MenuApplets)
-add_subdirectory(Shell)
 add_subdirectory(Demos)
 add_subdirectory(Userland)
diff --git a/Meta/CLion/CMakeLists.txt b/Meta/CLion/CMakeLists.txt
index 82a60501bf..44175bf8f0 100644
--- a/Meta/CLion/CMakeLists.txt
+++ b/Meta/CLion/CMakeLists.txt
@@ -15,7 +15,7 @@ file(GLOB_RECURSE LIBRARIES_SOURCES "serenity/Libraries/*.cpp")
 file(GLOB_RECURSE MENU_APPLETS_SOURCES "serenity/MenuApplets/*.cpp")
 file(GLOB_RECURSE PORTS_SOURCES "serenity/Ports/*.cpp")
 file(GLOB_RECURSE SERVERS_SOURCES "serenity/Services/*.cpp")
-file(GLOB_RECURSE SHELL_SOURCES "serenity/Shell/*.cpp")
+file(GLOB_RECURSE SHELL_SOURCES "serenity/Userland/Shell/*.cpp")
 file(GLOB_RECURSE TESTS_SOURCES "serenity/Tests/*.cpp")
 file(GLOB_RECURSE TOOLCHAIN_SOURCES "serenity/Toolchain/*.cpp")
 file(GLOB_RECURSE USERLAND_SOURCES "serenity/Userland/*.cpp")
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
index 8685c5e19e..fe29f3ec6e 100644
--- a/Meta/Lagom/CMakeLists.txt
+++ b/Meta/Lagom/CMakeLists.txt
@@ -65,9 +65,9 @@ file(GLOB LIBCRYPTO_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibCrypto/*.cpp")
 file(GLOB LIBCRYPTO_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibCrypto/*/*.cpp")
 file(GLOB LIBTLS_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibTLS/*.cpp")
 file(GLOB LIBTTF_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibTTF/*.cpp")
-file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Shell/*.cpp")
-file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Shell/Tests/*.sh")
-list(REMOVE_ITEM SHELL_SOURCES ../../Shell/main.cpp)
+file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Userland/Shell/*.cpp")
+file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Userland/Shell/Tests/*.sh")
+list(REMOVE_ITEM SHELL_SOURCES ../../Userland/Shell/main.cpp)
 
 set(LAGOM_REGEX_SOURCES ${LIBREGEX_LIBC_SOURCES} ${LIBREGEX_SOURCES})
 set(LAGOM_CORE_SOURCES ${AK_SOURCES} ${LIBCORE_SOURCES})
@@ -131,7 +131,7 @@ if (BUILD_LAGOM)
         target_link_libraries(disasm_lagom Lagom)
         target_link_libraries(disasm_lagom stdc++)
 
-        add_executable(shell_lagom ../../Shell/main.cpp)
+        add_executable(shell_lagom ../../Userland/Shell/main.cpp)
         set_target_properties(shell_lagom PROPERTIES OUTPUT_NAME shell)
         target_link_libraries(shell_lagom Lagom)
         target_link_libraries(shell_lagom stdc++)
diff --git a/Meta/lint-missing-resources.sh b/Meta/lint-missing-resources.sh
index 2c0a4e043c..aa3ec2f863 100755
--- a/Meta/lint-missing-resources.sh
+++ b/Meta/lint-missing-resources.sh
@@ -7,7 +7,7 @@ cd "$script_path/.."
 
 # The dollar symbol in sed's argument is for "end of line", not any shell variable.
 # shellcheck disable=SC2016
-grep -Pirh '(?<!file://)(?<!\.)(?<!})(?<!\()/(etc|res|usr|www)/' AK/ Applications/ Base Demos/ DevTools/ Documentation/ Games/ Kernel/ Libraries/ MenuApplets/ Services/ Shell/ Userland/ | \
+grep -Pirh '(?<!file://)(?<!\.)(?<!})(?<!\()/(etc|res|usr|www)/' AK/ Applications/ Base Demos/ DevTools/ Documentation/ Games/ Kernel/ Libraries/ MenuApplets/ Services/ Userland/ | \
 sed -re 's,^.*["= `]/([^"%`: ]+[^"%`: /.])/?(["%`: .].*)?$,\1,' | \
 sort -u | \
 while read -r referenced_resource
diff --git a/Meta/lint-shell-scripts.sh b/Meta/lint-shell-scripts.sh
index c16c018d1d..da37d35d6d 100755
--- a/Meta/lint-shell-scripts.sh
+++ b/Meta/lint-shell-scripts.sh
@@ -11,7 +11,7 @@ if [ "$#" -eq "0" ]; then
             '*.sh' \
             ':!:Toolchain' \
             ':!:Ports' \
-            ':!:Shell/Tests'
+            ':!:Userland/Shell/Tests'
     )
 else
     files=()
diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt
index 8bc84894ac..2551a923c0 100644
--- a/Userland/CMakeLists.txt
+++ b/Userland/CMakeLists.txt
@@ -48,5 +48,6 @@ target_link_libraries(tt LibPthread)
 target_link_libraries(grep LibRegex)
 target_link_libraries(gunzip LibCompress)
 
-add_subdirectory(Tests)
 add_subdirectory(DynamicLoader)
+add_subdirectory(Shell)
+add_subdirectory(Tests)
diff --git a/Shell/AST.cpp b/Userland/Shell/AST.cpp
similarity index 100%
rename from Shell/AST.cpp
rename to Userland/Shell/AST.cpp
diff --git a/Shell/AST.h b/Userland/Shell/AST.h
similarity index 100%
rename from Shell/AST.h
rename to Userland/Shell/AST.h
diff --git a/Shell/Builtin.cpp b/Userland/Shell/Builtin.cpp
similarity index 100%
rename from Shell/Builtin.cpp
rename to Userland/Shell/Builtin.cpp
diff --git a/Shell/CMakeLists.txt b/Userland/Shell/CMakeLists.txt
similarity index 100%
rename from Shell/CMakeLists.txt
rename to Userland/Shell/CMakeLists.txt
diff --git a/Shell/Execution.h b/Userland/Shell/Execution.h
similarity index 100%
rename from Shell/Execution.h
rename to Userland/Shell/Execution.h
diff --git a/Shell/Formatter.cpp b/Userland/Shell/Formatter.cpp
similarity index 100%
rename from Shell/Formatter.cpp
rename to Userland/Shell/Formatter.cpp
diff --git a/Shell/Formatter.h b/Userland/Shell/Formatter.h
similarity index 100%
rename from Shell/Formatter.h
rename to Userland/Shell/Formatter.h
diff --git a/Shell/Forward.h b/Userland/Shell/Forward.h
similarity index 100%
rename from Shell/Forward.h
rename to Userland/Shell/Forward.h
diff --git a/Shell/Job.cpp b/Userland/Shell/Job.cpp
similarity index 100%
rename from Shell/Job.cpp
rename to Userland/Shell/Job.cpp
diff --git a/Shell/Job.h b/Userland/Shell/Job.h
similarity index 100%
rename from Shell/Job.h
rename to Userland/Shell/Job.h
diff --git a/Shell/NodeVisitor.cpp b/Userland/Shell/NodeVisitor.cpp
similarity index 100%
rename from Shell/NodeVisitor.cpp
rename to Userland/Shell/NodeVisitor.cpp
diff --git a/Shell/NodeVisitor.h b/Userland/Shell/NodeVisitor.h
similarity index 100%
rename from Shell/NodeVisitor.h
rename to Userland/Shell/NodeVisitor.h
diff --git a/Shell/Parser.cpp b/Userland/Shell/Parser.cpp
similarity index 100%
rename from Shell/Parser.cpp
rename to Userland/Shell/Parser.cpp
diff --git a/Shell/Parser.h b/Userland/Shell/Parser.h
similarity index 100%
rename from Shell/Parser.h
rename to Userland/Shell/Parser.h
diff --git a/Shell/Shell.cpp b/Userland/Shell/Shell.cpp
similarity index 100%
rename from Shell/Shell.cpp
rename to Userland/Shell/Shell.cpp
diff --git a/Shell/Shell.h b/Userland/Shell/Shell.h
similarity index 100%
rename from Shell/Shell.h
rename to Userland/Shell/Shell.h
diff --git a/Shell/Tests/backgrounding.sh b/Userland/Shell/Tests/backgrounding.sh
similarity index 100%
rename from Shell/Tests/backgrounding.sh
rename to Userland/Shell/Tests/backgrounding.sh
diff --git a/Shell/Tests/brace-exp.sh b/Userland/Shell/Tests/brace-exp.sh
similarity index 100%
rename from Shell/Tests/brace-exp.sh
rename to Userland/Shell/Tests/brace-exp.sh
diff --git a/Shell/Tests/builtin-redir.sh b/Userland/Shell/Tests/builtin-redir.sh
similarity index 100%
rename from Shell/Tests/builtin-redir.sh
rename to Userland/Shell/Tests/builtin-redir.sh
diff --git a/Shell/Tests/control-structure-as-command.sh b/Userland/Shell/Tests/control-structure-as-command.sh
similarity index 100%
rename from Shell/Tests/control-structure-as-command.sh
rename to Userland/Shell/Tests/control-structure-as-command.sh
diff --git a/Shell/Tests/function.sh b/Userland/Shell/Tests/function.sh
similarity index 100%
rename from Shell/Tests/function.sh
rename to Userland/Shell/Tests/function.sh
diff --git a/Shell/Tests/if.sh b/Userland/Shell/Tests/if.sh
similarity index 100%
rename from Shell/Tests/if.sh
rename to Userland/Shell/Tests/if.sh
diff --git a/Shell/Tests/loop.sh b/Userland/Shell/Tests/loop.sh
similarity index 100%
rename from Shell/Tests/loop.sh
rename to Userland/Shell/Tests/loop.sh
diff --git a/Shell/Tests/match.sh b/Userland/Shell/Tests/match.sh
similarity index 100%
rename from Shell/Tests/match.sh
rename to Userland/Shell/Tests/match.sh
diff --git a/Shell/Tests/sigpipe.sh b/Userland/Shell/Tests/sigpipe.sh
similarity index 100%
rename from Shell/Tests/sigpipe.sh
rename to Userland/Shell/Tests/sigpipe.sh
diff --git a/Shell/Tests/special-vars.sh b/Userland/Shell/Tests/special-vars.sh
similarity index 100%
rename from Shell/Tests/special-vars.sh
rename to Userland/Shell/Tests/special-vars.sh
diff --git a/Shell/Tests/subshell.sh b/Userland/Shell/Tests/subshell.sh
similarity index 100%
rename from Shell/Tests/subshell.sh
rename to Userland/Shell/Tests/subshell.sh
diff --git a/Shell/Tests/valid.sh b/Userland/Shell/Tests/valid.sh
similarity index 100%
rename from Shell/Tests/valid.sh
rename to Userland/Shell/Tests/valid.sh
diff --git a/Shell/main.cpp b/Userland/Shell/main.cpp
similarity index 100%
rename from Shell/main.cpp
rename to Userland/Shell/main.cpp