Services: Renamed from Servers

It didn't feel right to have a "DHCPClient" in a "Servers" directory.
Rename this to Services to better reflect the type of programs we'll
be putting in there.

119 files changed, 31 insertions, 31 deletions

diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile
index 354d07c7cb..1cd944c891 100644
--- a/Applications/Browser/Makefile
+++ b/Applications/Browser/Makefile
@@ -14,8 +14,8 @@ main.cpp: ../../Libraries/LibWeb/CSS/PropertyID.h
 ../../Libraries/LibWeb/CSS/PropertyID.h:
 	@flock ../../Libraries/LibWeb $(MAKE) -C ../../Libraries/LibWeb
 
-main.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h
-../../Servers/ProtocolServer/ProtocolClientEndpoint.h:
-	@flock ../../Servers/ProtocolServer $(MAKE) -C $(dir $(@))
+main.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h
+../../Services/ProtocolServer/ProtocolClientEndpoint.h:
+	@flock ../../Services/ProtocolServer $(MAKE) -C $(dir $(@))
 
 include ../../Makefile.common
diff --git a/Documentation/BuildInstructions.md b/Documentation/BuildInstructions.md
index 4dd79d15ee..5fbd287624 100644
--- a/Documentation/BuildInstructions.md
+++ b/Documentation/BuildInstructions.md
@@ -81,7 +81,7 @@ Bare curious users may even consider sourcing suitable hardware to [install Sere
 
 Later on, when you `git pull` to get the latest changes, there's no need to rebuild the toolchain. You can simply rerun **./makeall.sh** in the `Kernel/` directory and you'll be good to **./run** again.
 
-You can even re-compile only parts of the system. Imagine you changed something in the **WindowServer**. Then run `make -C ../Servers/WindowServer` (from the `Kernel/` directory) followed by **./sync.sh** to update the disk image. Then you can start the system with **./run** again.
+You can even re-compile only parts of the system. Imagine you changed something in the **WindowServer**. Then run `make -C ../Services/WindowServer` (from the `Kernel/` directory) followed by **./sync.sh** to update the disk image. Then you can start the system with **./run** again.
 
 #### Ports
 To add a package from the ports collection to Serenity, for example curl, go into `Ports/curl/` and run **./package.sh**. The sourcecode for the package will be downloaded and the package will be built. After that, run **./sync.sh** from the `Kernel/` directory to update the disk image. The next time you start Serenity with **./run**, `curl` will be available.
diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
index 3c078ad0ef..90b753c6cf 100755
--- a/Kernel/build-root-filesystem.sh
+++ b/Kernel/build-root-filesystem.sh
@@ -159,16 +159,16 @@ cp ../DevTools/Inspector/Inspector mnt/bin/Inspector
 cp ../DevTools/ProfileViewer/ProfileViewer mnt/bin/ProfileViewer
 cp ../Games/Minesweeper/Minesweeper mnt/bin/Minesweeper
 cp ../Games/Snake/Snake mnt/bin/Snake
-cp ../Servers/DHCPClient/DHCPClient mnt/bin/DHCPClient
-cp ../Servers/LookupServer/LookupServer mnt/bin/LookupServer
-cp ../Servers/SystemServer/SystemServer mnt/bin/SystemServer
-cp ../Servers/WindowServer/WindowServer mnt/bin/WindowServer
-cp ../Servers/AudioServer/AudioServer mnt/bin/AudioServer
-cp ../Servers/TTYServer/TTYServer mnt/bin/TTYServer
-cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer
-cp ../Servers/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
-cp ../Servers/NotificationServer/NotificationServer mnt/bin/NotificationServer
-cp ../Servers/WebServer/WebServer mnt/bin/WebServer
+cp ../Services/DHCPClient/DHCPClient mnt/bin/DHCPClient
+cp ../Services/LookupServer/LookupServer mnt/bin/LookupServer
+cp ../Services/SystemServer/SystemServer mnt/bin/SystemServer
+cp ../Services/WindowServer/WindowServer mnt/bin/WindowServer
+cp ../Services/AudioServer/AudioServer mnt/bin/AudioServer
+cp ../Services/TTYServer/TTYServer mnt/bin/TTYServer
+cp ../Services/TelnetServer/TelnetServer mnt/bin/TelnetServer
+cp ../Services/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
+cp ../Services/NotificationServer/NotificationServer mnt/bin/NotificationServer
+cp ../Services/WebServer/WebServer mnt/bin/WebServer
 cp ../Shell/Shell mnt/bin/Shell
 cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/
 cp ../MenuApplets/ResourceGraph/ResourceGraph.MenuApplet mnt/bin/
diff --git a/Libraries/LibAudio/Makefile b/Libraries/LibAudio/Makefile
index 51453a9665..41e9fd3549 100644
--- a/Libraries/LibAudio/Makefile
+++ b/Libraries/LibAudio/Makefile
@@ -5,8 +5,8 @@ OBJS = \
 
 LIBRARY = libaudio.a
 
-ClientConnection.cpp: ../../Servers/AudioServer/AudioClientEndpoint.h
-../../Servers/AudioServer/AudioClientEndpoint.h:
+ClientConnection.cpp: ../../Services/AudioServer/AudioClientEndpoint.h
+../../Services/AudioServer/AudioClientEndpoint.h:
 	@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
 
 install:
diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile
index 2535132435..bbb1327472 100644
--- a/Libraries/LibGUI/Makefile
+++ b/Libraries/LibGUI/Makefile
@@ -77,18 +77,18 @@ OBJS = \
 
 LIBRARY = libgui.a
 
-Application.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h
+Application.cpp: ../../Services/WindowServer/WindowServerEndpoint.h
 
-../../Servers/WindowServer/WindowServerEndpoint.h:
+../../Services/WindowServer/WindowServerEndpoint.h:
 	@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
 
 # HACK: NotificationServer depends on LibGUI so we don't flock for these..
-Notification.cpp: ../../Servers/NotificationServer/NotificationServerEndpoint.h ../../Servers/NotificationServer/NotificationClientEndpoint.h
+Notification.cpp: ../../Services/NotificationServer/NotificationServerEndpoint.h ../../Services/NotificationServer/NotificationClientEndpoint.h
 
-../../Servers/NotificationServer/NotificationServerEndpoint.h:
+../../Services/NotificationServer/NotificationServerEndpoint.h:
 	$(MAKE) -C $(dir $(@)) NotificationServerEndpoint.h
 
-../../Servers/NotificationServer/NotificationClientEndpoint.h:
+../../Services/NotificationServer/NotificationClientEndpoint.h:
 	$(MAKE) -C $(dir $(@)) NotificationClientEndpoint.h
 
 install:
diff --git a/Libraries/LibProtocol/Makefile b/Libraries/LibProtocol/Makefile
index 05714ffb88..00b3605fb6 100644
--- a/Libraries/LibProtocol/Makefile
+++ b/Libraries/LibProtocol/Makefile
@@ -4,8 +4,8 @@ OBJS = \
 
 LIBRARY = libprotocol.a
 
-Download.cpp Client.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h
-../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h:
+Download.cpp Client.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h
+../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h:
 	@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
 
 include ../../Makefile.common
diff --git a/Libraries/LibWeb/Makefile b/Libraries/LibWeb/Makefile
index 2016f72898..c86aa8bf12 100644
--- a/Libraries/LibWeb/Makefile
+++ b/Libraries/LibWeb/Makefile
@@ -118,8 +118,8 @@ CSS/PropertyID.cpp: CSS/Properties.json $(GENERATE_CSS_PROPERTYID_CPP)
 	@echo "GENERATE $@"
 	$(QUIET) flock CSS $(GENERATE_CSS_PROPERTYID_CPP) $< > $@
 
-ResourceLoader.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h
-../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h:
+ResourceLoader.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h
+../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h:
 	@flock $(dir $(@)) $(MAKE) -C $(dir $(@))
 
 EXTRA_CLEAN = CSS/DefaultStyleSheetSource.cpp CSS/PropertyID.h CSS/PropertyID.cpp
diff --git a/Makefile b/Makefile
index f59dd7517d..f8171d607a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SUBDIRS += \
 	Libraries \
 	AK \
 	DevTools \
-	Servers
+	Services
 
 SUBDIRS += \
 	Applications \
diff --git a/Makefile.common b/Makefile.common
index 50b7efd90e..0f40094a1d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -18,7 +18,7 @@ INCLUDE_FLAGS += \
     -I$(SERENITY_BASE_DIR)/DevTools \
     -I$(SERENITY_BASE_DIR) \
     -I$(SERENITY_BASE_DIR)/Libraries \
-    -I$(SERENITY_BASE_DIR)/Servers
+    -I$(SERENITY_BASE_DIR)/Services
 
 VERBOSE = 0
 
diff --git a/Meta/CLion/CMakeLists.txt b/Meta/CLion/CMakeLists.txt
index 4e060c8b4a..048e657892 100644
--- a/Meta/CLion/CMakeLists.txt
+++ b/Meta/CLion/CMakeLists.txt
@@ -12,7 +12,7 @@ file(GLOB_RECURSE KERNEL_SOURCES "serenity/Kernel/*.cpp")
 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/Servers/*.cpp")
+file(GLOB_RECURSE SERVERS_SOURCES "serenity/Services/*.cpp")
 file(GLOB_RECURSE SHELL_SOURCES "serenity/Shell/*.cpp")
 file(GLOB_RECURSE TESTS_SOURCES "serenity/Tests/*.cpp")
 file(GLOB_RECURSE TOOLCHAIN_SOURCES "serenity/Toolchain/*.cpp")
@@ -24,7 +24,7 @@ set(INCLUDE_DIRS
     "serenity/Libraries"
     "serenity/Libraries/LibC"
     "serenity/Libraries/LibPthread"
-    "serenity/Servers"
+    "serenity/Services"
     "serenity/Toolchain/Local/i686-pc-serenity/include/c++/9.3.0")
 
 add_library(serenity
diff --git a/Servers/AudioServer/ASClientConnection.cpp b/Services/AudioServer/ASClientConnection.cpp
index a1d4b766a0..a1d4b766a0 100644
--- a/Servers/AudioServer/ASClientConnection.cpp
+++ b/Services/AudioServer/ASClientConnection.cpp
diff --git a/Servers/AudioServer/ASClientConnection.h b/Services/AudioServer/ASClientConnection.h
index c76c51eb36..c76c51eb36 100644
--- a/Servers/AudioServer/ASClientConnection.h
+++ b/Services/AudioServer/ASClientConnection.h
diff --git a/Servers/AudioServer/ASMixer.cpp b/Services/AudioServer/ASMixer.cpp
index 3d9ff00cc5..3d9ff00cc5 100644
--- a/Servers/AudioServer/ASMixer.cpp
+++ b/Services/AudioServer/ASMixer.cpp
diff --git a/Servers/AudioServer/ASMixer.h b/Services/AudioServer/ASMixer.h
index e5ed5874b2..e5ed5874b2 100644
--- a/Servers/AudioServer/ASMixer.h
+++ b/Services/AudioServer/ASMixer.h
diff --git a/Servers/AudioServer/AudioClient.ipc b/Services/AudioServer/AudioClient.ipc
index 12aa2d0b92..12aa2d0b92 100644
--- a/Servers/AudioServer/AudioClient.ipc
+++ b/Services/AudioServer/AudioClient.ipc
diff --git a/Servers/AudioServer/AudioServer.ipc b/Services/AudioServer/AudioServer.ipc
index b48dcd7e46..b48dcd7e46 100644
--- a/Servers/AudioServer/AudioServer.ipc
+++ b/Services/AudioServer/AudioServer.ipc
diff --git a/Servers/AudioServer/Makefile b/Services/AudioServer/Makefile
index 7b6b3dd031..7b6b3dd031 100644
--- a/Servers/AudioServer/Makefile
+++ b/Services/AudioServer/Makefile
diff --git a/Servers/AudioServer/main.cpp b/Services/AudioServer/main.cpp
index 5907dd77c6..5907dd77c6 100644
--- a/Servers/AudioServer/main.cpp
+++ b/Services/AudioServer/main.cpp
diff --git a/Servers/DHCPClient/DHCPv4.cpp b/Services/DHCPClient/DHCPv4.cpp
index 36430f4eec..36430f4eec 100644
--- a/Servers/DHCPClient/DHCPv4.cpp
+++ b/Services/DHCPClient/DHCPv4.cpp
diff --git a/Servers/DHCPClient/DHCPv4.h b/Services/DHCPClient/DHCPv4.h
index 07c5787f8a..07c5787f8a 100644
--- a/Servers/DHCPClient/DHCPv4.h
+++ b/Services/DHCPClient/DHCPv4.h
diff --git a/Servers/DHCPClient/DHCPv4Client.cpp b/Services/DHCPClient/DHCPv4Client.cpp
index 918a20b93f..918a20b93f 100644
--- a/Servers/DHCPClient/DHCPv4Client.cpp
+++ b/Services/DHCPClient/DHCPv4Client.cpp
diff --git a/Servers/DHCPClient/DHCPv4Client.h b/Services/DHCPClient/DHCPv4Client.h
index c45f08f0d1..c45f08f0d1 100644
--- a/Servers/DHCPClient/DHCPv4Client.h
+++ b/Services/DHCPClient/DHCPv4Client.h
diff --git a/Servers/DHCPClient/Makefile b/Services/DHCPClient/Makefile
index ce7c27b86d..ce7c27b86d 100644
--- a/Servers/DHCPClient/Makefile
+++ b/Services/DHCPClient/Makefile
diff --git a/Servers/DHCPClient/main.cpp b/Services/DHCPClient/main.cpp
index b65b63eb46..b65b63eb46 100644
--- a/Servers/DHCPClient/main.cpp
+++ b/Services/DHCPClient/main.cpp
diff --git a/Servers/LookupServer/DNSAnswer.cpp b/Services/LookupServer/DNSAnswer.cpp
index 775c23784e..775c23784e 100644
--- a/Servers/LookupServer/DNSAnswer.cpp
+++ b/Services/LookupServer/DNSAnswer.cpp
diff --git a/Servers/LookupServer/DNSAnswer.h b/Services/LookupServer/DNSAnswer.h
index 794603dd30..794603dd30 100644
--- a/Servers/LookupServer/DNSAnswer.h
+++ b/Services/LookupServer/DNSAnswer.h
diff --git a/Servers/LookupServer/DNSPacket.h b/Services/LookupServer/DNSPacket.h
index 832de9b7bb..832de9b7bb 100644
--- a/Servers/LookupServer/DNSPacket.h
+++ b/Services/LookupServer/DNSPacket.h
diff --git a/Servers/LookupServer/DNSQuestion.h b/Services/LookupServer/DNSQuestion.h
index ec696905e6..ec696905e6 100644
--- a/Servers/LookupServer/DNSQuestion.h
+++ b/Services/LookupServer/DNSQuestion.h
diff --git a/Servers/LookupServer/DNSRequest.cpp b/Services/LookupServer/DNSRequest.cpp
index 79d6ff5aec..79d6ff5aec 100644
--- a/Servers/LookupServer/DNSRequest.cpp
+++ b/Services/LookupServer/DNSRequest.cpp
diff --git a/Servers/LookupServer/DNSRequest.h b/Services/LookupServer/DNSRequest.h
index 2b55dd75fb..2b55dd75fb 100644
--- a/Servers/LookupServer/DNSRequest.h
+++ b/Services/LookupServer/DNSRequest.h
diff --git a/Servers/LookupServer/DNSResponse.cpp b/Services/LookupServer/DNSResponse.cpp
index 614e58db2b..614e58db2b 100644
--- a/Servers/LookupServer/DNSResponse.cpp
+++ b/Services/LookupServer/DNSResponse.cpp
diff --git a/Servers/LookupServer/DNSResponse.h b/Services/LookupServer/DNSResponse.h
index 0301c12075..0301c12075 100644
--- a/Servers/LookupServer/DNSResponse.h
+++ b/Services/LookupServer/DNSResponse.h
diff --git a/Servers/LookupServer/LookupServer.cpp b/Services/LookupServer/LookupServer.cpp
index fe89bd97fc..fe89bd97fc 100644
--- a/Servers/LookupServer/LookupServer.cpp
+++ b/Services/LookupServer/LookupServer.cpp
diff --git a/Servers/LookupServer/LookupServer.h b/Services/LookupServer/LookupServer.h
index 4666e0904b..4666e0904b 100644
--- a/Servers/LookupServer/LookupServer.h
+++ b/Services/LookupServer/LookupServer.h
diff --git a/Servers/LookupServer/Makefile b/Services/LookupServer/Makefile
index 42a4e1930b..42a4e1930b 100644
--- a/Servers/LookupServer/Makefile
+++ b/Services/LookupServer/Makefile
diff --git a/Servers/LookupServer/main.cpp b/Services/LookupServer/main.cpp
index d8f40e114b..d8f40e114b 100644
--- a/Servers/LookupServer/main.cpp
+++ b/Services/LookupServer/main.cpp
diff --git a/Servers/Makefile b/Services/Makefile
index 0025ae2061..0025ae2061 100644
--- a/Servers/Makefile
+++ b/Services/Makefile
diff --git a/Servers/NotificationServer/ClientConnection.cpp b/Services/NotificationServer/ClientConnection.cpp
index 9b8064de03..9b8064de03 100644
--- a/Servers/NotificationServer/ClientConnection.cpp
+++ b/Services/NotificationServer/ClientConnection.cpp
diff --git a/Servers/NotificationServer/ClientConnection.h b/Services/NotificationServer/ClientConnection.h
index bec07fb127..bec07fb127 100644
--- a/Servers/NotificationServer/ClientConnection.h
+++ b/Services/NotificationServer/ClientConnection.h
diff --git a/Servers/NotificationServer/Makefile b/Services/NotificationServer/Makefile
index 36a1e41652..36a1e41652 100644
--- a/Servers/NotificationServer/Makefile
+++ b/Services/NotificationServer/Makefile
diff --git a/Servers/NotificationServer/NotificationClient.ipc b/Services/NotificationServer/NotificationClient.ipc
index fc85168f76..fc85168f76 100644
--- a/Servers/NotificationServer/NotificationClient.ipc
+++ b/Services/NotificationServer/NotificationClient.ipc
diff --git a/Servers/NotificationServer/NotificationServer.ipc b/Services/NotificationServer/NotificationServer.ipc
index f1ac5e13df..f1ac5e13df 100644
--- a/Servers/NotificationServer/NotificationServer.ipc
+++ b/Services/NotificationServer/NotificationServer.ipc
diff --git a/Servers/NotificationServer/NotificationWindow.cpp b/Services/NotificationServer/NotificationWindow.cpp
index 96b0c2652d..96b0c2652d 100644
--- a/Servers/NotificationServer/NotificationWindow.cpp
+++ b/Services/NotificationServer/NotificationWindow.cpp
diff --git a/Servers/NotificationServer/NotificationWindow.h b/Services/NotificationServer/NotificationWindow.h
index 3519af0752..3519af0752 100644
--- a/Servers/NotificationServer/NotificationWindow.h
+++ b/Services/NotificationServer/NotificationWindow.h
diff --git a/Servers/NotificationServer/main.cpp b/Services/NotificationServer/main.cpp
index f26aeec567..f26aeec567 100644
--- a/Servers/NotificationServer/main.cpp
+++ b/Services/NotificationServer/main.cpp
diff --git a/Servers/ProtocolServer/Download.cpp b/Services/ProtocolServer/Download.cpp
index e4bbce082b..e4bbce082b 100644
--- a/Servers/ProtocolServer/Download.cpp
+++ b/Services/ProtocolServer/Download.cpp
diff --git a/Servers/ProtocolServer/Download.h b/Services/ProtocolServer/Download.h
index 5609cd15b4..5609cd15b4 100644
--- a/Servers/ProtocolServer/Download.h
+++ b/Services/ProtocolServer/Download.h
diff --git a/Servers/ProtocolServer/HttpDownload.cpp b/Services/ProtocolServer/HttpDownload.cpp
index 5ffa30362b..5ffa30362b 100644
--- a/Servers/ProtocolServer/HttpDownload.cpp
+++ b/Services/ProtocolServer/HttpDownload.cpp
diff --git a/Servers/ProtocolServer/HttpDownload.h b/Services/ProtocolServer/HttpDownload.h
index 364fe6aef2..364fe6aef2 100644
--- a/Servers/ProtocolServer/HttpDownload.h
+++ b/Services/ProtocolServer/HttpDownload.h
diff --git a/Servers/ProtocolServer/HttpProtocol.cpp b/Services/ProtocolServer/HttpProtocol.cpp
index 1513a32e66..1513a32e66 100644
--- a/Servers/ProtocolServer/HttpProtocol.cpp
+++ b/Services/ProtocolServer/HttpProtocol.cpp
diff --git a/Servers/ProtocolServer/HttpProtocol.h b/Services/ProtocolServer/HttpProtocol.h
index ea6c15d2a4..ea6c15d2a4 100644
--- a/Servers/ProtocolServer/HttpProtocol.h
+++ b/Services/ProtocolServer/HttpProtocol.h
diff --git a/Servers/ProtocolServer/HttpsDownload.cpp b/Services/ProtocolServer/HttpsDownload.cpp
index 8e068c2b04..8e068c2b04 100644
--- a/Servers/ProtocolServer/HttpsDownload.cpp
+++ b/Services/ProtocolServer/HttpsDownload.cpp
diff --git a/Servers/ProtocolServer/HttpsDownload.h b/Services/ProtocolServer/HttpsDownload.h
index a6c75bc4d7..a6c75bc4d7 100644
--- a/Servers/ProtocolServer/HttpsDownload.h
+++ b/Services/ProtocolServer/HttpsDownload.h
diff --git a/Servers/ProtocolServer/HttpsProtocol.cpp b/Services/ProtocolServer/HttpsProtocol.cpp
index 07020affe5..07020affe5 100644
--- a/Servers/ProtocolServer/HttpsProtocol.cpp
+++ b/Services/ProtocolServer/HttpsProtocol.cpp
diff --git a/Servers/ProtocolServer/HttpsProtocol.h b/Services/ProtocolServer/HttpsProtocol.h
index e446178751..e446178751 100644
--- a/Servers/ProtocolServer/HttpsProtocol.h
+++ b/Services/ProtocolServer/HttpsProtocol.h
diff --git a/Servers/ProtocolServer/Makefile b/Services/ProtocolServer/Makefile
index fa39255c53..fa39255c53 100644
--- a/Servers/ProtocolServer/Makefile
+++ b/Services/ProtocolServer/Makefile
diff --git a/Servers/ProtocolServer/PSClientConnection.cpp b/Services/ProtocolServer/PSClientConnection.cpp
index 1d07fdb8b2..1d07fdb8b2 100644
--- a/Servers/ProtocolServer/PSClientConnection.cpp
+++ b/Services/ProtocolServer/PSClientConnection.cpp
diff --git a/Servers/ProtocolServer/PSClientConnection.h b/Services/ProtocolServer/PSClientConnection.h
index 56a7c63c0c..56a7c63c0c 100644
--- a/Servers/ProtocolServer/PSClientConnection.h
+++ b/Services/ProtocolServer/PSClientConnection.h
diff --git a/Servers/ProtocolServer/Protocol.cpp b/Services/ProtocolServer/Protocol.cpp
index bf53895eaa..bf53895eaa 100644
--- a/Servers/ProtocolServer/Protocol.cpp
+++ b/Services/ProtocolServer/Protocol.cpp
diff --git a/Servers/ProtocolServer/Protocol.h b/Services/ProtocolServer/Protocol.h
index 19bd38f517..19bd38f517 100644
--- a/Servers/ProtocolServer/Protocol.h
+++ b/Services/ProtocolServer/Protocol.h
diff --git a/Servers/ProtocolServer/ProtocolClient.ipc b/Services/ProtocolServer/ProtocolClient.ipc
index 575b3ddd2b..575b3ddd2b 100644
--- a/Servers/ProtocolServer/ProtocolClient.ipc
+++ b/Services/ProtocolServer/ProtocolClient.ipc
diff --git a/Servers/ProtocolServer/ProtocolServer.ipc b/Services/ProtocolServer/ProtocolServer.ipc
index 74ec138ab5..74ec138ab5 100644
--- a/Servers/ProtocolServer/ProtocolServer.ipc
+++ b/Services/ProtocolServer/ProtocolServer.ipc
diff --git a/Servers/ProtocolServer/main.cpp b/Services/ProtocolServer/main.cpp
index 9a3da67b78..9a3da67b78 100644
--- a/Servers/ProtocolServer/main.cpp
+++ b/Services/ProtocolServer/main.cpp
diff --git a/Servers/SystemServer/Makefile b/Services/SystemServer/Makefile
index 0a29c53463..0a29c53463 100644
--- a/Servers/SystemServer/Makefile
+++ b/Services/SystemServer/Makefile
diff --git a/Servers/SystemServer/Service.cpp b/Services/SystemServer/Service.cpp
index 1f917ba1e6..1f917ba1e6 100644
--- a/Servers/SystemServer/Service.cpp
+++ b/Services/SystemServer/Service.cpp
diff --git a/Servers/SystemServer/Service.h b/Services/SystemServer/Service.h
index de408ec04d..de408ec04d 100644
--- a/Servers/SystemServer/Service.h
+++ b/Services/SystemServer/Service.h
diff --git a/Servers/SystemServer/main.cpp b/Services/SystemServer/main.cpp
index 0d49d0d937..0d49d0d937 100644
--- a/Servers/SystemServer/main.cpp
+++ b/Services/SystemServer/main.cpp
diff --git a/Servers/TTYServer/Makefile b/Services/TTYServer/Makefile
index d1eb798683..d1eb798683 100644
--- a/Servers/TTYServer/Makefile
+++ b/Services/TTYServer/Makefile
diff --git a/Servers/TTYServer/main.cpp b/Services/TTYServer/main.cpp
index 79e43ca84b..79e43ca84b 100644
--- a/Servers/TTYServer/main.cpp
+++ b/Services/TTYServer/main.cpp
diff --git a/Servers/TelnetServer/Client.cpp b/Services/TelnetServer/Client.cpp
index e983025df6..e983025df6 100644
--- a/Servers/TelnetServer/Client.cpp
+++ b/Services/TelnetServer/Client.cpp
diff --git a/Servers/TelnetServer/Client.h b/Services/TelnetServer/Client.h
index fe345d38e3..fe345d38e3 100644
--- a/Servers/TelnetServer/Client.h
+++ b/Services/TelnetServer/Client.h
diff --git a/Servers/TelnetServer/Command.h b/Services/TelnetServer/Command.h
index ac696c2111..ac696c2111 100644
--- a/Servers/TelnetServer/Command.h
+++ b/Services/TelnetServer/Command.h
diff --git a/Servers/TelnetServer/Makefile b/Services/TelnetServer/Makefile
index bfee24f38c..bfee24f38c 100644
--- a/Servers/TelnetServer/Makefile
+++ b/Services/TelnetServer/Makefile
diff --git a/Servers/TelnetServer/Parser.cpp b/Services/TelnetServer/Parser.cpp
index 9fc1aabcd1..9fc1aabcd1 100644
--- a/Servers/TelnetServer/Parser.cpp
+++ b/Services/TelnetServer/Parser.cpp
diff --git a/Servers/TelnetServer/Parser.h b/Services/TelnetServer/Parser.h
index 64688881df..64688881df 100644
--- a/Servers/TelnetServer/Parser.h
+++ b/Services/TelnetServer/Parser.h
diff --git a/Servers/TelnetServer/main.cpp b/Services/TelnetServer/main.cpp
index 6acb900b61..6acb900b61 100644
--- a/Servers/TelnetServer/main.cpp
+++ b/Services/TelnetServer/main.cpp
diff --git a/Servers/WebServer/Client.cpp b/Services/WebServer/Client.cpp
index ae9aedc907..ae9aedc907 100644
--- a/Servers/WebServer/Client.cpp
+++ b/Services/WebServer/Client.cpp
diff --git a/Servers/WebServer/Client.h b/Services/WebServer/Client.h
index 35cdb4ab1c..35cdb4ab1c 100644
--- a/Servers/WebServer/Client.h
+++ b/Services/WebServer/Client.h
diff --git a/Servers/WebServer/Makefile b/Services/WebServer/Makefile
index ddc99a85ae..ddc99a85ae 100644
--- a/Servers/WebServer/Makefile
+++ b/Services/WebServer/Makefile
diff --git a/Servers/WebServer/main.cpp b/Services/WebServer/main.cpp
index 7e218b8bb8..7e218b8bb8 100644
--- a/Servers/WebServer/main.cpp
+++ b/Services/WebServer/main.cpp
diff --git a/Servers/WindowServer/AppletManager.cpp b/Services/WindowServer/AppletManager.cpp
index 855ff3bcd3..855ff3bcd3 100644
--- a/Servers/WindowServer/AppletManager.cpp
+++ b/Services/WindowServer/AppletManager.cpp
diff --git a/Servers/WindowServer/AppletManager.h b/Services/WindowServer/AppletManager.h
index 4619fd0030..4619fd0030 100644
--- a/Servers/WindowServer/AppletManager.h
+++ b/Services/WindowServer/AppletManager.h
diff --git a/Servers/WindowServer/Button.cpp b/Services/WindowServer/Button.cpp
index 95037d4bc8..95037d4bc8 100644
--- a/Servers/WindowServer/Button.cpp
+++ b/Services/WindowServer/Button.cpp
diff --git a/Servers/WindowServer/Button.h b/Services/WindowServer/Button.h
index 555a5d6f9e..555a5d6f9e 100644
--- a/Servers/WindowServer/Button.h
+++ b/Services/WindowServer/Button.h
diff --git a/Servers/WindowServer/ClientConnection.cpp b/Services/WindowServer/ClientConnection.cpp
index 7f128689fb..7f128689fb 100644
--- a/Servers/WindowServer/ClientConnection.cpp
+++ b/Services/WindowServer/ClientConnection.cpp
diff --git a/Servers/WindowServer/ClientConnection.h b/Services/WindowServer/ClientConnection.h
index 92c2f2fa08..92c2f2fa08 100644
--- a/Servers/WindowServer/ClientConnection.h
+++ b/Services/WindowServer/ClientConnection.h
diff --git a/Servers/WindowServer/Clipboard.cpp b/Services/WindowServer/Clipboard.cpp
index 4d9db8b4bc..4d9db8b4bc 100644
--- a/Servers/WindowServer/Clipboard.cpp
+++ b/Services/WindowServer/Clipboard.cpp
diff --git a/Servers/WindowServer/Clipboard.h b/Services/WindowServer/Clipboard.h
index 6cb9140234..6cb9140234 100644
--- a/Servers/WindowServer/Clipboard.h
+++ b/Services/WindowServer/Clipboard.h
diff --git a/Servers/WindowServer/Compositor.cpp b/Services/WindowServer/Compositor.cpp
index 57f87178df..57f87178df 100644
--- a/Servers/WindowServer/Compositor.cpp
+++ b/Services/WindowServer/Compositor.cpp
diff --git a/Servers/WindowServer/Compositor.h b/Services/WindowServer/Compositor.h
index 99778d786c..99778d786c 100644
--- a/Servers/WindowServer/Compositor.h
+++ b/Services/WindowServer/Compositor.h
diff --git a/Servers/WindowServer/Cursor.cpp b/Services/WindowServer/Cursor.cpp
index 42e431f481..42e431f481 100644
--- a/Servers/WindowServer/Cursor.cpp
+++ b/Services/WindowServer/Cursor.cpp
diff --git a/Servers/WindowServer/Cursor.h b/Services/WindowServer/Cursor.h
index 5173bd86a1..5173bd86a1 100644
--- a/Servers/WindowServer/Cursor.h
+++ b/Services/WindowServer/Cursor.h
diff --git a/Servers/WindowServer/Event.h b/Services/WindowServer/Event.h
index 48def26519..48def26519 100644
--- a/Servers/WindowServer/Event.h
+++ b/Services/WindowServer/Event.h
diff --git a/Servers/WindowServer/EventLoop.cpp b/Services/WindowServer/EventLoop.cpp
index 078794d6f3..078794d6f3 100644
--- a/Servers/WindowServer/EventLoop.cpp
+++ b/Services/WindowServer/EventLoop.cpp
diff --git a/Servers/WindowServer/EventLoop.h b/Services/WindowServer/EventLoop.h
index b476b5e639..b476b5e639 100644
--- a/Servers/WindowServer/EventLoop.h
+++ b/Services/WindowServer/EventLoop.h
diff --git a/Servers/WindowServer/Makefile b/Services/WindowServer/Makefile
index 064e2bd0f2..064e2bd0f2 100644
--- a/Servers/WindowServer/Makefile
+++ b/Services/WindowServer/Makefile
diff --git a/Servers/WindowServer/Menu.cpp b/Services/WindowServer/Menu.cpp
index 07c460b9b2..07c460b9b2 100644
--- a/Servers/WindowServer/Menu.cpp
+++ b/Services/WindowServer/Menu.cpp
diff --git a/Servers/WindowServer/Menu.h b/Services/WindowServer/Menu.h
index de9325616c..de9325616c 100644
--- a/Servers/WindowServer/Menu.h
+++ b/Services/WindowServer/Menu.h
diff --git a/Servers/WindowServer/MenuBar.cpp b/Services/WindowServer/MenuBar.cpp
index 27dbdcbebf..27dbdcbebf 100644
--- a/Servers/WindowServer/MenuBar.cpp
+++ b/Services/WindowServer/MenuBar.cpp
diff --git a/Servers/WindowServer/MenuBar.h b/Services/WindowServer/MenuBar.h
index 31dff9ac0f..31dff9ac0f 100644
--- a/Servers/WindowServer/MenuBar.h
+++ b/Services/WindowServer/MenuBar.h
diff --git a/Servers/WindowServer/MenuItem.cpp b/Services/WindowServer/MenuItem.cpp
index eba593c136..eba593c136 100644
--- a/Servers/WindowServer/MenuItem.cpp
+++ b/Services/WindowServer/MenuItem.cpp
diff --git a/Servers/WindowServer/MenuItem.h b/Services/WindowServer/MenuItem.h
index 3f297adb43..3f297adb43 100644
--- a/Servers/WindowServer/MenuItem.h
+++ b/Services/WindowServer/MenuItem.h
diff --git a/Servers/WindowServer/MenuManager.cpp b/Services/WindowServer/MenuManager.cpp
index 2470d4f1fa..2470d4f1fa 100644
--- a/Servers/WindowServer/MenuManager.cpp
+++ b/Services/WindowServer/MenuManager.cpp
diff --git a/Servers/WindowServer/MenuManager.h b/Services/WindowServer/MenuManager.h
index f4d5d5aad8..f4d5d5aad8 100644
--- a/Servers/WindowServer/MenuManager.h
+++ b/Services/WindowServer/MenuManager.h
diff --git a/Servers/WindowServer/Screen.cpp b/Services/WindowServer/Screen.cpp
index 3f0fbb04fd..3f0fbb04fd 100644
--- a/Servers/WindowServer/Screen.cpp
+++ b/Services/WindowServer/Screen.cpp
diff --git a/Servers/WindowServer/Screen.h b/Services/WindowServer/Screen.h
index d522ea7b96..d522ea7b96 100644
--- a/Servers/WindowServer/Screen.h
+++ b/Services/WindowServer/Screen.h
diff --git a/Servers/WindowServer/Window.cpp b/Services/WindowServer/Window.cpp
index 4d506e1dc7..4d506e1dc7 100644
--- a/Servers/WindowServer/Window.cpp
+++ b/Services/WindowServer/Window.cpp
diff --git a/Servers/WindowServer/Window.h b/Services/WindowServer/Window.h
index 09856c96dd..09856c96dd 100644
--- a/Servers/WindowServer/Window.h
+++ b/Services/WindowServer/Window.h
diff --git a/Servers/WindowServer/WindowClient.ipc b/Services/WindowServer/WindowClient.ipc
index 3c94ccf89e..3c94ccf89e 100644
--- a/Servers/WindowServer/WindowClient.ipc
+++ b/Services/WindowServer/WindowClient.ipc
diff --git a/Servers/WindowServer/WindowFrame.cpp b/Services/WindowServer/WindowFrame.cpp
index 2d6b8cad73..2d6b8cad73 100644
--- a/Servers/WindowServer/WindowFrame.cpp
+++ b/Services/WindowServer/WindowFrame.cpp
diff --git a/Servers/WindowServer/WindowFrame.h b/Services/WindowServer/WindowFrame.h
index 021edb9d0f..021edb9d0f 100644
--- a/Servers/WindowServer/WindowFrame.h
+++ b/Services/WindowServer/WindowFrame.h
diff --git a/Servers/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp
index 2b168107d1..2b168107d1 100644
--- a/Servers/WindowServer/WindowManager.cpp
+++ b/Services/WindowServer/WindowManager.cpp
diff --git a/Servers/WindowServer/WindowManager.h b/Services/WindowServer/WindowManager.h
index 0c7ec8429f..0c7ec8429f 100644
--- a/Servers/WindowServer/WindowManager.h
+++ b/Services/WindowServer/WindowManager.h
diff --git a/Servers/WindowServer/WindowServer.ipc b/Services/WindowServer/WindowServer.ipc
index 214afa7567..214afa7567 100644
--- a/Servers/WindowServer/WindowServer.ipc
+++ b/Services/WindowServer/WindowServer.ipc
diff --git a/Servers/WindowServer/WindowSwitcher.cpp b/Services/WindowServer/WindowSwitcher.cpp
index fbf53184da..fbf53184da 100644
--- a/Servers/WindowServer/WindowSwitcher.cpp
+++ b/Services/WindowServer/WindowSwitcher.cpp
diff --git a/Servers/WindowServer/WindowSwitcher.h b/Services/WindowServer/WindowSwitcher.h
index 79fb3336a5..79fb3336a5 100644
--- a/Servers/WindowServer/WindowSwitcher.h
+++ b/Services/WindowServer/WindowSwitcher.h
diff --git a/Servers/WindowServer/WindowType.h b/Services/WindowServer/WindowType.h
index a3c53007a1..a3c53007a1 100644
--- a/Servers/WindowServer/WindowType.h
+++ b/Services/WindowServer/WindowType.h
diff --git a/Servers/WindowServer/main.cpp b/Services/WindowServer/main.cpp
index 9165a5cf8f..9165a5cf8f 100644
--- a/Servers/WindowServer/main.cpp
+++ b/Services/WindowServer/main.cpp
diff --git a/Toolchain/ComputeDependenciesHash.sh b/Toolchain/ComputeDependenciesHash.sh
index abb9a99b22..0da2cf2a76 100755
--- a/Toolchain/ComputeDependenciesHash.sh
+++ b/Toolchain/ComputeDependenciesHash.sh
@@ -27,7 +27,7 @@ trap finish EXIT
 # on *all* of their implementation and recursive dependencies.
 # Scan all files for potential dependencies.
 # Thinking in graphs, this computes the edge list:
-cat <(find AK/ Libraries/ Servers/ Kernel/ -name '*.h') \
+cat <(find AK/ Libraries/ Services/ Kernel/ -name '*.h') \
     <(find Libraries/LibC/ Libraries/LibM/ -name '*.cpp' ! -name 'Test*.cpp' ) | \
     xargs grep -F '#include ' | \
     sed -r \
@@ -38,7 +38,7 @@ cat <(find AK/ Libraries/ Servers/ Kernel/ -name '*.h') \
         -e 's^#include <((bits|netinet|sys|arpa|net)/.*)>^Libraries/LibC/\1^' \
         -e 's^#include <fd_set.h>^Libraries/LibC/fd_set.h^' \
         -e 's^#include <([a-z]{3,10}(_numbers)?\.h)>^Libraries/LibC/\1^' \
-        -e 's^#include <([A-Z][a-z]+Server/.*)>^Servers/\1^' \
+        -e 's^#include <([A-Z][a-z]+Server/.*)>^Services/\1^' \
         -e 's^#include <(.*)>^UNRESOLVED_I/\1^' \
         -e 's^#include "(.*)"^UNRESOLVED_L/\1^' > "${DEPLIST_FILE}"
 # Some #include's cannot be resolved, like <chrono>. However, these are only