diff --git a/autotests/integration/buffer_size_change_test.cpp b/autotests/integration/buffer_size_change_test.cpp
index e3683e06ec..09640ee075 100644
--- a/autotests/integration/buffer_size_change_test.cpp
+++ b/autotests/integration/buffer_size_change_test.cpp
@@ -9,7 +9,7 @@
 #include "generic_scene_opengl_test.h"
 
 #include "composite.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 
diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp
index 1aea0e111f..31f06b9b15 100644
--- a/autotests/integration/effects/maximize_animation_test.cpp
+++ b/autotests/integration/effects/maximize_animation_test.cpp
@@ -13,7 +13,7 @@
 #include "core/outputbackend.h"
 #include "effectloader.h"
 #include "effects.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
diff --git a/autotests/integration/generic_scene_opengl_test.cpp b/autotests/integration/generic_scene_opengl_test.cpp
index b61743dc38..7b7a4e84ed 100644
--- a/autotests/integration/generic_scene_opengl_test.cpp
+++ b/autotests/integration/generic_scene_opengl_test.cpp
@@ -12,7 +12,7 @@
 #include "core/renderbackend.h"
 #include "cursor.h"
 #include "effectloader.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "window.h"
 
diff --git a/autotests/integration/xwaylandserver_crash_test.cpp b/autotests/integration/xwaylandserver_crash_test.cpp
index a72767e5d9..b805cbd17c 100644
--- a/autotests/integration/xwaylandserver_crash_test.cpp
+++ b/autotests/integration/xwaylandserver_crash_test.cpp
@@ -10,7 +10,7 @@
 #include "core/output.h"
 #include "core/outputbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "wayland_server.h"
 #include "workspace.h"
diff --git a/autotests/integration/xwaylandserver_restart_test.cpp b/autotests/integration/xwaylandserver_restart_test.cpp
index 95c5037762..90c5ef67f1 100644
--- a/autotests/integration/xwaylandserver_restart_test.cpp
+++ b/autotests/integration/xwaylandserver_restart_test.cpp
@@ -9,7 +9,7 @@
 #include "composite.h"
 #include "core/outputbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland_server.h"
 #include "workspace.h"
 #include "x11window.h"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b13713465c..549f9f2cd1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,6 @@ target_sources(kwin PRIVATE
     cursorsource.cpp
     dbusinterface.cpp
     debug_console.cpp
-    decorationitem.cpp
     decorations/decoratedclient.cpp
     decorations/decorationbridge.cpp
     decorations/decorationpalette.cpp
