diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4a9b8b9d0..c37c28d6c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,14 +136,13 @@ add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root)
 
 include_directories(Userland/Libraries/LibC)
 include_directories(Userland/Libraries/LibM)
-include_directories(Services)
+include_directories(Userland/Services)
 include_directories(Userland)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Services)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Libraries)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland)
 
 add_subdirectory(AK)
 add_subdirectory(Kernel)
-add_subdirectory(Services)
 add_subdirectory(Userland)
diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake
index 886b79f166..6c4f0c00de 100644
--- a/Meta/CMake/utils.cmake
+++ b/Meta/CMake/utils.cmake
@@ -108,7 +108,7 @@ function(compile_ipc source output)
     set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source})
     add_custom_command(
         OUTPUT ${output}
-        COMMAND ${write_if_different} ${output} ${CMAKE_BINARY_DIR}/DevTools/IPCCompiler/IPCCompiler ${source}
+        COMMAND ${write_if_different} ${output} ${CMAKE_BINARY_DIR}/Userland/DevTools/IPCCompiler/IPCCompiler ${source}
         VERBATIM
         DEPENDS IPCCompiler
         MAIN_DEPENDENCY ${source}
diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt
index f99c8daaa9..af91921beb 100644
--- a/Userland/CMakeLists.txt
+++ b/Userland/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(DynamicLoader)
 add_subdirectory(Games)
 add_subdirectory(Libraries)
 add_subdirectory(MenuApplets)
+add_subdirectory(Services)
 add_subdirectory(Shell)
 add_subdirectory(Tests)
 add_subdirectory(Utilities)
diff --git a/Services/AudioServer/AudioClient.ipc b/Userland/Services/AudioServer/AudioClient.ipc
similarity index 100%
rename from Services/AudioServer/AudioClient.ipc
rename to Userland/Services/AudioServer/AudioClient.ipc
diff --git a/Services/AudioServer/AudioServer.ipc b/Userland/Services/AudioServer/AudioServer.ipc
similarity index 100%
rename from Services/AudioServer/AudioServer.ipc
rename to Userland/Services/AudioServer/AudioServer.ipc
diff --git a/Services/AudioServer/CMakeLists.txt b/Userland/Services/AudioServer/CMakeLists.txt
similarity index 100%
rename from Services/AudioServer/CMakeLists.txt
rename to Userland/Services/AudioServer/CMakeLists.txt
diff --git a/Services/AudioServer/ClientConnection.cpp b/Userland/Services/AudioServer/ClientConnection.cpp
similarity index 100%
rename from Services/AudioServer/ClientConnection.cpp
rename to Userland/Services/AudioServer/ClientConnection.cpp
diff --git a/Services/AudioServer/ClientConnection.h b/Userland/Services/AudioServer/ClientConnection.h
similarity index 100%
rename from Services/AudioServer/ClientConnection.h
rename to Userland/Services/AudioServer/ClientConnection.h
diff --git a/Services/AudioServer/Mixer.cpp b/Userland/Services/AudioServer/Mixer.cpp
similarity index 100%
rename from Services/AudioServer/Mixer.cpp
rename to Userland/Services/AudioServer/Mixer.cpp
diff --git a/Services/AudioServer/Mixer.h b/Userland/Services/AudioServer/Mixer.h
similarity index 100%
rename from Services/AudioServer/Mixer.h
rename to Userland/Services/AudioServer/Mixer.h
diff --git a/Services/AudioServer/main.cpp b/Userland/Services/AudioServer/main.cpp
similarity index 100%
rename from Services/AudioServer/main.cpp
rename to Userland/Services/AudioServer/main.cpp
diff --git a/Services/CMakeLists.txt b/Userland/Services/CMakeLists.txt
similarity index 100%
rename from Services/CMakeLists.txt
rename to Userland/Services/CMakeLists.txt
diff --git a/Services/ChessEngine/CMakeLists.txt b/Userland/Services/ChessEngine/CMakeLists.txt
similarity index 100%
rename from Services/ChessEngine/CMakeLists.txt
rename to Userland/Services/ChessEngine/CMakeLists.txt
diff --git a/Services/ChessEngine/ChessEngine.cpp b/Userland/Services/ChessEngine/ChessEngine.cpp
similarity index 100%
rename from Services/ChessEngine/ChessEngine.cpp
rename to Userland/Services/ChessEngine/ChessEngine.cpp
diff --git a/Services/ChessEngine/ChessEngine.h b/Userland/Services/ChessEngine/ChessEngine.h
similarity index 100%
rename from Services/ChessEngine/ChessEngine.h
rename to Userland/Services/ChessEngine/ChessEngine.h
diff --git a/Services/ChessEngine/MCTSTree.cpp b/Userland/Services/ChessEngine/MCTSTree.cpp
similarity index 100%
rename from Services/ChessEngine/MCTSTree.cpp
rename to Userland/Services/ChessEngine/MCTSTree.cpp
diff --git a/Services/ChessEngine/MCTSTree.h b/Userland/Services/ChessEngine/MCTSTree.h
similarity index 100%
rename from Services/ChessEngine/MCTSTree.h
rename to Userland/Services/ChessEngine/MCTSTree.h
diff --git a/Services/ChessEngine/main.cpp b/Userland/Services/ChessEngine/main.cpp
similarity index 100%
rename from Services/ChessEngine/main.cpp
rename to Userland/Services/ChessEngine/main.cpp
diff --git a/Services/Clipboard/CMakeLists.txt b/Userland/Services/Clipboard/CMakeLists.txt
similarity index 100%
rename from Services/Clipboard/CMakeLists.txt
rename to Userland/Services/Clipboard/CMakeLists.txt
diff --git a/Services/Clipboard/ClientConnection.cpp b/Userland/Services/Clipboard/ClientConnection.cpp
similarity index 100%
rename from Services/Clipboard/ClientConnection.cpp
rename to Userland/Services/Clipboard/ClientConnection.cpp
diff --git a/Services/Clipboard/ClientConnection.h b/Userland/Services/Clipboard/ClientConnection.h
similarity index 100%
rename from Services/Clipboard/ClientConnection.h
rename to Userland/Services/Clipboard/ClientConnection.h
diff --git a/Services/Clipboard/ClipboardClient.ipc b/Userland/Services/Clipboard/ClipboardClient.ipc
similarity index 100%
rename from Services/Clipboard/ClipboardClient.ipc
rename to Userland/Services/Clipboard/ClipboardClient.ipc
diff --git a/Services/Clipboard/ClipboardServer.ipc b/Userland/Services/Clipboard/ClipboardServer.ipc
similarity index 100%
rename from Services/Clipboard/ClipboardServer.ipc
rename to Userland/Services/Clipboard/ClipboardServer.ipc
diff --git a/Services/Clipboard/Storage.cpp b/Userland/Services/Clipboard/Storage.cpp
similarity index 100%
rename from Services/Clipboard/Storage.cpp
rename to Userland/Services/Clipboard/Storage.cpp
diff --git a/Services/Clipboard/Storage.h b/Userland/Services/Clipboard/Storage.h
similarity index 100%
rename from Services/Clipboard/Storage.h
rename to Userland/Services/Clipboard/Storage.h
diff --git a/Services/Clipboard/main.cpp b/Userland/Services/Clipboard/main.cpp
similarity index 100%
rename from Services/Clipboard/main.cpp
rename to Userland/Services/Clipboard/main.cpp
diff --git a/Services/CrashDaemon/CMakeLists.txt b/Userland/Services/CrashDaemon/CMakeLists.txt
similarity index 100%
rename from Services/CrashDaemon/CMakeLists.txt
rename to Userland/Services/CrashDaemon/CMakeLists.txt
diff --git a/Services/CrashDaemon/main.cpp b/Userland/Services/CrashDaemon/main.cpp
similarity index 100%
rename from Services/CrashDaemon/main.cpp
rename to Userland/Services/CrashDaemon/main.cpp
diff --git a/Services/DHCPClient/CMakeLists.txt b/Userland/Services/DHCPClient/CMakeLists.txt
similarity index 100%
rename from Services/DHCPClient/CMakeLists.txt
rename to Userland/Services/DHCPClient/CMakeLists.txt
diff --git a/Services/DHCPClient/DHCPv4.cpp b/Userland/Services/DHCPClient/DHCPv4.cpp
similarity index 100%
rename from Services/DHCPClient/DHCPv4.cpp
rename to Userland/Services/DHCPClient/DHCPv4.cpp
diff --git a/Services/DHCPClient/DHCPv4.h b/Userland/Services/DHCPClient/DHCPv4.h
similarity index 100%
rename from Services/DHCPClient/DHCPv4.h
rename to Userland/Services/DHCPClient/DHCPv4.h
diff --git a/Services/DHCPClient/DHCPv4Client.cpp b/Userland/Services/DHCPClient/DHCPv4Client.cpp
similarity index 100%
rename from Services/DHCPClient/DHCPv4Client.cpp
rename to Userland/Services/DHCPClient/DHCPv4Client.cpp
diff --git a/Services/DHCPClient/DHCPv4Client.h b/Userland/Services/DHCPClient/DHCPv4Client.h
similarity index 100%
rename from Services/DHCPClient/DHCPv4Client.h
rename to Userland/Services/DHCPClient/DHCPv4Client.h
diff --git a/Services/DHCPClient/main.cpp b/Userland/Services/DHCPClient/main.cpp
similarity index 100%
rename from Services/DHCPClient/main.cpp
rename to Userland/Services/DHCPClient/main.cpp
diff --git a/Services/EchoServer/CMakeLists.txt b/Userland/Services/EchoServer/CMakeLists.txt
similarity index 100%
rename from Services/EchoServer/CMakeLists.txt
rename to Userland/Services/EchoServer/CMakeLists.txt
diff --git a/Services/EchoServer/Client.cpp b/Userland/Services/EchoServer/Client.cpp
similarity index 100%
rename from Services/EchoServer/Client.cpp
rename to Userland/Services/EchoServer/Client.cpp
diff --git a/Services/EchoServer/Client.h b/Userland/Services/EchoServer/Client.h
similarity index 100%
rename from Services/EchoServer/Client.h
rename to Userland/Services/EchoServer/Client.h
diff --git a/Services/EchoServer/main.cpp b/Userland/Services/EchoServer/main.cpp
similarity index 100%
rename from Services/EchoServer/main.cpp
rename to Userland/Services/EchoServer/main.cpp
diff --git a/Services/ImageDecoder/CMakeLists.txt b/Userland/Services/ImageDecoder/CMakeLists.txt
similarity index 100%
rename from Services/ImageDecoder/CMakeLists.txt
rename to Userland/Services/ImageDecoder/CMakeLists.txt
diff --git a/Services/ImageDecoder/ClientConnection.cpp b/Userland/Services/ImageDecoder/ClientConnection.cpp
similarity index 100%
rename from Services/ImageDecoder/ClientConnection.cpp
rename to Userland/Services/ImageDecoder/ClientConnection.cpp
diff --git a/Services/ImageDecoder/ClientConnection.h b/Userland/Services/ImageDecoder/ClientConnection.h
similarity index 100%
rename from Services/ImageDecoder/ClientConnection.h
rename to Userland/Services/ImageDecoder/ClientConnection.h
diff --git a/Services/ImageDecoder/Forward.h b/Userland/Services/ImageDecoder/Forward.h
similarity index 100%
rename from Services/ImageDecoder/Forward.h
rename to Userland/Services/ImageDecoder/Forward.h
diff --git a/Services/ImageDecoder/ImageDecoderClient.ipc b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc
similarity index 100%
rename from Services/ImageDecoder/ImageDecoderClient.ipc
rename to Userland/Services/ImageDecoder/ImageDecoderClient.ipc
diff --git a/Services/ImageDecoder/ImageDecoderServer.ipc b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc
similarity index 100%
rename from Services/ImageDecoder/ImageDecoderServer.ipc
rename to Userland/Services/ImageDecoder/ImageDecoderServer.ipc
diff --git a/Services/ImageDecoder/main.cpp b/Userland/Services/ImageDecoder/main.cpp
similarity index 100%
rename from Services/ImageDecoder/main.cpp
rename to Userland/Services/ImageDecoder/main.cpp
diff --git a/Services/LaunchServer/CMakeLists.txt b/Userland/Services/LaunchServer/CMakeLists.txt
similarity index 100%
rename from Services/LaunchServer/CMakeLists.txt
rename to Userland/Services/LaunchServer/CMakeLists.txt
diff --git a/Services/LaunchServer/ClientConnection.cpp b/Userland/Services/LaunchServer/ClientConnection.cpp
similarity index 100%
rename from Services/LaunchServer/ClientConnection.cpp
rename to Userland/Services/LaunchServer/ClientConnection.cpp
diff --git a/Services/LaunchServer/ClientConnection.h b/Userland/Services/LaunchServer/ClientConnection.h
similarity index 100%
rename from Services/LaunchServer/ClientConnection.h
rename to Userland/Services/LaunchServer/ClientConnection.h
diff --git a/Services/LaunchServer/LaunchClient.ipc b/Userland/Services/LaunchServer/LaunchClient.ipc
similarity index 100%
rename from Services/LaunchServer/LaunchClient.ipc
rename to Userland/Services/LaunchServer/LaunchClient.ipc
diff --git a/Services/LaunchServer/LaunchServer.ipc b/Userland/Services/LaunchServer/LaunchServer.ipc
similarity index 100%
rename from Services/LaunchServer/LaunchServer.ipc
rename to Userland/Services/LaunchServer/LaunchServer.ipc
diff --git a/Services/LaunchServer/Launcher.cpp b/Userland/Services/LaunchServer/Launcher.cpp
similarity index 100%
rename from Services/LaunchServer/Launcher.cpp
rename to Userland/Services/LaunchServer/Launcher.cpp
diff --git a/Services/LaunchServer/Launcher.h b/Userland/Services/LaunchServer/Launcher.h
similarity index 100%
rename from Services/LaunchServer/Launcher.h
rename to Userland/Services/LaunchServer/Launcher.h
diff --git a/Services/LaunchServer/main.cpp b/Userland/Services/LaunchServer/main.cpp
similarity index 100%
rename from Services/LaunchServer/main.cpp
rename to Userland/Services/LaunchServer/main.cpp
diff --git a/Services/LookupServer/CMakeLists.txt b/Userland/Services/LookupServer/CMakeLists.txt
similarity index 100%
rename from Services/LookupServer/CMakeLists.txt
rename to Userland/Services/LookupServer/CMakeLists.txt
diff --git a/Services/LookupServer/DNSAnswer.cpp b/Userland/Services/LookupServer/DNSAnswer.cpp
similarity index 100%
rename from Services/LookupServer/DNSAnswer.cpp
rename to Userland/Services/LookupServer/DNSAnswer.cpp
diff --git a/Services/LookupServer/DNSAnswer.h b/Userland/Services/LookupServer/DNSAnswer.h
similarity index 100%
rename from Services/LookupServer/DNSAnswer.h
rename to Userland/Services/LookupServer/DNSAnswer.h
diff --git a/Services/LookupServer/DNSPacket.h b/Userland/Services/LookupServer/DNSPacket.h
similarity index 100%
rename from Services/LookupServer/DNSPacket.h
rename to Userland/Services/LookupServer/DNSPacket.h
diff --git a/Services/LookupServer/DNSQuestion.h b/Userland/Services/LookupServer/DNSQuestion.h
similarity index 100%
rename from Services/LookupServer/DNSQuestion.h
rename to Userland/Services/LookupServer/DNSQuestion.h
diff --git a/Services/LookupServer/DNSRequest.cpp b/Userland/Services/LookupServer/DNSRequest.cpp
similarity index 100%
rename from Services/LookupServer/DNSRequest.cpp
rename to Userland/Services/LookupServer/DNSRequest.cpp
diff --git a/Services/LookupServer/DNSRequest.h b/Userland/Services/LookupServer/DNSRequest.h
similarity index 100%
rename from Services/LookupServer/DNSRequest.h
rename to Userland/Services/LookupServer/DNSRequest.h
diff --git a/Services/LookupServer/DNSResponse.cpp b/Userland/Services/LookupServer/DNSResponse.cpp
similarity index 100%
rename from Services/LookupServer/DNSResponse.cpp
rename to Userland/Services/LookupServer/DNSResponse.cpp
diff --git a/Services/LookupServer/DNSResponse.h b/Userland/Services/LookupServer/DNSResponse.h
similarity index 100%
rename from Services/LookupServer/DNSResponse.h
rename to Userland/Services/LookupServer/DNSResponse.h
diff --git a/Services/LookupServer/LookupServer.cpp b/Userland/Services/LookupServer/LookupServer.cpp
similarity index 100%
rename from Services/LookupServer/LookupServer.cpp
rename to Userland/Services/LookupServer/LookupServer.cpp
diff --git a/Services/LookupServer/LookupServer.h b/Userland/Services/LookupServer/LookupServer.h
similarity index 100%
rename from Services/LookupServer/LookupServer.h
rename to Userland/Services/LookupServer/LookupServer.h
diff --git a/Services/LookupServer/main.cpp b/Userland/Services/LookupServer/main.cpp
similarity index 100%
rename from Services/LookupServer/main.cpp
rename to Userland/Services/LookupServer/main.cpp
diff --git a/Services/NotificationServer/CMakeLists.txt b/Userland/Services/NotificationServer/CMakeLists.txt
similarity index 100%
rename from Services/NotificationServer/CMakeLists.txt
rename to Userland/Services/NotificationServer/CMakeLists.txt
diff --git a/Services/NotificationServer/ClientConnection.cpp b/Userland/Services/NotificationServer/ClientConnection.cpp
similarity index 100%
rename from Services/NotificationServer/ClientConnection.cpp
rename to Userland/Services/NotificationServer/ClientConnection.cpp
diff --git a/Services/NotificationServer/ClientConnection.h b/Userland/Services/NotificationServer/ClientConnection.h
similarity index 100%
rename from Services/NotificationServer/ClientConnection.h
rename to Userland/Services/NotificationServer/ClientConnection.h
diff --git a/Services/NotificationServer/NotificationClient.ipc b/Userland/Services/NotificationServer/NotificationClient.ipc
similarity index 100%
rename from Services/NotificationServer/NotificationClient.ipc
rename to Userland/Services/NotificationServer/NotificationClient.ipc
diff --git a/Services/NotificationServer/NotificationServer.ipc b/Userland/Services/NotificationServer/NotificationServer.ipc
similarity index 100%
rename from Services/NotificationServer/NotificationServer.ipc
rename to Userland/Services/NotificationServer/NotificationServer.ipc
diff --git a/Services/NotificationServer/NotificationWindow.cpp b/Userland/Services/NotificationServer/NotificationWindow.cpp
similarity index 100%
rename from Services/NotificationServer/NotificationWindow.cpp
rename to Userland/Services/NotificationServer/NotificationWindow.cpp
diff --git a/Services/NotificationServer/NotificationWindow.h b/Userland/Services/NotificationServer/NotificationWindow.h
similarity index 100%
rename from Services/NotificationServer/NotificationWindow.h
rename to Userland/Services/NotificationServer/NotificationWindow.h
diff --git a/Services/NotificationServer/main.cpp b/Userland/Services/NotificationServer/main.cpp
similarity index 100%
rename from Services/NotificationServer/main.cpp
rename to Userland/Services/NotificationServer/main.cpp
diff --git a/Services/ProtocolServer/CMakeLists.txt b/Userland/Services/ProtocolServer/CMakeLists.txt
similarity index 100%
rename from Services/ProtocolServer/CMakeLists.txt
rename to Userland/Services/ProtocolServer/CMakeLists.txt
diff --git a/Services/ProtocolServer/ClientConnection.cpp b/Userland/Services/ProtocolServer/ClientConnection.cpp
similarity index 100%
rename from Services/ProtocolServer/ClientConnection.cpp
rename to Userland/Services/ProtocolServer/ClientConnection.cpp
diff --git a/Services/ProtocolServer/ClientConnection.h b/Userland/Services/ProtocolServer/ClientConnection.h
similarity index 100%
rename from Services/ProtocolServer/ClientConnection.h
rename to Userland/Services/ProtocolServer/ClientConnection.h
diff --git a/Services/ProtocolServer/Download.cpp b/Userland/Services/ProtocolServer/Download.cpp
similarity index 100%
rename from Services/ProtocolServer/Download.cpp
rename to Userland/Services/ProtocolServer/Download.cpp
diff --git a/Services/ProtocolServer/Download.h b/Userland/Services/ProtocolServer/Download.h
similarity index 100%
rename from Services/ProtocolServer/Download.h
rename to Userland/Services/ProtocolServer/Download.h
diff --git a/Services/ProtocolServer/Forward.h b/Userland/Services/ProtocolServer/Forward.h
similarity index 100%
rename from Services/ProtocolServer/Forward.h
rename to Userland/Services/ProtocolServer/Forward.h
diff --git a/Services/ProtocolServer/GeminiDownload.cpp b/Userland/Services/ProtocolServer/GeminiDownload.cpp
similarity index 100%
rename from Services/ProtocolServer/GeminiDownload.cpp
rename to Userland/Services/ProtocolServer/GeminiDownload.cpp
diff --git a/Services/ProtocolServer/GeminiDownload.h b/Userland/Services/ProtocolServer/GeminiDownload.h
similarity index 100%
rename from Services/ProtocolServer/GeminiDownload.h
rename to Userland/Services/ProtocolServer/GeminiDownload.h
diff --git a/Services/ProtocolServer/GeminiProtocol.cpp b/Userland/Services/ProtocolServer/GeminiProtocol.cpp
similarity index 100%
rename from Services/ProtocolServer/GeminiProtocol.cpp
rename to Userland/Services/ProtocolServer/GeminiProtocol.cpp
diff --git a/Services/ProtocolServer/GeminiProtocol.h b/Userland/Services/ProtocolServer/GeminiProtocol.h
similarity index 100%
rename from Services/ProtocolServer/GeminiProtocol.h
rename to Userland/Services/ProtocolServer/GeminiProtocol.h
diff --git a/Services/ProtocolServer/HttpDownload.cpp b/Userland/Services/ProtocolServer/HttpDownload.cpp
similarity index 100%
rename from Services/ProtocolServer/HttpDownload.cpp
rename to Userland/Services/ProtocolServer/HttpDownload.cpp
diff --git a/Services/ProtocolServer/HttpDownload.h b/Userland/Services/ProtocolServer/HttpDownload.h
similarity index 100%
rename from Services/ProtocolServer/HttpDownload.h
rename to Userland/Services/ProtocolServer/HttpDownload.h
diff --git a/Services/ProtocolServer/HttpProtocol.cpp b/Userland/Services/ProtocolServer/HttpProtocol.cpp
similarity index 100%
rename from Services/ProtocolServer/HttpProtocol.cpp
rename to Userland/Services/ProtocolServer/HttpProtocol.cpp
diff --git a/Services/ProtocolServer/HttpProtocol.h b/Userland/Services/ProtocolServer/HttpProtocol.h
similarity index 100%
rename from Services/ProtocolServer/HttpProtocol.h
rename to Userland/Services/ProtocolServer/HttpProtocol.h
diff --git a/Services/ProtocolServer/HttpsDownload.cpp b/Userland/Services/ProtocolServer/HttpsDownload.cpp
similarity index 100%
rename from Services/ProtocolServer/HttpsDownload.cpp
rename to Userland/Services/ProtocolServer/HttpsDownload.cpp
diff --git a/Services/ProtocolServer/HttpsDownload.h b/Userland/Services/ProtocolServer/HttpsDownload.h
similarity index 100%
rename from Services/ProtocolServer/HttpsDownload.h
rename to Userland/Services/ProtocolServer/HttpsDownload.h
diff --git a/Services/ProtocolServer/HttpsProtocol.cpp b/Userland/Services/ProtocolServer/HttpsProtocol.cpp
similarity index 100%
rename from Services/ProtocolServer/HttpsProtocol.cpp
rename to Userland/Services/ProtocolServer/HttpsProtocol.cpp
diff --git a/Services/ProtocolServer/HttpsProtocol.h b/Userland/Services/ProtocolServer/HttpsProtocol.h
similarity index 100%
rename from Services/ProtocolServer/HttpsProtocol.h
rename to Userland/Services/ProtocolServer/HttpsProtocol.h
diff --git a/Services/ProtocolServer/Protocol.cpp b/Userland/Services/ProtocolServer/Protocol.cpp
similarity index 100%
rename from Services/ProtocolServer/Protocol.cpp
rename to Userland/Services/ProtocolServer/Protocol.cpp
diff --git a/Services/ProtocolServer/Protocol.h b/Userland/Services/ProtocolServer/Protocol.h
similarity index 100%
rename from Services/ProtocolServer/Protocol.h
rename to Userland/Services/ProtocolServer/Protocol.h
diff --git a/Services/ProtocolServer/ProtocolClient.ipc b/Userland/Services/ProtocolServer/ProtocolClient.ipc
similarity index 100%
rename from Services/ProtocolServer/ProtocolClient.ipc
rename to Userland/Services/ProtocolServer/ProtocolClient.ipc
diff --git a/Services/ProtocolServer/ProtocolServer.ipc b/Userland/Services/ProtocolServer/ProtocolServer.ipc
similarity index 100%
rename from Services/ProtocolServer/ProtocolServer.ipc
rename to Userland/Services/ProtocolServer/ProtocolServer.ipc
diff --git a/Services/ProtocolServer/main.cpp b/Userland/Services/ProtocolServer/main.cpp
similarity index 100%
rename from Services/ProtocolServer/main.cpp
rename to Userland/Services/ProtocolServer/main.cpp
diff --git a/Services/SystemMenu/CMakeLists.txt b/Userland/Services/SystemMenu/CMakeLists.txt
similarity index 100%
rename from Services/SystemMenu/CMakeLists.txt
rename to Userland/Services/SystemMenu/CMakeLists.txt
diff --git a/Services/SystemMenu/ShutdownDialog.cpp b/Userland/Services/SystemMenu/ShutdownDialog.cpp
similarity index 100%
rename from Services/SystemMenu/ShutdownDialog.cpp
rename to Userland/Services/SystemMenu/ShutdownDialog.cpp
diff --git a/Services/SystemMenu/ShutdownDialog.h b/Userland/Services/SystemMenu/ShutdownDialog.h
similarity index 100%
rename from Services/SystemMenu/ShutdownDialog.h
rename to Userland/Services/SystemMenu/ShutdownDialog.h
diff --git a/Services/SystemMenu/main.cpp b/Userland/Services/SystemMenu/main.cpp
similarity index 100%
rename from Services/SystemMenu/main.cpp
rename to Userland/Services/SystemMenu/main.cpp
diff --git a/Services/SystemServer/CMakeLists.txt b/Userland/Services/SystemServer/CMakeLists.txt
similarity index 100%
rename from Services/SystemServer/CMakeLists.txt
rename to Userland/Services/SystemServer/CMakeLists.txt
diff --git a/Services/SystemServer/Service.cpp b/Userland/Services/SystemServer/Service.cpp
similarity index 100%
rename from Services/SystemServer/Service.cpp
rename to Userland/Services/SystemServer/Service.cpp
diff --git a/Services/SystemServer/Service.h b/Userland/Services/SystemServer/Service.h
similarity index 100%
rename from Services/SystemServer/Service.h
rename to Userland/Services/SystemServer/Service.h
diff --git a/Services/SystemServer/main.cpp b/Userland/Services/SystemServer/main.cpp
similarity index 100%
rename from Services/SystemServer/main.cpp
rename to Userland/Services/SystemServer/main.cpp
diff --git a/Services/Taskbar/CMakeLists.txt b/Userland/Services/Taskbar/CMakeLists.txt
similarity index 100%
rename from Services/Taskbar/CMakeLists.txt
rename to Userland/Services/Taskbar/CMakeLists.txt
diff --git a/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp
similarity index 100%
rename from Services/Taskbar/TaskbarButton.cpp
rename to Userland/Services/Taskbar/TaskbarButton.cpp
diff --git a/Services/Taskbar/TaskbarButton.h b/Userland/Services/Taskbar/TaskbarButton.h
similarity index 100%
rename from Services/Taskbar/TaskbarButton.h
rename to Userland/Services/Taskbar/TaskbarButton.h
diff --git a/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp
similarity index 100%
rename from Services/Taskbar/TaskbarWindow.cpp
rename to Userland/Services/Taskbar/TaskbarWindow.cpp
diff --git a/Services/Taskbar/TaskbarWindow.h b/Userland/Services/Taskbar/TaskbarWindow.h
similarity index 100%
rename from Services/Taskbar/TaskbarWindow.h
rename to Userland/Services/Taskbar/TaskbarWindow.h
diff --git a/Services/Taskbar/WindowIdentifier.h b/Userland/Services/Taskbar/WindowIdentifier.h
similarity index 100%
rename from Services/Taskbar/WindowIdentifier.h
rename to Userland/Services/Taskbar/WindowIdentifier.h
diff --git a/Services/Taskbar/WindowList.cpp b/Userland/Services/Taskbar/WindowList.cpp
similarity index 100%
rename from Services/Taskbar/WindowList.cpp
rename to Userland/Services/Taskbar/WindowList.cpp
diff --git a/Services/Taskbar/WindowList.h b/Userland/Services/Taskbar/WindowList.h
similarity index 100%
rename from Services/Taskbar/WindowList.h
rename to Userland/Services/Taskbar/WindowList.h
diff --git a/Services/Taskbar/main.cpp b/Userland/Services/Taskbar/main.cpp
similarity index 100%
rename from Services/Taskbar/main.cpp
rename to Userland/Services/Taskbar/main.cpp
diff --git a/Services/TelnetServer/CMakeLists.txt b/Userland/Services/TelnetServer/CMakeLists.txt
similarity index 100%
rename from Services/TelnetServer/CMakeLists.txt
rename to Userland/Services/TelnetServer/CMakeLists.txt
diff --git a/Services/TelnetServer/Client.cpp b/Userland/Services/TelnetServer/Client.cpp
similarity index 100%
rename from Services/TelnetServer/Client.cpp
rename to Userland/Services/TelnetServer/Client.cpp
diff --git a/Services/TelnetServer/Client.h b/Userland/Services/TelnetServer/Client.h
similarity index 100%
rename from Services/TelnetServer/Client.h
rename to Userland/Services/TelnetServer/Client.h
diff --git a/Services/TelnetServer/Command.h b/Userland/Services/TelnetServer/Command.h
similarity index 100%
rename from Services/TelnetServer/Command.h
rename to Userland/Services/TelnetServer/Command.h
diff --git a/Services/TelnetServer/Parser.cpp b/Userland/Services/TelnetServer/Parser.cpp
similarity index 100%
rename from Services/TelnetServer/Parser.cpp
rename to Userland/Services/TelnetServer/Parser.cpp
diff --git a/Services/TelnetServer/Parser.h b/Userland/Services/TelnetServer/Parser.h
similarity index 100%
rename from Services/TelnetServer/Parser.h
rename to Userland/Services/TelnetServer/Parser.h
diff --git a/Services/TelnetServer/main.cpp b/Userland/Services/TelnetServer/main.cpp
similarity index 100%
rename from Services/TelnetServer/main.cpp
rename to Userland/Services/TelnetServer/main.cpp
diff --git a/Services/WebContent/CMakeLists.txt b/Userland/Services/WebContent/CMakeLists.txt
similarity index 100%
rename from Services/WebContent/CMakeLists.txt
rename to Userland/Services/WebContent/CMakeLists.txt
diff --git a/Services/WebContent/ClientConnection.cpp b/Userland/Services/WebContent/ClientConnection.cpp
similarity index 100%
rename from Services/WebContent/ClientConnection.cpp
rename to Userland/Services/WebContent/ClientConnection.cpp
diff --git a/Services/WebContent/ClientConnection.h b/Userland/Services/WebContent/ClientConnection.h
similarity index 100%
rename from Services/WebContent/ClientConnection.h
rename to Userland/Services/WebContent/ClientConnection.h
diff --git a/Services/WebContent/Documentation.txt b/Userland/Services/WebContent/Documentation.txt
similarity index 100%
rename from Services/WebContent/Documentation.txt
rename to Userland/Services/WebContent/Documentation.txt
diff --git a/Services/WebContent/Forward.h b/Userland/Services/WebContent/Forward.h
similarity index 100%
rename from Services/WebContent/Forward.h
rename to Userland/Services/WebContent/Forward.h
diff --git a/Services/WebContent/PageHost.cpp b/Userland/Services/WebContent/PageHost.cpp
similarity index 100%
rename from Services/WebContent/PageHost.cpp
rename to Userland/Services/WebContent/PageHost.cpp
diff --git a/Services/WebContent/PageHost.h b/Userland/Services/WebContent/PageHost.h
similarity index 100%
rename from Services/WebContent/PageHost.h
rename to Userland/Services/WebContent/PageHost.h
diff --git a/Services/WebContent/WebContentClient.ipc b/Userland/Services/WebContent/WebContentClient.ipc
similarity index 100%
rename from Services/WebContent/WebContentClient.ipc
rename to Userland/Services/WebContent/WebContentClient.ipc
diff --git a/Services/WebContent/WebContentServer.ipc b/Userland/Services/WebContent/WebContentServer.ipc
similarity index 100%
rename from Services/WebContent/WebContentServer.ipc
rename to Userland/Services/WebContent/WebContentServer.ipc
diff --git a/Services/WebContent/main.cpp b/Userland/Services/WebContent/main.cpp
similarity index 100%
rename from Services/WebContent/main.cpp
rename to Userland/Services/WebContent/main.cpp
diff --git a/Services/WebServer/CMakeLists.txt b/Userland/Services/WebServer/CMakeLists.txt
similarity index 100%
rename from Services/WebServer/CMakeLists.txt
rename to Userland/Services/WebServer/CMakeLists.txt
diff --git a/Services/WebServer/Client.cpp b/Userland/Services/WebServer/Client.cpp
similarity index 100%
rename from Services/WebServer/Client.cpp
rename to Userland/Services/WebServer/Client.cpp
diff --git a/Services/WebServer/Client.h b/Userland/Services/WebServer/Client.h
similarity index 100%
rename from Services/WebServer/Client.h
rename to Userland/Services/WebServer/Client.h
diff --git a/Services/WebServer/main.cpp b/Userland/Services/WebServer/main.cpp
similarity index 100%
rename from Services/WebServer/main.cpp
rename to Userland/Services/WebServer/main.cpp
diff --git a/Services/WindowServer/AppletManager.cpp b/Userland/Services/WindowServer/AppletManager.cpp
similarity index 100%
rename from Services/WindowServer/AppletManager.cpp
rename to Userland/Services/WindowServer/AppletManager.cpp
diff --git a/Services/WindowServer/AppletManager.h b/Userland/Services/WindowServer/AppletManager.h
similarity index 100%
rename from Services/WindowServer/AppletManager.h
rename to Userland/Services/WindowServer/AppletManager.h
diff --git a/Services/WindowServer/Button.cpp b/Userland/Services/WindowServer/Button.cpp
similarity index 100%
rename from Services/WindowServer/Button.cpp
rename to Userland/Services/WindowServer/Button.cpp
diff --git a/Services/WindowServer/Button.h b/Userland/Services/WindowServer/Button.h
similarity index 100%
rename from Services/WindowServer/Button.h
rename to Userland/Services/WindowServer/Button.h
diff --git a/Services/WindowServer/CMakeLists.txt b/Userland/Services/WindowServer/CMakeLists.txt
similarity index 100%
rename from Services/WindowServer/CMakeLists.txt
rename to Userland/Services/WindowServer/CMakeLists.txt
diff --git a/Services/WindowServer/ClientConnection.cpp b/Userland/Services/WindowServer/ClientConnection.cpp
similarity index 100%
rename from Services/WindowServer/ClientConnection.cpp
rename to Userland/Services/WindowServer/ClientConnection.cpp
diff --git a/Services/WindowServer/ClientConnection.h b/Userland/Services/WindowServer/ClientConnection.h
similarity index 100%
rename from Services/WindowServer/ClientConnection.h
rename to Userland/Services/WindowServer/ClientConnection.h
diff --git a/Services/WindowServer/Compositor.cpp b/Userland/Services/WindowServer/Compositor.cpp
similarity index 100%
rename from Services/WindowServer/Compositor.cpp
rename to Userland/Services/WindowServer/Compositor.cpp
diff --git a/Services/WindowServer/Compositor.h b/Userland/Services/WindowServer/Compositor.h
similarity index 100%
rename from Services/WindowServer/Compositor.h
rename to Userland/Services/WindowServer/Compositor.h
diff --git a/Services/WindowServer/Cursor.cpp b/Userland/Services/WindowServer/Cursor.cpp
similarity index 100%
rename from Services/WindowServer/Cursor.cpp
rename to Userland/Services/WindowServer/Cursor.cpp
diff --git a/Services/WindowServer/Cursor.h b/Userland/Services/WindowServer/Cursor.h
similarity index 100%
rename from Services/WindowServer/Cursor.h
rename to Userland/Services/WindowServer/Cursor.h
diff --git a/Services/WindowServer/Event.h b/Userland/Services/WindowServer/Event.h
similarity index 100%
rename from Services/WindowServer/Event.h
rename to Userland/Services/WindowServer/Event.h
diff --git a/Services/WindowServer/EventLoop.cpp b/Userland/Services/WindowServer/EventLoop.cpp
similarity index 100%
rename from Services/WindowServer/EventLoop.cpp
rename to Userland/Services/WindowServer/EventLoop.cpp
diff --git a/Services/WindowServer/EventLoop.h b/Userland/Services/WindowServer/EventLoop.h
similarity index 100%
rename from Services/WindowServer/EventLoop.h
rename to Userland/Services/WindowServer/EventLoop.h
diff --git a/Services/WindowServer/Menu.cpp b/Userland/Services/WindowServer/Menu.cpp
similarity index 100%
rename from Services/WindowServer/Menu.cpp
rename to Userland/Services/WindowServer/Menu.cpp
diff --git a/Services/WindowServer/Menu.h b/Userland/Services/WindowServer/Menu.h
similarity index 100%
rename from Services/WindowServer/Menu.h
rename to Userland/Services/WindowServer/Menu.h
diff --git a/Services/WindowServer/MenuBar.cpp b/Userland/Services/WindowServer/MenuBar.cpp
similarity index 100%
rename from Services/WindowServer/MenuBar.cpp
rename to Userland/Services/WindowServer/MenuBar.cpp
diff --git a/Services/WindowServer/MenuBar.h b/Userland/Services/WindowServer/MenuBar.h
similarity index 100%
rename from Services/WindowServer/MenuBar.h
rename to Userland/Services/WindowServer/MenuBar.h
diff --git a/Services/WindowServer/MenuItem.cpp b/Userland/Services/WindowServer/MenuItem.cpp
similarity index 100%
rename from Services/WindowServer/MenuItem.cpp
rename to Userland/Services/WindowServer/MenuItem.cpp
diff --git a/Services/WindowServer/MenuItem.h b/Userland/Services/WindowServer/MenuItem.h
similarity index 100%
rename from Services/WindowServer/MenuItem.h
rename to Userland/Services/WindowServer/MenuItem.h
diff --git a/Services/WindowServer/MenuManager.cpp b/Userland/Services/WindowServer/MenuManager.cpp
similarity index 100%
rename from Services/WindowServer/MenuManager.cpp
rename to Userland/Services/WindowServer/MenuManager.cpp
diff --git a/Services/WindowServer/MenuManager.h b/Userland/Services/WindowServer/MenuManager.h
similarity index 100%
rename from Services/WindowServer/MenuManager.h
rename to Userland/Services/WindowServer/MenuManager.h
diff --git a/Services/WindowServer/Screen.cpp b/Userland/Services/WindowServer/Screen.cpp
similarity index 100%
rename from Services/WindowServer/Screen.cpp
rename to Userland/Services/WindowServer/Screen.cpp
diff --git a/Services/WindowServer/Screen.h b/Userland/Services/WindowServer/Screen.h
similarity index 100%
rename from Services/WindowServer/Screen.h
rename to Userland/Services/WindowServer/Screen.h
diff --git a/Services/WindowServer/Window.cpp b/Userland/Services/WindowServer/Window.cpp
similarity index 100%
rename from Services/WindowServer/Window.cpp
rename to Userland/Services/WindowServer/Window.cpp
diff --git a/Services/WindowServer/Window.h b/Userland/Services/WindowServer/Window.h
similarity index 100%
rename from Services/WindowServer/Window.h
rename to Userland/Services/WindowServer/Window.h
diff --git a/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc
similarity index 100%
rename from Services/WindowServer/WindowClient.ipc
rename to Userland/Services/WindowServer/WindowClient.ipc
diff --git a/Services/WindowServer/WindowFrame.cpp b/Userland/Services/WindowServer/WindowFrame.cpp
similarity index 100%
rename from Services/WindowServer/WindowFrame.cpp
rename to Userland/Services/WindowServer/WindowFrame.cpp
diff --git a/Services/WindowServer/WindowFrame.h b/Userland/Services/WindowServer/WindowFrame.h
similarity index 100%
rename from Services/WindowServer/WindowFrame.h
rename to Userland/Services/WindowServer/WindowFrame.h
diff --git a/Services/WindowServer/WindowManager.cpp b/Userland/Services/WindowServer/WindowManager.cpp
similarity index 100%
rename from Services/WindowServer/WindowManager.cpp
rename to Userland/Services/WindowServer/WindowManager.cpp
diff --git a/Services/WindowServer/WindowManager.h b/Userland/Services/WindowServer/WindowManager.h
similarity index 100%
rename from Services/WindowServer/WindowManager.h
rename to Userland/Services/WindowServer/WindowManager.h
diff --git a/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc
similarity index 100%
rename from Services/WindowServer/WindowServer.ipc
rename to Userland/Services/WindowServer/WindowServer.ipc
diff --git a/Services/WindowServer/WindowSwitcher.cpp b/Userland/Services/WindowServer/WindowSwitcher.cpp
similarity index 100%
rename from Services/WindowServer/WindowSwitcher.cpp
rename to Userland/Services/WindowServer/WindowSwitcher.cpp
diff --git a/Services/WindowServer/WindowSwitcher.h b/Userland/Services/WindowServer/WindowSwitcher.h
similarity index 100%
rename from Services/WindowServer/WindowSwitcher.h
rename to Userland/Services/WindowServer/WindowSwitcher.h
diff --git a/Services/WindowServer/WindowType.h b/Userland/Services/WindowServer/WindowType.h
similarity index 100%
rename from Services/WindowServer/WindowType.h
rename to Userland/Services/WindowServer/WindowType.h
diff --git a/Services/WindowServer/main.cpp b/Userland/Services/WindowServer/main.cpp
similarity index 100%
rename from Services/WindowServer/main.cpp
rename to Userland/Services/WindowServer/main.cpp