diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54fe121b0d..253473f901 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,5 +151,4 @@ add_subdirectory(Applications)
 add_subdirectory(Games)
 add_subdirectory(DevTools)
 add_subdirectory(MenuApplets)
-add_subdirectory(Demos)
 add_subdirectory(Userland)
diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt
index 33717025e3..6e8e1c90ea 100644
--- a/Userland/CMakeLists.txt
+++ b/Userland/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(Demos)
 add_subdirectory(DynamicLoader)
 add_subdirectory(Shell)
 add_subdirectory(Tests)
diff --git a/Demos/CMakeLists.txt b/Userland/Demos/CMakeLists.txt
similarity index 100%
rename from Demos/CMakeLists.txt
rename to Userland/Demos/CMakeLists.txt
diff --git a/Demos/CatDog/CMakeLists.txt b/Userland/Demos/CatDog/CMakeLists.txt
similarity index 100%
rename from Demos/CatDog/CMakeLists.txt
rename to Userland/Demos/CatDog/CMakeLists.txt
diff --git a/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp
similarity index 100%
rename from Demos/CatDog/main.cpp
rename to Userland/Demos/CatDog/main.cpp
diff --git a/Demos/Cube/CMakeLists.txt b/Userland/Demos/Cube/CMakeLists.txt
similarity index 100%
rename from Demos/Cube/CMakeLists.txt
rename to Userland/Demos/Cube/CMakeLists.txt
diff --git a/Demos/Cube/Cube.cpp b/Userland/Demos/Cube/Cube.cpp
similarity index 100%
rename from Demos/Cube/Cube.cpp
rename to Userland/Demos/Cube/Cube.cpp
diff --git a/Demos/Eyes/CMakeLists.txt b/Userland/Demos/Eyes/CMakeLists.txt
similarity index 100%
rename from Demos/Eyes/CMakeLists.txt
rename to Userland/Demos/Eyes/CMakeLists.txt
diff --git a/Demos/Eyes/EyesWidget.cpp b/Userland/Demos/Eyes/EyesWidget.cpp
similarity index 100%
rename from Demos/Eyes/EyesWidget.cpp
rename to Userland/Demos/Eyes/EyesWidget.cpp
diff --git a/Demos/Eyes/EyesWidget.h b/Userland/Demos/Eyes/EyesWidget.h
similarity index 100%
rename from Demos/Eyes/EyesWidget.h
rename to Userland/Demos/Eyes/EyesWidget.h
diff --git a/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp
similarity index 100%
rename from Demos/Eyes/main.cpp
rename to Userland/Demos/Eyes/main.cpp
diff --git a/Demos/Fire/CMakeLists.txt b/Userland/Demos/Fire/CMakeLists.txt
similarity index 100%
rename from Demos/Fire/CMakeLists.txt
rename to Userland/Demos/Fire/CMakeLists.txt
diff --git a/Demos/Fire/Fire.cpp b/Userland/Demos/Fire/Fire.cpp
similarity index 100%
rename from Demos/Fire/Fire.cpp
rename to Userland/Demos/Fire/Fire.cpp
diff --git a/Demos/HelloWorld/CMakeLists.txt b/Userland/Demos/HelloWorld/CMakeLists.txt
similarity index 100%
rename from Demos/HelloWorld/CMakeLists.txt
rename to Userland/Demos/HelloWorld/CMakeLists.txt
diff --git a/Demos/HelloWorld/main.cpp b/Userland/Demos/HelloWorld/main.cpp
similarity index 100%
rename from Demos/HelloWorld/main.cpp
rename to Userland/Demos/HelloWorld/main.cpp
diff --git a/Demos/LibGfxDemo/CMakeLists.txt b/Userland/Demos/LibGfxDemo/CMakeLists.txt
similarity index 100%
rename from Demos/LibGfxDemo/CMakeLists.txt
rename to Userland/Demos/LibGfxDemo/CMakeLists.txt
diff --git a/Demos/LibGfxDemo/main.cpp b/Userland/Demos/LibGfxDemo/main.cpp
similarity index 100%
rename from Demos/LibGfxDemo/main.cpp
rename to Userland/Demos/LibGfxDemo/main.cpp
diff --git a/Demos/Mouse/CMakeLists.txt b/Userland/Demos/Mouse/CMakeLists.txt
similarity index 100%
rename from Demos/Mouse/CMakeLists.txt
rename to Userland/Demos/Mouse/CMakeLists.txt
diff --git a/Demos/Mouse/main.cpp b/Userland/Demos/Mouse/main.cpp
similarity index 100%
rename from Demos/Mouse/main.cpp
rename to Userland/Demos/Mouse/main.cpp
diff --git a/Demos/Screensaver/CMakeLists.txt b/Userland/Demos/Screensaver/CMakeLists.txt
similarity index 100%
rename from Demos/Screensaver/CMakeLists.txt
rename to Userland/Demos/Screensaver/CMakeLists.txt
diff --git a/Demos/Screensaver/Screensaver.cpp b/Userland/Demos/Screensaver/Screensaver.cpp
similarity index 100%
rename from Demos/Screensaver/Screensaver.cpp
rename to Userland/Demos/Screensaver/Screensaver.cpp
diff --git a/Demos/WidgetGallery/CMakeLists.txt b/Userland/Demos/WidgetGallery/CMakeLists.txt
similarity index 100%
rename from Demos/WidgetGallery/CMakeLists.txt
rename to Userland/Demos/WidgetGallery/CMakeLists.txt
diff --git a/Demos/WidgetGallery/main.cpp b/Userland/Demos/WidgetGallery/main.cpp
similarity index 100%
rename from Demos/WidgetGallery/main.cpp
rename to Userland/Demos/WidgetGallery/main.cpp