diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9efc21c0fc..5412b16973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,29 +436,29 @@ if(HAVE_WAYLAND)
     set(kwin_KDEINIT_SRCS
             ${kwin_KDEINIT_SRCS}
             abstract_backend.cpp
-            fb_backend.cpp
-            screens_fb.cpp
-            screens_wayland.cpp
-            screens_x11windowed.cpp
+            backends/fbdev/fb_backend.cpp
+            backends/fbdev/screens_fb.cpp
+            backends/wayland/screens_wayland.cpp
+            backends/x11/screens_x11windowed.cpp
             virtual_terminal.cpp
-            wayland_backend.cpp
+            backends/wayland/wayland_backend.cpp
             wayland_server.cpp
-            x11windowed_backend.cpp
+            backends/x11/x11windowed_backend.cpp
        )
     if(KWIN_HAVE_EGL AND Wayland_Egl_FOUND)
-        set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} egl_wayland_backend.cpp)
+        set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} backends/wayland/egl_wayland_backend.cpp)
     endif()
     if(HAVE_DRM)
         set(kwin_KDEINIT_SRCS
                 ${kwin_KDEINIT_SRCS}
-                drm_backend.cpp
-                screens_drm.cpp
+                backends/drm/drm_backend.cpp
+                backends/drm/screens_drm.cpp
             )
     endif()
     if(HAVE_GBM)
         set(kwin_KDEINIT_SRCS
                 ${kwin_KDEINIT_SRCS}
-                egl_gbm_backend.cpp
+                backends/drm/egl_gbm_backend.cpp
             )
     endif()
     if(HAVE_WAYLAND_CURSOR)
diff --git a/drm_backend.cpp b/backends/drm/drm_backend.cpp
similarity index 100%
rename from drm_backend.cpp
rename to backends/drm/drm_backend.cpp
diff --git a/drm_backend.h b/backends/drm/drm_backend.h
similarity index 100%
rename from drm_backend.h
rename to backends/drm/drm_backend.h
diff --git a/egl_gbm_backend.cpp b/backends/drm/egl_gbm_backend.cpp
similarity index 100%
rename from egl_gbm_backend.cpp
rename to backends/drm/egl_gbm_backend.cpp
diff --git a/egl_gbm_backend.h b/backends/drm/egl_gbm_backend.h
similarity index 100%
rename from egl_gbm_backend.h
rename to backends/drm/egl_gbm_backend.h
diff --git a/screens_drm.cpp b/backends/drm/screens_drm.cpp
similarity index 100%
rename from screens_drm.cpp
rename to backends/drm/screens_drm.cpp
diff --git a/screens_drm.h b/backends/drm/screens_drm.h
similarity index 100%
rename from screens_drm.h
rename to backends/drm/screens_drm.h
diff --git a/fb_backend.cpp b/backends/fbdev/fb_backend.cpp
similarity index 100%
rename from fb_backend.cpp
rename to backends/fbdev/fb_backend.cpp
diff --git a/fb_backend.h b/backends/fbdev/fb_backend.h
similarity index 100%
rename from fb_backend.h
rename to backends/fbdev/fb_backend.h
diff --git a/screens_fb.cpp b/backends/fbdev/screens_fb.cpp
similarity index 100%
rename from screens_fb.cpp
rename to backends/fbdev/screens_fb.cpp
diff --git a/screens_fb.h b/backends/fbdev/screens_fb.h
similarity index 100%
rename from screens_fb.h
rename to backends/fbdev/screens_fb.h
diff --git a/egl_wayland_backend.cpp b/backends/wayland/egl_wayland_backend.cpp
similarity index 100%
rename from egl_wayland_backend.cpp
rename to backends/wayland/egl_wayland_backend.cpp
diff --git a/egl_wayland_backend.h b/backends/wayland/egl_wayland_backend.h
similarity index 100%
rename from egl_wayland_backend.h
rename to backends/wayland/egl_wayland_backend.h
diff --git a/screens_wayland.cpp b/backends/wayland/screens_wayland.cpp
similarity index 100%
rename from screens_wayland.cpp
rename to backends/wayland/screens_wayland.cpp
diff --git a/screens_wayland.h b/backends/wayland/screens_wayland.h
similarity index 100%
rename from screens_wayland.h
rename to backends/wayland/screens_wayland.h
diff --git a/wayland_backend.cpp b/backends/wayland/wayland_backend.cpp
similarity index 100%
rename from wayland_backend.cpp
rename to backends/wayland/wayland_backend.cpp
diff --git a/wayland_backend.h b/backends/wayland/wayland_backend.h
similarity index 100%
rename from wayland_backend.h
rename to backends/wayland/wayland_backend.h
diff --git a/screens_x11windowed.cpp b/backends/x11/screens_x11windowed.cpp
similarity index 100%
rename from screens_x11windowed.cpp
rename to backends/x11/screens_x11windowed.cpp
diff --git a/screens_x11windowed.h b/backends/x11/screens_x11windowed.h
similarity index 100%
rename from screens_x11windowed.h
rename to backends/x11/screens_x11windowed.h
diff --git a/x11windowed_backend.cpp b/backends/x11/x11windowed_backend.cpp
similarity index 100%
rename from x11windowed_backend.cpp
rename to backends/x11/x11windowed_backend.cpp
diff --git a/x11windowed_backend.h b/backends/x11/x11windowed_backend.h
similarity index 100%
rename from x11windowed_backend.h
rename to backends/x11/x11windowed_backend.h
diff --git a/composite.cpp b/composite.cpp
index a62ab3033d..5710ff4eaa 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "compositingprefs.h"
 #include "xcbutils.h"
 #if HAVE_WAYLAND
