diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile
index e5e34c15b4..ae25037cf1 100644
--- a/Applications/IRCClient/Makefile
+++ b/Applications/IRCClient/Makefile
@@ -16,7 +16,7 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../.. -I. -I../../LibC
+INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC
 
 DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND
 
diff --git a/Kernel/makeall.sh b/Kernel/makeall.sh
index 4307dac728..20f0c6335f 100755
--- a/Kernel/makeall.sh
+++ b/Kernel/makeall.sh
@@ -14,8 +14,8 @@ $make_cmd -C ../LibM clean && \
 $make_cmd -C ../LibM clean && \
 $make_cmd -C ../Servers/LookupServer clean && \
 $make_cmd -C ../Servers/LookupServer && \
-$make_cmd -C ../WindowServer clean && \
-$make_cmd -C ../WindowServer && \
+$make_cmd -C ../Servers/WindowServer clean && \
+$make_cmd -C ../Servers/WindowServer && \
 $make_cmd -C ../LibGUI clean && \
 $make_cmd -C ../LibGUI && \
 $make_cmd -C ../Userland clean && \
diff --git a/Kernel/sync.sh b/Kernel/sync.sh
index 0edbe8fefa..ce77c795b8 100755
--- a/Kernel/sync.sh
+++ b/Kernel/sync.sh
@@ -89,7 +89,7 @@ cp -v ../Applications/TextEditor/TextEditor mnt/bin/TextEditor
 cp -v ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
 ln -s IRCClient mnt/bin/irc
 cp -v ../Servers/LookupServer/LookupServer mnt/bin/LookupServer
-cp -v ../WindowServer/WindowServer mnt/bin/WindowServer
+cp -v ../Servers/WindowServer/WindowServer mnt/bin/WindowServer
 cp -v kernel.map mnt/
 sh sync-local.sh
 umount mnt
diff --git a/LibGUI/Makefile b/LibGUI/Makefile
index d0479b07bf..9648deb7fa 100644
--- a/LibGUI/Makefile
+++ b/LibGUI/Makefile
@@ -56,7 +56,7 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I../LibC -I.. -I.
+INCLUDE_FLAGS = -I../LibC -I../Servers -I.. -I.
 
 DEFINES = -DSERENITY -DUSERLAND -DSANITIZE_PTRS -DLIBGUI
 
diff --git a/WindowServer/.gitignore b/Servers/WindowServer/.gitignore
similarity index 100%
rename from WindowServer/.gitignore
rename to Servers/WindowServer/.gitignore
diff --git a/WindowServer/Makefile b/Servers/WindowServer/Makefile
similarity index 74%
rename from WindowServer/Makefile
rename to Servers/WindowServer/Makefile
index 13602d8edb..b09160983b 100644
--- a/WindowServer/Makefile
+++ b/Servers/WindowServer/Makefile
@@ -1,11 +1,11 @@
 SHAREDGRAPHICS_OBJS = \
-    ../SharedGraphics/Painter.o \
-    ../SharedGraphics/Font.o \
-    ../SharedGraphics/Rect.o \
-    ../SharedGraphics/GraphicsBitmap.o \
-    ../SharedGraphics/CharacterBitmap.o \
-    ../SharedGraphics/DisjointRectSet.o \
-    ../SharedGraphics/Color.o
+    ../../SharedGraphics/Painter.o \
+    ../../SharedGraphics/Font.o \
+    ../../SharedGraphics/Rect.o \
+    ../../SharedGraphics/GraphicsBitmap.o \
+    ../../SharedGraphics/CharacterBitmap.o \
+    ../../SharedGraphics/DisjointRectSet.o \
+    ../../SharedGraphics/Color.o
 
 WINDOWSERVER_OBJS = \
     WSMessageReceiver.o \
@@ -28,8 +28,8 @@ STANDARD_FLAGS = -std=c++17
 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
 FLAVOR_FLAGS = -fno-exceptions -fno-rtti
 OPTIMIZATION_FLAGS = -Os
-INCLUDE_FLAGS = -I.. -I. -I../LibC
-LDFLAGS = -L../LibC
+INCLUDE_FLAGS = -I.. -I../.. -I. -I../../LibC
+LDFLAGS = -L../../LibC
 
 DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND
 
