diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
index c033986173..a65512ae0d 100644
--- a/autotests/integration/kwin_wayland_test.cpp
+++ b/autotests/integration/kwin_wayland_test.cpp
@@ -16,7 +16,7 @@
 #include "utils/xcbutils.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xwl/xwayland.h"
+#include "xwayland/xwayland.h"
 
 #include <KPluginMetaData>
 
diff --git a/autotests/integration/xwayland_selections_test.cpp b/autotests/integration/xwayland_selections_test.cpp
index a5b926da13..fc77faa546 100644
--- a/autotests/integration/xwayland_selections_test.cpp
+++ b/autotests/integration/xwayland_selections_test.cpp
@@ -15,7 +15,7 @@
 #include "wayland/seat_interface.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xwl/databridge.h"
+#include "xwayland/databridge.h"
 
 #include <QProcess>
 #include <QProcessEnvironment>
diff --git a/autotests/integration/xwaylandserver_crash_test.cpp b/autotests/integration/xwaylandserver_crash_test.cpp
index fae7a2716d..4082e29392 100644
--- a/autotests/integration/xwaylandserver_crash_test.cpp
+++ b/autotests/integration/xwaylandserver_crash_test.cpp
@@ -16,8 +16,8 @@
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11client.h"
-#include "xwl/xwayland.h"
-#include "xwl/xwaylandlauncher.h"
+#include "xwayland/xwayland.h"
+#include "xwayland/xwaylandlauncher.h"
 
 #include <xcb/xcb_icccm.h>
 