-#include "wayland_backend.h"
+#include "backends/wayland/wayland_backend.h"
 #include "wayland_server.h"
 #endif
 #include "decorations/decoratedclient.h"
diff --git a/eglonxbackend.cpp b/eglonxbackend.cpp
index 1e78f46dc8..f06497e4d5 100644
--- a/eglonxbackend.cpp
+++ b/eglonxbackend.cpp
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "screens.h"
 #include "xcbutils.h"
 #if HAVE_X11_XCB
-#include "x11windowed_backend.h"
+#include "backends/x11/x11windowed_backend.h"
 #endif
 // kwin libs
 #include <kwinglplatform.h>
diff --git a/main_wayland.cpp b/main_wayland.cpp
index 11c886dfbf..d71352cfe3 100644
--- a/main_wayland.cpp
+++ b/main_wayland.cpp
@@ -21,14 +21,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "workspace.h"
 #include <config-kwin.h>
 // kwin
-#include "fb_backend.h"
+#include "backends/fbdev/fb_backend.h"
 #if HAVE_DRM
-#include "drm_backend.h"
+#include "backends/drm/drm_backend.h"
 #endif
-#include "wayland_backend.h"
+#include "backends/wayland/wayland_backend.h"
 #include "wayland_server.h"
 #include "xcbutils.h"
-#include "x11windowed_backend.h"
+#include "backends/x11/x11windowed_backend.h"
 
 // KWayland
 #include <KWayland/Server/display.h>
diff --git a/scene_qpainter.cpp b/scene_qpainter.cpp
index 3f62928d9b..ca2faac2cb 100644
--- a/scene_qpainter.cpp
+++ b/scene_qpainter.cpp
@@ -29,13 +29,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "toplevel.h"
 #if HAVE_WAYLAND
 #if HAVE_DRM
-#include "drm_backend.h"
+#include "backends/drm/drm_backend.h"
 #endif
-#include "fb_backend.h"
+#include "backends/fbdev/fb_backend.h"
 #include "virtual_terminal.h"
-#include "wayland_backend.h"
+#include "backends/wayland/wayland_backend.h"
 #include "wayland_server.h"
-#include "x11windowed_backend.h"
+#include "backends/x11/x11windowed_backend.h"
 #include <KWayland/Client/buffer.h>
 #include <KWayland/Client/shm_pool.h>
 #include <KWayland/Client/surface.h>
diff --git a/workspace.cpp b/workspace.cpp
index 4b0189b988..aefb7740ea 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -52,9 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "unmanaged.h"
 #include "useractions.h"
 #include "virtualdesktops.h"
-#if HAVE_WAYLAND
-#include "wayland_backend.h"
-#endif
 #include "xcbutils.h"
 #include "main.h"
 #include "decorations/decorationbridge.h"