diff --git a/WindowServer/WSAPITypes.h b/Servers/WindowServer/WSAPITypes.h
similarity index 100%
rename from WindowServer/WSAPITypes.h
rename to Servers/WindowServer/WSAPITypes.h
diff --git a/WindowServer/WSClientConnection.cpp b/Servers/WindowServer/WSClientConnection.cpp
similarity index 100%
rename from WindowServer/WSClientConnection.cpp
rename to Servers/WindowServer/WSClientConnection.cpp
diff --git a/WindowServer/WSClientConnection.h b/Servers/WindowServer/WSClientConnection.h
similarity index 100%
rename from WindowServer/WSClientConnection.h
rename to Servers/WindowServer/WSClientConnection.h
diff --git a/WindowServer/WSClipboard.cpp b/Servers/WindowServer/WSClipboard.cpp
similarity index 100%
rename from WindowServer/WSClipboard.cpp
rename to Servers/WindowServer/WSClipboard.cpp
diff --git a/WindowServer/WSClipboard.h b/Servers/WindowServer/WSClipboard.h
similarity index 100%
rename from WindowServer/WSClipboard.h
rename to Servers/WindowServer/WSClipboard.h
diff --git a/WindowServer/WSMenu.cpp b/Servers/WindowServer/WSMenu.cpp
similarity index 100%
rename from WindowServer/WSMenu.cpp
rename to Servers/WindowServer/WSMenu.cpp
diff --git a/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h
similarity index 100%
rename from WindowServer/WSMenu.h
rename to Servers/WindowServer/WSMenu.h
diff --git a/WindowServer/WSMenuBar.cpp b/Servers/WindowServer/WSMenuBar.cpp
similarity index 100%
rename from WindowServer/WSMenuBar.cpp
rename to Servers/WindowServer/WSMenuBar.cpp
diff --git a/WindowServer/WSMenuBar.h b/Servers/WindowServer/WSMenuBar.h
similarity index 100%
rename from WindowServer/WSMenuBar.h
rename to Servers/WindowServer/WSMenuBar.h
diff --git a/WindowServer/WSMenuItem.cpp b/Servers/WindowServer/WSMenuItem.cpp
similarity index 100%
rename from WindowServer/WSMenuItem.cpp
rename to Servers/WindowServer/WSMenuItem.cpp
diff --git a/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h
similarity index 100%
rename from WindowServer/WSMenuItem.h
rename to Servers/WindowServer/WSMenuItem.h
diff --git a/WindowServer/WSMessage.h b/Servers/WindowServer/WSMessage.h
similarity index 100%
rename from WindowServer/WSMessage.h
rename to Servers/WindowServer/WSMessage.h
diff --git a/WindowServer/WSMessageLoop.cpp b/Servers/WindowServer/WSMessageLoop.cpp
similarity index 100%
rename from WindowServer/WSMessageLoop.cpp
rename to Servers/WindowServer/WSMessageLoop.cpp
diff --git a/WindowServer/WSMessageLoop.h b/Servers/WindowServer/WSMessageLoop.h
similarity index 100%
rename from WindowServer/WSMessageLoop.h
rename to Servers/WindowServer/WSMessageLoop.h
diff --git a/WindowServer/WSMessageReceiver.cpp b/Servers/WindowServer/WSMessageReceiver.cpp
similarity index 100%
rename from WindowServer/WSMessageReceiver.cpp
rename to Servers/WindowServer/WSMessageReceiver.cpp
diff --git a/WindowServer/WSMessageReceiver.h b/Servers/WindowServer/WSMessageReceiver.h
similarity index 100%
rename from WindowServer/WSMessageReceiver.h
rename to Servers/WindowServer/WSMessageReceiver.h
diff --git a/WindowServer/WSScreen.cpp b/Servers/WindowServer/WSScreen.cpp
similarity index 100%
rename from WindowServer/WSScreen.cpp
rename to Servers/WindowServer/WSScreen.cpp
diff --git a/WindowServer/WSScreen.h b/Servers/WindowServer/WSScreen.h
similarity index 100%
rename from WindowServer/WSScreen.h
rename to Servers/WindowServer/WSScreen.h
diff --git a/WindowServer/WSWindow.cpp b/Servers/WindowServer/WSWindow.cpp
similarity index 100%
rename from WindowServer/WSWindow.cpp
rename to Servers/WindowServer/WSWindow.cpp
diff --git a/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
similarity index 100%
rename from WindowServer/WSWindow.h
rename to Servers/WindowServer/WSWindow.h
diff --git a/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp
similarity index 100%
rename from WindowServer/WSWindowManager.cpp
rename to Servers/WindowServer/WSWindowManager.cpp
diff --git a/WindowServer/WSWindowManager.h b/Servers/WindowServer/WSWindowManager.h
similarity index 100%
rename from WindowServer/WSWindowManager.h
rename to Servers/WindowServer/WSWindowManager.h
diff --git a/WindowServer/WSWindowSwitcher.cpp b/Servers/WindowServer/WSWindowSwitcher.cpp
similarity index 100%
rename from WindowServer/WSWindowSwitcher.cpp
rename to Servers/WindowServer/WSWindowSwitcher.cpp
diff --git a/WindowServer/WSWindowSwitcher.h b/Servers/WindowServer/WSWindowSwitcher.h
similarity index 100%
rename from WindowServer/WSWindowSwitcher.h
rename to Servers/WindowServer/WSWindowSwitcher.h
diff --git a/WindowServer/WSWindowType.h b/Servers/WindowServer/WSWindowType.h
similarity index 100%
rename from WindowServer/WSWindowType.h
rename to Servers/WindowServer/WSWindowType.h
diff --git a/WindowServer/main.cpp b/Servers/WindowServer/main.cpp
similarity index 100%
rename from WindowServer/main.cpp
rename to Servers/WindowServer/main.cpp