diff --git a/autotests/integration/xwaylandserver_restart_test.cpp b/autotests/integration/xwaylandserver_restart_test.cpp
index 855157ab5e..0140d20a01 100644
--- a/autotests/integration/xwaylandserver_restart_test.cpp
+++ b/autotests/integration/xwaylandserver_restart_test.cpp
@@ -14,8 +14,8 @@
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11client.h"
-#include "xwl/xwayland.h"
-#include "xwl/xwaylandlauncher.h"
+#include "xwayland/xwayland.h"
+#include "xwayland/xwaylandlauncher.h"
 
 #include <xcb/xcb_icccm.h>
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58e26a5012..bc73c196c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -159,7 +159,7 @@ target_sources(kwin PRIVATE
     xdgshellintegration.cpp
     xkb.cpp
     xwaylandclient.cpp
-    xwl/xwayland_interface.cpp
+    xwayland/xwayland_interface.cpp
 )
 
 target_link_libraries(kwin
@@ -249,6 +249,7 @@ add_subdirectory(backends)
 add_subdirectory(scenes)
 add_subdirectory(utils)
 add_subdirectory(wayland)
+add_subdirectory(xwayland)
 
 if (KWIN_BUILD_ACTIVITIES)
     target_sources(kwin PRIVATE activities.cpp)
@@ -293,8 +294,6 @@ kcoreaddons_target_static_plugins(kwin_x11 "kwin/effects/plugins")
 install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
 install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-add_subdirectory(xwl)
-
 add_executable(kwin_wayland
     main_wayland.cpp
     tabletmodemanager.cpp
diff --git a/src/input.cpp b/src/input.cpp
index b79c9a14d1..b1dc00dad3 100644
--- a/src/input.cpp
+++ b/src/input.cpp
@@ -48,7 +48,7 @@
 #include "wayland/tablet_v2_interface.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xwl/xwayland_interface.h"
+#include "xwayland/xwayland_interface.h"
 
 #include <KDecoration2/Decoration>
 #include <KGlobalAccel>
diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp
index 98556ed2c3..57e929bff8 100644
--- a/src/main_wayland.cpp
+++ b/src/main_wayland.cpp
@@ -19,8 +19,8 @@
 #include "wayland/seat_interface.h"
 #include "wayland_server.h"
 #include "workspace.h"
-#include "xwl/xwayland.h"
-#include "xwl/xwaylandlauncher.h"
+#include "xwayland/xwayland.h"
+#include "xwayland/xwaylandlauncher.h"
 
 // KDE
 #include <KCrash>
diff --git a/src/xwl/CMakeLists.txt b/src/xwayland/CMakeLists.txt
similarity index 100%
rename from src/xwl/CMakeLists.txt
rename to src/xwayland/CMakeLists.txt
diff --git a/src/xwl/clipboard.cpp b/src/xwayland/clipboard.cpp
similarity index 100%
rename from src/xwl/clipboard.cpp
rename to src/xwayland/clipboard.cpp
diff --git a/src/xwl/clipboard.h b/src/xwayland/clipboard.h
similarity index 100%
rename from src/xwl/clipboard.h
rename to src/xwayland/clipboard.h
diff --git a/src/xwl/databridge.cpp b/src/xwayland/databridge.cpp
similarity index 100%
rename from src/xwl/databridge.cpp
rename to src/xwayland/databridge.cpp
diff --git a/src/xwl/databridge.h b/src/xwayland/databridge.h
similarity index 100%
rename from src/xwl/databridge.h
rename to src/xwayland/databridge.h
diff --git a/src/xwl/datasource.cpp b/src/xwayland/datasource.cpp
similarity index 100%
rename from src/xwl/datasource.cpp
rename to src/xwayland/datasource.cpp
diff --git a/src/xwl/datasource.h b/src/xwayland/datasource.h
similarity index 100%
rename from src/xwl/datasource.h
rename to src/xwayland/datasource.h
diff --git a/src/xwl/dnd.cpp b/src/xwayland/dnd.cpp
similarity index 100%
rename from src/xwl/dnd.cpp
rename to src/xwayland/dnd.cpp
diff --git a/src/xwl/dnd.h b/src/xwayland/dnd.h
similarity index 100%
rename from src/xwl/dnd.h
rename to src/xwayland/dnd.h
diff --git a/src/xwl/drag.cpp b/src/xwayland/drag.cpp
similarity index 100%
rename from src/xwl/drag.cpp
rename to src/xwayland/drag.cpp
diff --git a/src/xwl/drag.h b/src/xwayland/drag.h
similarity index 100%
rename from src/xwl/drag.h
rename to src/xwayland/drag.h
diff --git a/src/xwl/drag_wl.cpp b/src/xwayland/drag_wl.cpp
similarity index 100%
rename from src/xwl/drag_wl.cpp
rename to src/xwayland/drag_wl.cpp
diff --git a/src/xwl/drag_wl.h b/src/xwayland/drag_wl.h
similarity index 100%
rename from src/xwl/drag_wl.h
rename to src/xwayland/drag_wl.h
diff --git a/src/xwl/drag_x.cpp b/src/xwayland/drag_x.cpp
similarity index 100%
rename from src/xwl/drag_x.cpp
rename to src/xwayland/drag_x.cpp
diff --git a/src/xwl/drag_x.h b/src/xwayland/drag_x.h
similarity index 100%
rename from src/xwl/drag_x.h
rename to src/xwayland/drag_x.h
diff --git a/src/xwl/lib/CMakeLists.txt b/src/xwayland/lib/CMakeLists.txt
similarity index 100%
rename from src/xwl/lib/CMakeLists.txt
rename to src/xwayland/lib/CMakeLists.txt
diff --git a/src/xwl/lib/xauthority.cpp b/src/xwayland/lib/xauthority.cpp
similarity index 100%
rename from src/xwl/lib/xauthority.cpp
rename to src/xwayland/lib/xauthority.cpp
diff --git a/src/xwl/lib/xauthority.h b/src/xwayland/lib/xauthority.h
similarity index 100%
rename from src/xwl/lib/xauthority.h
rename to src/xwayland/lib/xauthority.h
diff --git a/src/xwl/lib/xwaylandsocket.cpp b/src/xwayland/lib/xwaylandsocket.cpp
similarity index 100%
rename from src/xwl/lib/xwaylandsocket.cpp
rename to src/xwayland/lib/xwaylandsocket.cpp
diff --git a/src/xwl/lib/xwaylandsocket.h b/src/xwayland/lib/xwaylandsocket.h
similarity index 100%
rename from src/xwl/lib/xwaylandsocket.h
rename to src/xwayland/lib/xwaylandsocket.h
diff --git a/src/xwl/primary.cpp b/src/xwayland/primary.cpp
similarity index 100%
rename from src/xwl/primary.cpp
rename to src/xwayland/primary.cpp
diff --git a/src/xwl/primary.h b/src/xwayland/primary.h
similarity index 100%
rename from src/xwl/primary.h
rename to src/xwayland/primary.h
diff --git a/src/xwl/selection.cpp b/src/xwayland/selection.cpp
similarity index 100%
rename from src/xwl/selection.cpp
rename to src/xwayland/selection.cpp
diff --git a/src/xwl/selection.h b/src/xwayland/selection.h
similarity index 100%
rename from src/xwl/selection.h
rename to src/xwayland/selection.h
diff --git a/src/xwl/selection_source.cpp b/src/xwayland/selection_source.cpp
similarity index 100%
rename from src/xwl/selection_source.cpp
rename to src/xwayland/selection_source.cpp
diff --git a/src/xwl/selection_source.h b/src/xwayland/selection_source.h
similarity index 100%
rename from src/xwl/selection_source.h
rename to src/xwayland/selection_source.h
diff --git a/src/xwl/transfer.cpp b/src/xwayland/transfer.cpp
similarity index 100%
rename from src/xwl/transfer.cpp
rename to src/xwayland/transfer.cpp
diff --git a/src/xwl/transfer.h b/src/xwayland/transfer.h
similarity index 100%
rename from src/xwl/transfer.h
rename to src/xwayland/transfer.h
diff --git a/src/xwl/xwayland.cpp b/src/xwayland/xwayland.cpp
similarity index 100%
rename from src/xwl/xwayland.cpp
rename to src/xwayland/xwayland.cpp
diff --git a/src/xwl/xwayland.h b/src/xwayland/xwayland.h
similarity index 100%
rename from src/xwl/xwayland.h
rename to src/xwayland/xwayland.h
diff --git a/src/xwl/xwayland_interface.cpp b/src/xwayland/xwayland_interface.cpp
similarity index 100%
rename from src/xwl/xwayland_interface.cpp
rename to src/xwayland/xwayland_interface.cpp
diff --git a/src/xwl/xwayland_interface.h b/src/xwayland/xwayland_interface.h
similarity index 100%
rename from src/xwl/xwayland_interface.h
rename to src/xwayland/xwayland_interface.h
diff --git a/src/xwl/xwaylandlauncher.cpp b/src/xwayland/xwaylandlauncher.cpp
similarity index 100%
rename from src/xwl/xwaylandlauncher.cpp
rename to src/xwayland/xwaylandlauncher.cpp
diff --git a/src/xwl/xwaylandlauncher.h b/src/xwayland/xwaylandlauncher.h
similarity index 100%
rename from src/xwl/xwaylandlauncher.h
rename to src/xwayland/xwaylandlauncher.h
diff --git a/src/xwl/xwldrophandler.cpp b/src/xwayland/xwldrophandler.cpp
similarity index 100%
rename from src/xwl/xwldrophandler.cpp
rename to src/xwayland/xwldrophandler.cpp
diff --git a/src/xwl/xwldrophandler.h b/src/xwayland/xwldrophandler.h
similarity index 100%
rename from src/xwl/xwldrophandler.h
rename to src/xwayland/xwldrophandler.h