@@ -70,7 +69,6 @@ target_sources(kwin PRIVATE
     decorations/settings.cpp
     deleted.cpp
     dmabuftexture.cpp
-    dndiconitem.cpp
     dpmsinputeventfilter.cpp
     effectloader.cpp
     effects.cpp
@@ -90,7 +88,6 @@ target_sources(kwin PRIVATE
     inputpanelv1integration.cpp
     inputpanelv1window.cpp
     internalwindow.cpp
-    item.cpp
     keyboard_input.cpp
     keyboard_layout.cpp
     keyboard_layout_switching.cpp
@@ -120,7 +117,18 @@ target_sources(kwin PRIVATE
     rootinfo_filter.cpp
     rulebooksettings.cpp
     rules.cpp
-    scene.cpp
+    scene/decorationitem.cpp
+    scene/dndiconitem.cpp
+    scene/item.cpp
+    scene/scene.cpp
+    scene/scene_opengl.cpp
+    scene/scene_qpainter.cpp
+    scene/shadowitem.cpp
+    scene/surfaceitem.cpp
+    scene/surfaceitem_internal.cpp
+    scene/surfaceitem_wayland.cpp
+    scene/surfaceitem_x11.cpp
+    scene/windowitem.cpp
     screenedge.cpp
     scripting/dbuscall.cpp
     scripting/desktopbackgrounditem.cpp
@@ -136,12 +144,7 @@ target_sources(kwin PRIVATE
     scripting/windowthumbnailitem.cpp
     scripting/workspace_wrapper.cpp
     shadow.cpp
-    shadowitem.cpp
     sm.cpp
-    surfaceitem.cpp
-    surfaceitem_internal.cpp
-    surfaceitem_wayland.cpp
-    surfaceitem_x11.cpp
     syncalarmx11filter.cpp
     tablet_input.cpp
     tabletmodemanager.cpp
@@ -161,7 +164,6 @@ target_sources(kwin PRIVATE
     waylandwindow.cpp
     window.cpp
     window_property_notify_x11_filter.cpp
-    windowitem.cpp
     workspace.cpp
     x11eventfilter.cpp
     x11syncmanager.cpp
@@ -260,7 +262,6 @@ target_sources(kwin PRIVATE
 )
 
 add_subdirectory(backends)
-add_subdirectory(scenes)
 add_subdirectory(utils)
 add_subdirectory(wayland)
 add_subdirectory(xwayland)
diff --git a/src/Messages.sh b/src/Messages.sh
index 4b277b0f97..7545494c7d 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 $EXTRACTRC *.kcfg *.ui >> rc.cpp
-$XGETTEXT *.h *.cpp plugins/nightcolor/*.cpp helpers/killer/*.cpp scenes/opengl/*.cpp tabbox/*.cpp scripting/*.cpp plugins/krunner-integration/*.cpp -o $podir/kwin.pot
+$XGETTEXT *.h *.cpp plugins/nightcolor/*.cpp helpers/killer/*.cpp scene/*.cpp tabbox/*.cpp scripting/*.cpp plugins/krunner-integration/*.cpp -o $podir/kwin.pot
diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp
index 8e7c488ab2..3b22ef21db 100644
--- a/src/backends/drm/drm_egl_backend.cpp
+++ b/src/backends/drm/drm_egl_backend.cpp
@@ -29,7 +29,7 @@
 #include "kwineglutils_p.h"
 #include "linux_dmabuf.h"
 #include "options.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/clientconnection.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
diff --git a/src/backends/drm/drm_egl_layer.cpp b/src/backends/drm/drm_egl_layer.cpp
index b12efbfcc7..16cc07fc71 100644
--- a/src/backends/drm/drm_egl_layer.cpp
+++ b/src/backends/drm/drm_egl_layer.cpp
@@ -16,7 +16,7 @@
 #include "drm_output.h"
 #include "drm_pipeline.h"
 #include "egl_dmabuf.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 
diff --git a/src/backends/drm/drm_egl_layer_surface.cpp b/src/backends/drm/drm_egl_layer_surface.cpp
index 219334a26d..85560432ec 100644
--- a/src/backends/drm/drm_egl_layer_surface.cpp
+++ b/src/backends/drm/drm_egl_layer_surface.cpp
@@ -20,7 +20,7 @@
 #include "drm_shadow_buffer.h"
 #include "egl_dmabuf.h"
 #include "kwineglutils_p.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 
diff --git a/src/backends/drm/drm_virtual_egl_layer.cpp b/src/backends/drm/drm_virtual_egl_layer.cpp
index 9823187466..fab7b8bfc6 100644
--- a/src/backends/drm/drm_virtual_egl_layer.cpp
+++ b/src/backends/drm/drm_virtual_egl_layer.cpp
@@ -20,7 +20,7 @@
 #include "drm_virtual_output.h"
 #include "egl_dmabuf.h"
 #include "kwineglutils_p.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
 #include "wayland/surface_interface.h"
 
diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp
index f1c9a3e162..122559af5c 100644
--- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp
+++ b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp
@@ -11,9 +11,9 @@
 #include "core/renderloop_p.h"
 #include "kwinglplatform.h"
 #include "options.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/surfaceitem_x11.h"
 #include "softwarevsyncmonitor.h"
-#include "surfaceitem_x11.h"
 #include "workspace.h"
 #include "x11_standalone_backend.h"
 #include "x11_standalone_logging.h"
diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
index 32bdf2f0bd..18f7d41860 100644
--- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
+++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp
@@ -28,8 +28,8 @@
 #include "core/overlaywindow.h"
 #include "core/renderloop_p.h"
 #include "options.h"
-#include "scene.h"
-#include "surfaceitem_x11.h"
+#include "scene/scene.h"
+#include "scene/surfaceitem_x11.h"
 #include "utils/xcbutils.h"
 #include "workspace.h"
 // kwin libs
diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
index ce3f335d11..6391f63eb2 100644
--- a/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
+++ b/src/backends/x11/standalone/x11_standalone_overlaywindow.cpp
@@ -11,7 +11,7 @@
 
 #include "composite.h"
 #include "kwinglobals.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
 #include "workspace.h"
diff --git a/src/composite.cpp b/src/composite.cpp
index acddb80798..d2b2a0a99a 100644
--- a/src/composite.cpp
+++ b/src/composite.cpp
@@ -26,11 +26,10 @@
 #include "internalwindow.h"
 #include "openglbackend.h"
 #include "qpainterbackend.h"
-#include "scene.h"
-#include "scenes/opengl/scene_opengl.h"
-#include "scenes/qpainter/scene_qpainter.h"
+#include "scene/scene_opengl.h"
+#include "scene/scene_qpainter.h"
+#include "scene/surfaceitem_x11.h"
 #include "shadow.h"
-#include "surfaceitem_x11.h"
 #include "unmanaged.h"
 #include "useractions.h"
 #include "utils/common.h"
diff --git a/src/core/renderloop.cpp b/src/core/renderloop.cpp
index f3cb474d26..fba1231410 100644
--- a/src/core/renderloop.cpp
+++ b/src/core/renderloop.cpp
@@ -6,8 +6,8 @@
 
 #include "renderloop.h"
 #include "renderloop_p.h"
-#include "surfaceitem.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/surface_interface.h"
 
diff --git a/src/cursor.cpp b/src/cursor.cpp
index 7024428a82..847b2532d9 100644
--- a/src/cursor.cpp
+++ b/src/cursor.cpp
@@ -15,7 +15,7 @@
 #include "input.h"
 #include "keyboard_input.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "utils/xcbutils.h"
 // KDE
diff --git a/src/debug_console.cpp b/src/debug_console.cpp
index 7c487118c0..a7772e51cd 100644
--- a/src/debug_console.cpp
+++ b/src/debug_console.cpp
@@ -13,7 +13,7 @@
 #include "internalwindow.h"
 #include "keyboard_input.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "utils/filedescriptor.h"
 #include "utils/subsurfacemonitor.h"
diff --git a/src/effects.cpp b/src/effects.cpp
index 0910b9e485..688dbed36c 100644
--- a/src/effects.cpp
+++ b/src/effects.cpp
@@ -42,12 +42,12 @@
 #include "inputmethod.h"
 #include "inputpanelv1window.h"
 #include "kwinglutils.h"
+#include "scene/windowitem.h"
 #include "utils/xcbutils.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
 #include "window_property_notify_x11_filter.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/Decoration>
diff --git a/src/effects.h b/src/effects.h
index 674ee2d3a9..68c0760b3d 100644
--- a/src/effects.h
+++ b/src/effects.h
@@ -14,7 +14,7 @@
 #include "kwineffects.h"
 
 #include "kwinoffscreenquickview.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 #include <QFont>
 #include <QHash>
diff --git a/src/internalwindow.cpp b/src/internalwindow.cpp
index 4aed3e9d47..7ba118f2bb 100644
--- a/src/internalwindow.cpp
+++ b/src/internalwindow.cpp
@@ -10,8 +10,8 @@
 #include "internalwindow.h"
 #include "decorations/decorationbridge.h"
 #include "deleted.h"
-#include "surfaceitem.h"
-#include "windowitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/Decoration>
diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp
index 521224dc4d..f04f2cb5cf 100644
--- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp
+++ b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_internal.cpp
@@ -6,7 +6,7 @@
 
 #include "basiceglsurfacetexture_internal.h"
 #include "kwingltexture.h"
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 #include "utils/common.h"
 
 #include <QOpenGLFramebufferObject>
diff --git a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp
index 1f41f804cb..3bb87298a9 100644
--- a/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp
+++ b/src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp
@@ -8,7 +8,7 @@
 #include "egl_dmabuf.h"
 #include "kwineglext.h"
 #include "kwingltexture.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/drmclientbuffer.h"
 #include "wayland/linuxdmabufv1clientbuffer.h"
diff --git a/src/platformsupport/scenes/opengl/openglbackend.cpp b/src/platformsupport/scenes/opengl/openglbackend.cpp
index 738a94735e..03c9902686 100644
--- a/src/platformsupport/scenes/opengl/openglbackend.cpp
+++ b/src/platformsupport/scenes/opengl/openglbackend.cpp
@@ -11,7 +11,7 @@
 #include <kwineffects.h>
 #include <kwinglutils_funcs.h>
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 #include "utils/common.h"
 #include "workspace.h"
 
diff --git a/src/platformsupport/scenes/opengl/openglsurfacetexture.h b/src/platformsupport/scenes/opengl/openglsurfacetexture.h
index a0e4a69573..c6cbc8a044 100644
--- a/src/platformsupport/scenes/opengl/openglsurfacetexture.h
+++ b/src/platformsupport/scenes/opengl/openglsurfacetexture.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWin
 {
diff --git a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture.h b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture.h
index ddf0dfdeb1..862086cde1 100644
--- a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture.h
+++ b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 #include <QImage>
 
diff --git a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_internal.cpp b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_internal.cpp
index 3eed474035..8f17f3e87f 100644
--- a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_internal.cpp
+++ b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_internal.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "qpaintersurfacetexture_internal.h"
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 
 namespace KWin
 {
diff --git a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp
index 74c68d1ecb..a65f09da83 100644
--- a/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp
+++ b/src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "qpaintersurfacetexture_wayland.h"
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "utils/common.h"
 #include "wayland/shmclientbuffer.h"
 #include "wayland/surface_interface.h"
diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp
index 806e529701..94041b4281 100644
--- a/src/plugins/screencast/outputscreencastsource.cpp
+++ b/src/plugins/screencast/outputscreencastsource.cpp
@@ -12,7 +12,7 @@
 #include "core/renderloop.h"
 #include "kwingltexture.h"
 #include "kwinglutils.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 namespace KWin
 {
diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp
index 4310904830..eb231fad96 100644
--- a/src/plugins/screencast/regionscreencastsource.cpp
+++ b/src/plugins/screencast/regionscreencastsource.cpp
@@ -11,7 +11,7 @@
 #include <core/output.h>
 #include <kwingltexture.h>
 #include <kwinglutils.h>
-#include <scene.h>
+#include <scene/scene.h>
 #include <workspace.h>
 
 #include <QPainter>
diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp
index 6936b32b84..a48653bad0 100644
--- a/src/plugins/screencast/screencastmanager.cpp
+++ b/src/plugins/screencast/screencastmanager.cpp
@@ -15,7 +15,7 @@
 #include "kwingltexture.h"
 #include "outputscreencastsource.h"
 #include "regionscreencastsource.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "screencaststream.h"
 #include "wayland/display.h"
 #include "wayland/output_interface.h"
diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp
index 1efb0904f5..b1bcfde05e 100644
--- a/src/plugins/screencast/screencaststream.cpp
+++ b/src/plugins/screencast/screencaststream.cpp
@@ -20,7 +20,7 @@
 #include "kwinscreencast_logging.h"
 #include "main.h"
 #include "pipewirecore.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "screencastsource.h"
 #include "utils/common.h"
 
diff --git a/src/plugins/screencast/windowscreencastsource.cpp b/src/plugins/screencast/windowscreencastsource.cpp
index 4ec5d82718..38428399d6 100644
--- a/src/plugins/screencast/windowscreencastsource.cpp
+++ b/src/plugins/screencast/windowscreencastsource.cpp
@@ -15,9 +15,9 @@
 #include "kwineffects.h"
 #include "kwingltexture.h"
 #include "kwinglutils.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/windowitem.h"
 #include "window.h"
-#include "windowitem.h"
 
 namespace KWin
 {
diff --git a/src/decorationitem.cpp b/src/scene/decorationitem.cpp
similarity index 99%
rename from src/decorationitem.cpp
rename to src/scene/decorationitem.cpp
index 473a32322b..613c35ec5e 100644
--- a/src/decorationitem.cpp
+++ b/src/scene/decorationitem.cpp
@@ -5,12 +5,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
 #include "composite.h"
 #include "core/output.h"
 #include "decorations/decoratedclient.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "window.h"
 
diff --git a/src/decorationitem.h b/src/scene/decorationitem.h
similarity index 98%
rename from src/decorationitem.h
rename to src/scene/decorationitem.h
index 86a42969fd..0fb4fdde6a 100644
--- a/src/decorationitem.h
+++ b/src/scene/decorationitem.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KDecoration2
 {
diff --git a/src/dndiconitem.cpp b/src/scene/dndiconitem.cpp
similarity index 93%
rename from src/dndiconitem.cpp
rename to src/scene/dndiconitem.cpp
index 70c94e9548..dd48f01e23 100644
--- a/src/dndiconitem.cpp
+++ b/src/scene/dndiconitem.cpp
@@ -4,8 +4,8 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "dndiconitem.h"
-#include "surfaceitem_wayland.h"
+#include "scene/dndiconitem.h"
+#include "scene/surfaceitem_wayland.h"
 #include "wayland/datadevice_interface.h"
 #include "wayland/surface_interface.h"
 
diff --git a/src/dndiconitem.h b/src/scene/dndiconitem.h
similarity index 95%
rename from src/dndiconitem.h
rename to src/scene/dndiconitem.h
index 31be5643fa..974bc8f417 100644
--- a/src/dndiconitem.h
+++ b/src/scene/dndiconitem.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWaylandServer
 {
diff --git a/src/item.cpp b/src/scene/item.cpp
similarity index 99%
rename from src/item.cpp
rename to src/scene/item.cpp
index 694e3b6e85..5bcf06a5ea 100644
--- a/src/item.cpp
+++ b/src/scene/item.cpp
@@ -4,12 +4,12 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "item.h"
+#include "scene/item.h"
 #include "composite.h"
 #include "core/output.h"
 #include "core/renderloop.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 #include "workspace.h"
 
diff --git a/src/item.h b/src/scene/item.h
similarity index 100%
rename from src/item.h
rename to src/scene/item.h
diff --git a/src/scene.cpp b/src/scene/scene.cpp
similarity index 99%
rename from src/scene.cpp
rename to src/scene/scene.cpp
index 08a6285ea2..0976967c97 100644
--- a/src/scene.cpp
+++ b/src/scene/scene.cpp
@@ -52,24 +52,24 @@
 
 */
 
-#include "scene.h"
+#include "scene/scene.h"
 #include "composite.h"
 #include "core/output.h"
 #include "core/renderlayer.h"
 #include "core/renderloop.h"
 #include "deleted.h"
-#include "dndiconitem.h"
 #include "effects.h"
 #include "internalwindow.h"
+#include "scene/dndiconitem.h"
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "shadow.h"
-#include "shadowitem.h"
-#include "surfaceitem.h"
 #include "unmanaged.h"
 #include "wayland/seat_interface.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
 #include "waylandwindow.h"
-#include "windowitem.h"
 #include "workspace.h"
 #include "x11window.h"
 
diff --git a/src/scene.h b/src/scene/scene.h
similarity index 100%
rename from src/scene.h
rename to src/scene/scene.h
diff --git a/src/scenes/opengl/scene_opengl.cpp b/src/scene/scene_opengl.cpp
similarity index 99%
rename from src/scenes/opengl/scene_opengl.cpp
rename to src/scene/scene_opengl.cpp
index fcbde97687..7d2564085c 100644
--- a/src/scenes/opengl/scene_opengl.cpp
+++ b/src/scene/scene_opengl.cpp
@@ -22,11 +22,11 @@
 #include "decorations/decoratedclient.h"
 #include "effects.h"
 #include "main.h"
-#include "shadowitem.h"
-#include "surfaceitem.h"
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "utils/common.h"
 #include "window.h"
-#include "windowitem.h"
 
 #include <cmath>
 #include <cstddef>
diff --git a/src/scenes/opengl/scene_opengl.h b/src/scene/scene_opengl.h
similarity index 98%
rename from src/scenes/opengl/scene_opengl.h
rename to src/scene/scene_opengl.h
index 48bbce737e..4d804c88bc 100644
--- a/src/scenes/opengl/scene_opengl.h
+++ b/src/scene/scene_opengl.h
@@ -13,8 +13,8 @@
 
 #include "openglbackend.h"
 
-#include "decorationitem.h"
-#include "scene.h"
+#include "scene/decorationitem.h"
+#include "scene/scene.h"
 #include "shadow.h"
 
 #include "kwinglutils.h"
diff --git a/src/scenes/qpainter/scene_qpainter.cpp b/src/scene/scene_qpainter.cpp
similarity index 99%
rename from src/scenes/qpainter/scene_qpainter.cpp
rename to src/scene/scene_qpainter.cpp
index 2965fb6bfb..5342c1d2c4 100644
--- a/src/scenes/qpainter/scene_qpainter.cpp
+++ b/src/scene/scene_qpainter.cpp
@@ -12,9 +12,9 @@
 #include "core/output.h"
 #include "decorations/decoratedclient.h"
 #include "effects.h"
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
+#include "scene/windowitem.h"
 #include "window.h"
-#include "windowitem.h"
 
 #include <kwinoffscreenquickview.h>
 // Qt
diff --git a/src/scenes/qpainter/scene_qpainter.h b/src/scene/scene_qpainter.h
similarity index 97%
rename from src/scenes/qpainter/scene_qpainter.h
rename to src/scene/scene_qpainter.h
index b85ea3ca46..ee92792f4d 100644
--- a/src/scenes/qpainter/scene_qpainter.h
+++ b/src/scene/scene_qpainter.h
@@ -11,8 +11,8 @@
 
 #include "qpainterbackend.h"
 
-#include "decorationitem.h"
-#include "scene.h"
+#include "scene/decorationitem.h"
+#include "scene/scene.h"
 #include "shadow.h"
 
 namespace KWin
diff --git a/src/shadowitem.cpp b/src/scene/shadowitem.cpp
similarity index 99%
rename from src/shadowitem.cpp
rename to src/scene/shadowitem.cpp
index 52f29804a7..ec39af4eed 100644
--- a/src/shadowitem.cpp
+++ b/src/scene/shadowitem.cpp
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "shadowitem.h"
+#include "scene/shadowitem.h"
 #include "deleted.h"
 #include "shadow.h"
 
diff --git a/src/shadowitem.h b/src/scene/shadowitem.h
similarity index 97%
rename from src/shadowitem.h
rename to src/scene/shadowitem.h
index ec7f872daa..59ea62b3d3 100644
--- a/src/shadowitem.h
+++ b/src/scene/shadowitem.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWin
 {
diff --git a/src/surfaceitem.cpp b/src/scene/surfaceitem.cpp
similarity index 99%
rename from src/surfaceitem.cpp
rename to src/scene/surfaceitem.cpp
index ace8c23feb..931c88f0bb 100644
--- a/src/surfaceitem.cpp
+++ b/src/scene/surfaceitem.cpp
@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWin
 {
diff --git a/src/surfaceitem.h b/src/scene/surfaceitem.h
similarity index 98%
rename from src/surfaceitem.h
rename to src/scene/surfaceitem.h
index a850bef9c3..9a03df0fec 100644
--- a/src/surfaceitem.h
+++ b/src/scene/surfaceitem.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "core/output.h"
-#include "item.h"
+#include "scene/item.h"
 
 namespace KWin
 {
diff --git a/src/surfaceitem_internal.cpp b/src/scene/surfaceitem_internal.cpp
similarity index 97%
rename from src/surfaceitem_internal.cpp
rename to src/scene/surfaceitem_internal.cpp
index ccd7069222..f5207d0486 100644
--- a/src/surfaceitem_internal.cpp
+++ b/src/scene/surfaceitem_internal.cpp
@@ -4,11 +4,11 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_internal.h"
+#include "scene/surfaceitem_internal.h"
 #include "composite.h"
 #include "deleted.h"
 #include "internalwindow.h"
-#include "scene.h"
+#include "scene/scene.h"
 
 #include <QOpenGLFramebufferObject>
 
diff --git a/src/surfaceitem_internal.h b/src/scene/surfaceitem_internal.h
similarity index 97%
rename from src/surfaceitem_internal.h
rename to src/scene/surfaceitem_internal.h
index bc2fe729cf..6bd0d1809c 100644
--- a/src/surfaceitem_internal.h
+++ b/src/scene/surfaceitem_internal.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 class QOpenGLFramebufferObject;
 
diff --git a/src/surfaceitem_wayland.cpp b/src/scene/surfaceitem_wayland.cpp
similarity index 99%
rename from src/surfaceitem_wayland.cpp
rename to src/scene/surfaceitem_wayland.cpp
index 9665028e12..6aa57da0a4 100644
--- a/src/surfaceitem_wayland.cpp
+++ b/src/scene/surfaceitem_wayland.cpp
@@ -4,10 +4,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_wayland.h"
+#include "scene/surfaceitem_wayland.h"
 #include "composite.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland/clientbuffer.h"
 #include "wayland/subcompositor_interface.h"
 #include "wayland/surface_interface.h"
diff --git a/src/surfaceitem_wayland.h b/src/scene/surfaceitem_wayland.h
similarity index 98%
rename from src/surfaceitem_wayland.h
rename to src/scene/surfaceitem_wayland.h
index 28ab4bb0fb..c7b1145e0a 100644
--- a/src/surfaceitem_wayland.h
+++ b/src/scene/surfaceitem_wayland.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 namespace KWaylandServer
 {
diff --git a/src/surfaceitem_x11.cpp b/src/scene/surfaceitem_x11.cpp
similarity index 99%
rename from src/surfaceitem_x11.cpp
rename to src/scene/surfaceitem_x11.cpp
index b26c23dc40..b0e5048d0f 100644
--- a/src/surfaceitem_x11.cpp
+++ b/src/scene/surfaceitem_x11.cpp
@@ -4,10 +4,10 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_x11.h"
 #include "composite.h"
 #include "deleted.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "x11syncmanager.h"
 
 namespace KWin
diff --git a/src/surfaceitem_x11.h b/src/scene/surfaceitem_x11.h
similarity index 98%
rename from src/surfaceitem_x11.h
rename to src/scene/surfaceitem_x11.h
index 8f6539279d..076c735705 100644
--- a/src/surfaceitem_x11.h
+++ b/src/scene/surfaceitem_x11.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "surfaceitem.h"
+#include "scene/surfaceitem.h"
 
 #include <xcb/damage.h>
 #include <xcb/xfixes.h>
diff --git a/src/windowitem.cpp b/src/scene/windowitem.cpp
similarity index 97%
rename from src/windowitem.cpp
rename to src/scene/windowitem.cpp
index 045db40aff..6f2cac32e8 100644
--- a/src/windowitem.cpp
+++ b/src/scene/windowitem.cpp
@@ -4,14 +4,14 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "windowitem.h"
-#include "decorationitem.h"
+#include "scene/windowitem.h"
 #include "deleted.h"
 #include "internalwindow.h"
-#include "shadowitem.h"
-#include "surfaceitem_internal.h"
-#include "surfaceitem_wayland.h"
-#include "surfaceitem_x11.h"
+#include "scene/decorationitem.h"
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem_internal.h"
+#include "scene/surfaceitem_wayland.h"
+#include "scene/surfaceitem_x11.h"
 #include "wayland_server.h"
 #include "window.h"
 #include "workspace.h"
diff --git a/src/windowitem.h b/src/scene/windowitem.h
similarity index 99%
rename from src/windowitem.h
rename to src/scene/windowitem.h
index 1ad051c7d7..02f477d6f8 100644
--- a/src/windowitem.h
+++ b/src/scene/windowitem.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "item.h"
+#include "scene/item.h"
 
 namespace KDecoration2
 {
diff --git a/src/scenes/CMakeLists.txt b/src/scenes/CMakeLists.txt
deleted file mode 100644
index 1a52054539..0000000000
--- a/src/scenes/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory(opengl)
-add_subdirectory(qpainter)
diff --git a/src/scenes/opengl/CMakeLists.txt b/src/scenes/opengl/CMakeLists.txt
deleted file mode 100644
index dbe4b53d98..0000000000
--- a/src/scenes/opengl/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(kwin PRIVATE
-    scene_opengl.cpp
-)
diff --git a/src/scenes/qpainter/CMakeLists.txt b/src/scenes/qpainter/CMakeLists.txt
deleted file mode 100644
index 14f24096fe..0000000000
--- a/src/scenes/qpainter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-target_sources(kwin PRIVATE
-    scene_qpainter.cpp
-)
diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp
index 8d0c1f0a68..83ed143a06 100644
--- a/src/scripting/windowthumbnailitem.cpp
+++ b/src/scripting/windowthumbnailitem.cpp
@@ -10,11 +10,11 @@
 #include "composite.h"
 #include "core/renderbackend.h"
 #include "effects.h"
-#include "scene.h"
+#include "scene/scene.h"
+#include "scene/windowitem.h"
 #include "scripting_logging.h"
 #include "virtualdesktops.h"
 #include "window.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <kwingltexture.h>
diff --git a/src/shadow.cpp b/src/shadow.cpp
index 2667ca8f1c..15f3d42f17 100644
--- a/src/shadow.cpp
+++ b/src/shadow.cpp
@@ -12,7 +12,7 @@
 #include "atoms.h"
 #include "composite.h"
 #include "internalwindow.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "wayland/shadow_interface.h"
 #include "wayland/shmclientbuffer.h"
 #include "wayland/surface_interface.h"
diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp
index 472e50c4fe..a8b45d97cc 100644
--- a/src/unmanaged.cpp
+++ b/src/unmanaged.cpp
@@ -11,10 +11,10 @@
 
 #include "deleted.h"
 #include "effects.h"
-#include "surfaceitem_x11.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "utils/common.h"
 #include "wayland/surface_interface.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <QDebug>
diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
index 9ed8c4d4cf..b4cae9433e 100644
--- a/src/wayland_server.cpp
+++ b/src/wayland_server.cpp
@@ -19,7 +19,7 @@
 #include "keyboard_input.h"
 #include "layershellv1integration.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "unmanaged.h"
 #include "utils/serviceutils.h"
 #include "virtualdesktops.h"
diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp
index 844f96d5c1..40d8f645b2 100644
--- a/src/waylandwindow.cpp
+++ b/src/waylandwindow.cpp
@@ -7,12 +7,12 @@
 */
 
 #include "waylandwindow.h"
+#include "scene/windowitem.h"
 #include "wayland/clientbuffer.h"
 #include "wayland/clientconnection.h"
 #include "wayland/display.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <QFileInfo>
diff --git a/src/window.cpp b/src/window.cpp
index bbc5f94140..15917c08f1 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -31,17 +31,17 @@
 #if KWIN_BUILD_TABBOX
 #include "tabbox.h"
 #endif
+#include "scene/shadowitem.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "screenedge.h"
 #include "shadow.h"
-#include "shadowitem.h"
-#include "surfaceitem_x11.h"
 #include "useractions.h"
 #include "virtualdesktops.h"
 #include "wayland/output_interface.h"
 #include "wayland/plasmawindowmanagement_interface.h"
 #include "wayland/surface_interface.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 
 #include <KDecoration2/DecoratedClient>
diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp
index e6fc141a62..f39fa98d55 100644
--- a/src/x11syncmanager.cpp
+++ b/src/x11syncmanager.cpp
@@ -11,7 +11,7 @@
 #include "core/outputbackend.h"
 #include "core/renderbackend.h"
 #include "main.h"
-#include "scene.h"
+#include "scene/scene.h"
 #include "utils/common.h"
 
 #include "kwinglplatform.h"
diff --git a/src/x11window.cpp b/src/x11window.cpp
index bf1524f174..f1be0635be 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -26,12 +26,12 @@
 #include "group.h"
 #include "netinfo.h"
 #include "placement.h"
+#include "scene/surfaceitem_x11.h"
+#include "scene/windowitem.h"
 #include "screenedge.h"
 #include "shadow.h"
-#include "surfaceitem_x11.h"
 #include "virtualdesktops.h"
 #include "wayland_server.h"
-#include "windowitem.h"
 #include "workspace.h"
 #include <KDecoration2/DecoratedClient>
 #include <KDecoration2/Decoration>
diff --git a/src/x11window.h b/src/x11window.h
index 29b28fba39..6d9cb56d05 100644
--- a/src/x11window.h
+++ b/src/x11window.h
@@ -11,7 +11,7 @@
 #pragma once
 
 // kwin
-#include "decorationitem.h"
+#include "scene/decorationitem.h"
 #include "utils/xcbutils.h"
 #include "window.h"
 // Qt