Final batch of file moves for now

Change-Id: I0c9e83e3142e6b083feb2cbcabcc4279de64b95b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

119 files changed, 108 insertions, 116 deletions

diff --git a/src/render/backend/framegraph/framegraph.pri b/src/render/backend/framegraph/framegraph.pri
deleted file mode 100644
index 51dfdc88e..000000000
--- a/src/render/backend/framegraph/framegraph.pri
+++ /dev/null
@@ -1,33 +0,0 @@
-HEADERS += \
-    $$PWD/cameraselectornode_p.h \
-    $$PWD/framegraphnode_p.h \
-    $$PWD/framegraphvisitor_p.h \
-    $$PWD/renderpassfilternode_p.h \
-    $$PWD/techniquefilternode_p.h \
-    $$PWD/viewportnode_p.h \
-    $$PWD/rendertargetselectornode_p.h \
-    $$PWD/layerfilternode_p.h \
-    $$PWD/clearbuffer_p.h \
-    $$PWD/sortmethod_p.h \
-    $$PWD/sortcriterion_p.h \
-    $$PWD/framegraphsubtreeselector_p.h \
-    $$PWD/statesetnode_p.h \
-    $$PWD/nodraw_p.h
-
-SOURCES += \
-    $$PWD/cameraselectornode.cpp \
-    $$PWD/framegraphnode.cpp \
-    $$PWD/framegraphvisitor.cpp \
-    $$PWD/renderpassfilternode.cpp \
-    $$PWD/techniquefilternode.cpp \
-    $$PWD/viewportnode.cpp \
-    $$PWD/rendertargetselectornode.cpp \
-    $$PWD/layerfilternode.cpp \
-    $$PWD/clearbuffer.cpp \
-    $$PWD/sortmethod.cpp \
-    $$PWD/sortcriterion.cpp \
-    $$PWD/framegraphsubtreeselector.cpp \
-    $$PWD/statesetnode.cpp \
-    $$PWD/nodraw.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 9d747b69e..a69f1d450 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -1,8 +1,5 @@
 INCLUDEPATH += $$PWD
 
-include("framegraph/framegraph.pri")
-include("jobs/render-jobs.pri")
-
 HEADERS += \
     $$PWD/renderthread_p.h \
     $$PWD/renderconfiguration_p.h \
@@ -14,7 +11,6 @@ HEADERS += \
     $$PWD/parameterpack_p.h \
     $$PWD/rendertarget_p.h \
     $$PWD/renderattachment_p.h \
-    $$PWD/scenemanager_p.h \
     $$PWD/attachmentpack_p.h \
     $$PWD/shadervariables_p.h \
     $$PWD/qgraphicsutils_p.h \
@@ -25,7 +21,6 @@ HEADERS += \
     $$PWD/entity_p.h \
     $$PWD/layer_p.h \
     $$PWD/nodefunctor_p.h \
-    $$PWD/scene_p.h \
     $$PWD/transform_p.h
 
 SOURCES += \
@@ -39,11 +34,9 @@ SOURCES += \
     $$PWD/parameterpack.cpp \
     $$PWD/rendertarget.cpp \
     $$PWD/renderattachment.cpp \
-    $$PWD/scenemanager.cpp \
     $$PWD/attachmentpack.cpp \
     $$PWD/platformsurfacefilter.cpp \
     $$PWD/cameralens.cpp \
     $$PWD/entity.cpp \
     $$PWD/layer.cpp \
-    $$PWD/scene.cpp \
     $$PWD/transform.cpp
diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index 527147842..527147842 100644
--- a/src/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
diff --git a/src/render/backend/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index cfe29f36d..cfe29f36d 100644
--- a/src/render/backend/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
diff --git a/src/render/backend/framegraph/clearbuffer.cpp b/src/render/framegraph/clearbuffer.cpp
index 47982d5f0..47982d5f0 100644
--- a/src/render/backend/framegraph/clearbuffer.cpp
+++ b/src/render/framegraph/clearbuffer.cpp
diff --git a/src/render/backend/framegraph/clearbuffer_p.h b/src/render/framegraph/clearbuffer_p.h
index 1883e8134..1883e8134 100644
--- a/src/render/backend/framegraph/clearbuffer_p.h
+++ b/src/render/framegraph/clearbuffer_p.h
diff --git a/src/render/framegraph/framegraph.pri b/src/render/framegraph/framegraph.pri
new file mode 100644
index 000000000..52cad4319
--- /dev/null
+++ b/src/render/framegraph/framegraph.pri
@@ -0,0 +1,74 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/cameraselectornode_p.h \
+    $$PWD/clearbuffer_p.h \
+    $$PWD/framegraphnode_p.h \
+    $$PWD/framegraphsubtreeselector_p.h \
+    $$PWD/framegraphvisitor_p.h \
+    $$PWD/layerfilternode_p.h \
+    $$PWD/nodraw_p.h \
+    $$PWD/qcameraselector.h \
+    $$PWD/qcameraselector_p.h \
+    $$PWD/qclearbuffer.h \
+    $$PWD/qclearbuffer_p.h \
+    $$PWD/qframegraph.h \
+    $$PWD/qframegraph_p.h \
+    $$PWD/qframegraphnode.h \
+    $$PWD/qframegraphnode_p.h \
+    $$PWD/qframegraphselector.h \
+    $$PWD/qframegraphselector_p.h \
+    $$PWD/qlayerfilter.h \
+    $$PWD/qlayerfilter_p.h \
+    $$PWD/qnodraw.h \
+    $$PWD/qrenderpassfilter.h \
+    $$PWD/qrenderpassfilter_p.h \
+    $$PWD/qrendertargetselector.h \
+    $$PWD/qrendertargetselector_p.h \
+    $$PWD/qsortcriterion.h \
+    $$PWD/qsortcriterion_p.h \
+    $$PWD/qsortmethod.h \
+    $$PWD/qsortmethod_p.h \
+    $$PWD/qstateset.h \
+    $$PWD/qstateset_p.h \
+    $$PWD/qtechniquefilter.h \
+    $$PWD/qtechniquefilter_p.h \
+    $$PWD/qviewport.h \
+    $$PWD/qviewport_p.h \
+    $$PWD/renderpassfilternode_p.h \
+    $$PWD/rendertargetselectornode_p.h \
+    $$PWD/sortcriterion_p.h \
+    $$PWD/sortmethod_p.h \
+    $$PWD/statesetnode_p.h \
+    $$PWD/techniquefilternode_p.h \
+    $$PWD/viewportnode_p.h
+
+SOURCES += \
+    $$PWD/cameraselectornode.cpp \
+    $$PWD/clearbuffer.cpp \
+    $$PWD/framegraphnode.cpp \
+    $$PWD/framegraphsubtreeselector.cpp \
+    $$PWD/framegraphvisitor.cpp \
+    $$PWD/layerfilternode.cpp \
+    $$PWD/nodraw.cpp \
+    $$PWD/qcameraselector.cpp \
+    $$PWD/qclearbuffer.cpp \
+    $$PWD/qframegraph.cpp \
+    $$PWD/qframegraphnode.cpp \
+    $$PWD/qframegraphselector.cpp \
+    $$PWD/qlayerfilter.cpp \
+    $$PWD/qnodraw.cpp \
+    $$PWD/qrenderpassfilter.cpp \
+    $$PWD/qrendertargetselector.cpp \
+    $$PWD/qsortcriterion.cpp \
+    $$PWD/qsortmethod.cpp \
+    $$PWD/qstateset.cpp \
+    $$PWD/qtechniquefilter.cpp \
+    $$PWD/qviewport.cpp \
+    $$PWD/renderpassfilternode.cpp \
+    $$PWD/rendertargetselectornode.cpp \
+    $$PWD/sortcriterion.cpp \
+    $$PWD/sortmethod.cpp \
+    $$PWD/statesetnode.cpp \
+    $$PWD/techniquefilternode.cpp \
+    $$PWD/viewportnode.cpp
diff --git a/src/render/backend/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index b001fd675..b001fd675 100644
--- a/src/render/backend/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
diff --git a/src/render/backend/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index f5683a58e..f5683a58e 100644
--- a/src/render/backend/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
diff --git a/src/render/backend/framegraph/framegraphsubtreeselector.cpp b/src/render/framegraph/framegraphsubtreeselector.cpp
index 5fa060d37..5fa060d37 100644
--- a/src/render/backend/framegraph/framegraphsubtreeselector.cpp
+++ b/src/render/framegraph/framegraphsubtreeselector.cpp
diff --git a/src/render/backend/framegraph/framegraphsubtreeselector_p.h b/src/render/framegraph/framegraphsubtreeselector_p.h
index 8f3cd9ea2..8f3cd9ea2 100644
--- a/src/render/backend/framegraph/framegraphsubtreeselector_p.h
+++ b/src/render/framegraph/framegraphsubtreeselector_p.h
diff --git a/src/render/backend/framegraph/framegraphvisitor.cpp b/src/render/framegraph/framegraphvisitor.cpp
index e9b825815..e9b825815 100644
--- a/src/render/backend/framegraph/framegraphvisitor.cpp
+++ b/src/render/framegraph/framegraphvisitor.cpp
diff --git a/src/render/backend/framegraph/framegraphvisitor_p.h b/src/render/framegraph/framegraphvisitor_p.h
index 560aa9787..560aa9787 100644
--- a/src/render/backend/framegraph/framegraphvisitor_p.h
+++ b/src/render/framegraph/framegraphvisitor_p.h
diff --git a/src/render/backend/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index 4c9ee50ad..4c9ee50ad 100644
--- a/src/render/backend/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
diff --git a/src/render/backend/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index fcbf54c77..fcbf54c77 100644
--- a/src/render/backend/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
diff --git a/src/render/backend/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp
index 0822779f8..0822779f8 100644
--- a/src/render/backend/framegraph/nodraw.cpp
+++ b/src/render/framegraph/nodraw.cpp
diff --git a/src/render/backend/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h
index 068143252..068143252 100644
--- a/src/render/backend/framegraph/nodraw_p.h
+++ b/src/render/framegraph/nodraw_p.h
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index d77c493e9..d77c493e9 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/framegraph/qcameraselector.h
index 546d77a61..546d77a61 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.h
+++ b/src/render/framegraph/qcameraselector.h
diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/framegraph/qcameraselector_p.h
index bcf00d6b6..bcf00d6b6 100644
--- a/src/render/frontend/framegraph-components/qcameraselector_p.h
+++ b/src/render/framegraph/qcameraselector_p.h
diff --git a/src/render/frontend/framegraph-components/qclearbuffer.cpp b/src/render/framegraph/qclearbuffer.cpp
index 5706f6aa7..5706f6aa7 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer.cpp
+++ b/src/render/framegraph/qclearbuffer.cpp
diff --git a/src/render/frontend/framegraph-components/qclearbuffer.h b/src/render/framegraph/qclearbuffer.h
index 9b42cb46c..9b42cb46c 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer.h
+++ b/src/render/framegraph/qclearbuffer.h
diff --git a/src/render/frontend/framegraph-components/qclearbuffer_p.h b/src/render/framegraph/qclearbuffer_p.h
index 402f956a2..402f956a2 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer_p.h
+++ b/src/render/framegraph/qclearbuffer_p.h
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/framegraph/qframegraph.cpp
index b8357f396..b8357f396 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/framegraph/qframegraph.cpp
diff --git a/src/render/frontend/framegraph-components/qframegraph.h b/src/render/framegraph/qframegraph.h
index 2a32a95f6..2a32a95f6 100644
--- a/src/render/frontend/framegraph-components/qframegraph.h
+++ b/src/render/framegraph/qframegraph.h
diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/framegraph/qframegraph_p.h
index 0eb8ca7e5..0eb8ca7e5 100644
--- a/src/render/frontend/framegraph-components/qframegraph_p.h
+++ b/src/render/framegraph/qframegraph_p.h
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 1c28d72a0..1c28d72a0 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h
index ce14b9bed..ce14b9bed 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.h
+++ b/src/render/framegraph/qframegraphnode.h
diff --git a/src/render/frontend/framegraph-components/qframegraphnode_p.h b/src/render/framegraph/qframegraphnode_p.h
index d1dc98196..d1dc98196 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode_p.h
+++ b/src/render/framegraph/qframegraphnode_p.h
diff --git a/src/render/frontend/framegraph-components/qframegraphselector.cpp b/src/render/framegraph/qframegraphselector.cpp
index 6d2dc7e6e..6d2dc7e6e 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector.cpp
+++ b/src/render/framegraph/qframegraphselector.cpp
diff --git a/src/render/frontend/framegraph-components/qframegraphselector.h b/src/render/framegraph/qframegraphselector.h
index 8300be080..8300be080 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector.h
+++ b/src/render/framegraph/qframegraphselector.h
diff --git a/src/render/frontend/framegraph-components/qframegraphselector_p.h b/src/render/framegraph/qframegraphselector_p.h
index b1d63a7fe..b1d63a7fe 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector_p.h
+++ b/src/render/framegraph/qframegraphselector_p.h
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index 1dad3c1db..1dad3c1db 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h
index 7e177e322..7e177e322 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.h
+++ b/src/render/framegraph/qlayerfilter.h
diff --git a/src/render/frontend/framegraph-components/qlayerfilter_p.h b/src/render/framegraph/qlayerfilter_p.h
index e1abb7cf8..e1abb7cf8 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter_p.h
+++ b/src/render/framegraph/qlayerfilter_p.h
diff --git a/src/render/frontend/framegraph-components/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp
index 294bdba5f..294bdba5f 100644
--- a/src/render/frontend/framegraph-components/qnodraw.cpp
+++ b/src/render/framegraph/qnodraw.cpp
diff --git a/src/render/frontend/framegraph-components/qnodraw.h b/src/render/framegraph/qnodraw.h
index 361bbfdc4..361bbfdc4 100644
--- a/src/render/frontend/framegraph-components/qnodraw.h
+++ b/src/render/framegraph/qnodraw.h
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index bc72ed652..bc72ed652 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index edab54406..edab54406 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h
index a1f3a4afa..a1f3a4afa 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
+++ b/src/render/framegraph/qrenderpassfilter_p.h
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index fc87cadc9..fc87cadc9 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.h b/src/render/framegraph/qrendertargetselector.h
index c05f4584f..c05f4584f 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.h
+++ b/src/render/framegraph/qrendertargetselector.h
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector_p.h b/src/render/framegraph/qrendertargetselector_p.h
index fa4d4aff2..fa4d4aff2 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector_p.h
+++ b/src/render/framegraph/qrendertargetselector_p.h
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.cpp b/src/render/framegraph/qsortcriterion.cpp
index 2c09a552c..2c09a552c 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.cpp
+++ b/src/render/framegraph/qsortcriterion.cpp
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h
index d4e12a7a8..d4e12a7a8 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.h
+++ b/src/render/framegraph/qsortcriterion.h
diff --git a/src/render/frontend/framegraph-components/qsortcriterion_p.h b/src/render/framegraph/qsortcriterion_p.h
index d4701aa24..d4701aa24 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion_p.h
+++ b/src/render/framegraph/qsortcriterion_p.h
diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/framegraph/qsortmethod.cpp
index c103fbe47..c103fbe47 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.cpp
+++ b/src/render/framegraph/qsortmethod.cpp
diff --git a/src/render/frontend/framegraph-components/qsortmethod.h b/src/render/framegraph/qsortmethod.h
index 5eb5ee85e..5eb5ee85e 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.h
+++ b/src/render/framegraph/qsortmethod.h
diff --git a/src/render/frontend/framegraph-components/qsortmethod_p.h b/src/render/framegraph/qsortmethod_p.h
index 5cc7944ea..5cc7944ea 100644
--- a/src/render/frontend/framegraph-components/qsortmethod_p.h
+++ b/src/render/framegraph/qsortmethod_p.h
diff --git a/src/render/frontend/framegraph-components/qstateset.cpp b/src/render/framegraph/qstateset.cpp
index cd7646d7b..cd7646d7b 100644
--- a/src/render/frontend/framegraph-components/qstateset.cpp
+++ b/src/render/framegraph/qstateset.cpp
diff --git a/src/render/frontend/framegraph-components/qstateset.h b/src/render/framegraph/qstateset.h
index c9d6eb68d..c9d6eb68d 100644
--- a/src/render/frontend/framegraph-components/qstateset.h
+++ b/src/render/framegraph/qstateset.h
diff --git a/src/render/frontend/framegraph-components/qstateset_p.h b/src/render/framegraph/qstateset_p.h
index 69e743fd0..69e743fd0 100644
--- a/src/render/frontend/framegraph-components/qstateset_p.h
+++ b/src/render/framegraph/qstateset_p.h
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 6092fb870..6092fb870 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h
index 8b8a115f8..8b8a115f8 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.h
+++ b/src/render/framegraph/qtechniquefilter.h
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h
index 219e50b9a..219e50b9a 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h
+++ b/src/render/framegraph/qtechniquefilter_p.h
diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/framegraph/qviewport.cpp
index 4f821b58f..4f821b58f 100644
--- a/src/render/frontend/framegraph-components/qviewport.cpp
+++ b/src/render/framegraph/qviewport.cpp
diff --git a/src/render/frontend/framegraph-components/qviewport.h b/src/render/framegraph/qviewport.h
index 3f427d044..3f427d044 100644
--- a/src/render/frontend/framegraph-components/qviewport.h
+++ b/src/render/framegraph/qviewport.h
diff --git a/src/render/frontend/framegraph-components/qviewport_p.h b/src/render/framegraph/qviewport_p.h
index bb1cd1a26..bb1cd1a26 100644
--- a/src/render/frontend/framegraph-components/qviewport_p.h
+++ b/src/render/framegraph/qviewport_p.h
diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 10c0352d8..10c0352d8 100644
--- a/src/render/backend/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
diff --git a/src/render/backend/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 009794488..009794488 100644
--- a/src/render/backend/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
diff --git a/src/render/backend/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index ddd565d57..ddd565d57 100644
--- a/src/render/backend/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
diff --git a/src/render/backend/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 9b3e4199b..9b3e4199b 100644
--- a/src/render/backend/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
diff --git a/src/render/backend/framegraph/sortcriterion.cpp b/src/render/framegraph/sortcriterion.cpp
index 97db75c9f..97db75c9f 100644
--- a/src/render/backend/framegraph/sortcriterion.cpp
+++ b/src/render/framegraph/sortcriterion.cpp
diff --git a/src/render/backend/framegraph/sortcriterion_p.h b/src/render/framegraph/sortcriterion_p.h
index 982c3a50c..982c3a50c 100644
--- a/src/render/backend/framegraph/sortcriterion_p.h
+++ b/src/render/framegraph/sortcriterion_p.h
diff --git a/src/render/backend/framegraph/sortmethod.cpp b/src/render/framegraph/sortmethod.cpp
index 4f67eb08f..4f67eb08f 100644
--- a/src/render/backend/framegraph/sortmethod.cpp
+++ b/src/render/framegraph/sortmethod.cpp
diff --git a/src/render/backend/framegraph/sortmethod_p.h b/src/render/framegraph/sortmethod_p.h
index b9d26d2a3..b9d26d2a3 100644
--- a/src/render/backend/framegraph/sortmethod_p.h
+++ b/src/render/framegraph/sortmethod_p.h
diff --git a/src/render/backend/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index cd0d82371..cd0d82371 100644
--- a/src/render/backend/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
diff --git a/src/render/backend/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index d5d2921f2..d5d2921f2 100644
--- a/src/render/backend/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
diff --git a/src/render/backend/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 547ed077b..547ed077b 100644
--- a/src/render/backend/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
diff --git a/src/render/backend/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index afcf7c1d8..afcf7c1d8 100644
--- a/src/render/backend/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
diff --git a/src/render/backend/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp
index 29751068c..29751068c 100644
--- a/src/render/backend/framegraph/viewportnode.cpp
+++ b/src/render/framegraph/viewportnode.cpp
diff --git a/src/render/backend/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index 35a1110c2..35a1110c2 100644
--- a/src/render/backend/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
diff --git a/src/render/frontend/framegraph-components/framegraph-components.pri b/src/render/frontend/framegraph-components/framegraph-components.pri
deleted file mode 100644
index b26f70185..000000000
--- a/src/render/frontend/framegraph-components/framegraph-components.pri
+++ /dev/null
@@ -1,46 +0,0 @@
-HEADERS += \
-        $$PWD/qframegraph.h \
-        $$PWD/qframegraph_p.h \
-        $$PWD/qrenderpassfilter.h \
-        $$PWD/qrenderpassfilter_p.h \
-        $$PWD/qtechniquefilter.h \
-        $$PWD/qtechniquefilter_p.h \
-        $$PWD/qviewport.h \
-        $$PWD/qviewport_p.h \
-        $$PWD/qrendertargetselector.h \
-        $$PWD/qrendertargetselector_p.h \
-        $$PWD/qcameraselector.h \
-        $$PWD/qcameraselector_p.h \
-        $$PWD/qlayerfilter.h \
-        $$PWD/qlayerfilter_p.h \
-        $$PWD/qclearbuffer.h \
-        $$PWD/qclearbuffer_p.h \
-        $$PWD/qsortmethod.h \
-        $$PWD/qsortmethod_p.h \
-        $$PWD/qsortcriterion.h \
-        $$PWD/qsortcriterion_p.h \
-        $$PWD/qframegraphnode.h \
-        $$PWD/qframegraphnode_p.h \
-        $$PWD/qframegraphselector.h \
-        $$PWD/qframegraphselector_p.h \
-        $$PWD/qstateset.h \
-        $$PWD/qstateset_p.h \
-        $$PWD/qnodraw.h
-
-SOURCES += \
-        $$PWD/qframegraph.cpp \
-        $$PWD/qrenderpassfilter.cpp \
-        $$PWD/qviewport.cpp \
-        $$PWD/qtechniquefilter.cpp \
-        $$PWD/qcameraselector.cpp \
-        $$PWD/qrendertargetselector.cpp \
-        $$PWD/qlayerfilter.cpp \
-        $$PWD/qclearbuffer.cpp \
-        $$PWD/qsortmethod.cpp \
-        $$PWD/qsortcriterion.cpp \
-        $$PWD/qframegraphnode.cpp \
-        $$PWD/qframegraphselector.cpp \
-        $$PWD/qstateset.cpp \
-        $$PWD/qnodraw.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 9c4f421ab..be3952299 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -1,15 +1,10 @@
 INCLUDEPATH += $$PWD
 
-include(framegraph-components/framegraph-components.pri)
-
 HEADERS += \
     $$PWD/qrenderaspect.h \
     $$PWD/qrenderaspect_p.h \
     $$PWD/qitemmodelbuffer.h \
     $$PWD/sphere.h \
-    $$PWD/qabstractsceneloader.h \
-    $$PWD/qsceneloader.h \
-    $$PWD/qabstractsceneloader_p.h \
     $$PWD/qlayer.h \
     $$PWD/qlayer_p.h \
     $$PWD/qrenderattachment.h \
@@ -23,8 +18,6 @@ SOURCES += \
     $$PWD/qrenderaspect.cpp \
     $$PWD/qitemmodelbuffer.cpp \
     $$PWD/sphere.cpp \
-    $$PWD/qabstractsceneloader.cpp \
-    $$PWD/qsceneloader.cpp \
     $$PWD/qlayer.cpp \
     $$PWD/qrenderattachment.cpp \
     $$PWD/qrendertarget.cpp \
diff --git a/src/render/geometry/geometry.pri b/src/render/geometry/geometry.pri
index 81155f086..cb4baa639 100644
--- a/src/render/geometry/geometry.pri
+++ b/src/render/geometry/geometry.pri
@@ -7,16 +7,22 @@ HEADERS += \
     $$PWD/geometry_p.h \
     $$PWD/geometryrenderer_p.h \
     $$PWD/geometryrenderermanager_p.h \
+    $$PWD/qattribute.h \
+    $$PWD/qattribute_p.h \
+    $$PWD/qbuffer.h \
+    $$PWD/qbuffer_p.h \
+    $$PWD/qbufferfunctor.h \
     $$PWD/qcuboidmesh.h \
     $$PWD/qcylindergeometry.h \
     $$PWD/qcylindergeometry_p.h \
     $$PWD/qcylindermesh.h \
     $$PWD/qgeometry.h \
     $$PWD/qgeometry_p.h \
+    $$PWD/qgeometryfunctor.h \
     $$PWD/qgeometryrenderer.h \
     $$PWD/qgeometryrenderer_p.h \
-    $$PWD/qmesh_p.h \
     $$PWD/qmesh.h \
+    $$PWD/qmesh_p.h \
     $$PWD/qplanemesh.h \
     $$PWD/qspheremesh.h \
     $$PWD/qtorusmesh.h
@@ -28,6 +34,8 @@ SOURCES += \
     $$PWD/geometry.cpp \
     $$PWD/geometryrenderer.cpp \
     $$PWD/geometryrenderermanager.cpp \
+    $$PWD/qattribute.cpp \
+    $$PWD/qbuffer.cpp \
     $$PWD/qcuboidmesh.cpp \
     $$PWD/qcylindergeometry.cpp \
     $$PWD/qcylindermesh.cpp \
diff --git a/src/render/io/qattribute.cpp b/src/render/geometry/qattribute.cpp
index 09b858128..09b858128 100644
--- a/src/render/io/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
diff --git a/src/render/io/qattribute.h b/src/render/geometry/qattribute.h
index 9106cbda9..9106cbda9 100644
--- a/src/render/io/qattribute.h
+++ b/src/render/geometry/qattribute.h
diff --git a/src/render/io/qattribute_p.h b/src/render/geometry/qattribute_p.h
index 0e7ef390f..0e7ef390f 100644
--- a/src/render/io/qattribute_p.h
+++ b/src/render/geometry/qattribute_p.h
diff --git a/src/render/io/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index 6a86f74f7..6a86f74f7 100644
--- a/src/render/io/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
diff --git a/src/render/io/qbuffer.h b/src/render/geometry/qbuffer.h
index d1d9f9929..d1d9f9929 100644
--- a/src/render/io/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
diff --git a/src/render/io/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index 53bea6359..53bea6359 100644
--- a/src/render/io/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
diff --git a/src/render/io/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h
index 4a508b975..4a508b975 100644
--- a/src/render/io/qbufferfunctor.h
+++ b/src/render/geometry/qbufferfunctor.h
diff --git a/src/render/io/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h
index 4290fbe7b..4290fbe7b 100644
--- a/src/render/io/qgeometryfunctor.h
+++ b/src/render/geometry/qgeometryfunctor.h
diff --git a/src/render/io/io.pri b/src/render/io/io.pri
new file mode 100644
index 000000000..70f00ab9a
--- /dev/null
+++ b/src/render/io/io.pri
@@ -0,0 +1,20 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/abstractsceneparser_p.h \
+    $$PWD/objloader_p.h \
+    $$PWD/qabstractsceneloader.h \
+    $$PWD/qabstractsceneloader_p.h \
+    $$PWD/qsceneloader.h \
+    $$PWD/scene_p.h \
+    $$PWD/scenemanager_p.h \
+    $$PWD/uniformbuffer_p.h
+
+SOURCES += \
+    $$PWD/abstractsceneparser.cpp \
+    $$PWD/objloader.cpp \
+    $$PWD/qabstractsceneloader.cpp \
+    $$PWD/qsceneloader.cpp \
+    $$PWD/scene.cpp \
+    $$PWD/scenemanager.cpp \
+    $$PWD/uniformbuffer.cpp
diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp
index d0e9a8838..d0e9a8838 100644
--- a/src/render/frontend/qabstractsceneloader.cpp
+++ b/src/render/io/qabstractsceneloader.cpp
diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h
index 88af95577..88af95577 100644
--- a/src/render/frontend/qabstractsceneloader.h
+++ b/src/render/io/qabstractsceneloader.h
diff --git a/src/render/frontend/qabstractsceneloader_p.h b/src/render/io/qabstractsceneloader_p.h
index 3377c730c..3377c730c 100644
--- a/src/render/frontend/qabstractsceneloader_p.h
+++ b/src/render/io/qabstractsceneloader_p.h
diff --git a/src/render/frontend/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index b5b4975e7..b5b4975e7 100644
--- a/src/render/frontend/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
diff --git a/src/render/frontend/qsceneloader.h b/src/render/io/qsceneloader.h
index adbed1dda..adbed1dda 100644
--- a/src/render/frontend/qsceneloader.h
+++ b/src/render/io/qsceneloader.h
diff --git a/src/render/io/render-io.pri b/src/render/io/render-io.pri
deleted file mode 100644
index ababc3cd0..000000000
--- a/src/render/io/render-io.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-INCLUDEPATH += $$PWD
-
-HEADERS += \
-    $$PWD/objloader_p.h \
-    $$PWD/texturedata.h \
-    $$PWD/abstractsceneparser_p.h \
-    $$PWD/qattribute.h \
-    $$PWD/qattribute_p.h \
-    $$PWD/qbuffer.h \
-    $$PWD/qbuffer_p.h \
-    $$PWD/uniformbuffer_p.h \
-    $$PWD/qbufferfunctor.h \
-    $$PWD/qgeometryfunctor.h
-
-SOURCES += \
-    $$PWD/objloader.cpp \
-    $$PWD/texturedata.cpp \
-    $$PWD/abstractsceneparser.cpp \
-    $$PWD/qattribute.cpp \
-    $$PWD/qbuffer.cpp \
-    $$PWD/uniformbuffer.cpp
diff --git a/src/render/backend/scene.cpp b/src/render/io/scene.cpp
index a92dc1fd8..a92dc1fd8 100644
--- a/src/render/backend/scene.cpp
+++ b/src/render/io/scene.cpp
diff --git a/src/render/backend/scene_p.h b/src/render/io/scene_p.h
index f69192cfa..f69192cfa 100644
--- a/src/render/backend/scene_p.h
+++ b/src/render/io/scene_p.h
diff --git a/src/render/backend/scenemanager.cpp b/src/render/io/scenemanager.cpp
index 52fd2a627..52fd2a627 100644
--- a/src/render/backend/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
diff --git a/src/render/backend/scenemanager_p.h b/src/render/io/scenemanager_p.h
index 889601db1..889601db1 100644
--- a/src/render/backend/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/jobs/framecleanupjob.cpp
index 7d6df11b4..7d6df11b4 100644
--- a/src/render/backend/jobs/framecleanupjob.cpp
+++ b/src/render/jobs/framecleanupjob.cpp
diff --git a/src/render/backend/jobs/framecleanupjob_p.h b/src/render/jobs/framecleanupjob_p.h
index c0afc13d5..c0afc13d5 100644
--- a/src/render/backend/jobs/framecleanupjob_p.h
+++ b/src/render/jobs/framecleanupjob_p.h
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/jobs/framepreparationjob.cpp
index 8b98fb54d..8b98fb54d 100644
--- a/src/render/backend/jobs/framepreparationjob.cpp
+++ b/src/render/jobs/framepreparationjob.cpp
diff --git a/src/render/backend/jobs/framepreparationjob_p.h b/src/render/jobs/framepreparationjob_p.h
index cc5c7feef..cc5c7feef 100644
--- a/src/render/backend/jobs/framepreparationjob_p.h
+++ b/src/render/jobs/framepreparationjob_p.h
diff --git a/src/render/backend/jobs/render-jobs.pri b/src/render/jobs/jobs.pri
index 2c9b93a4e..2c9b93a4e 100644
--- a/src/render/backend/jobs/render-jobs.pri
+++ b/src/render/jobs/jobs.pri
diff --git a/src/render/backend/jobs/loadbufferjob.cpp b/src/render/jobs/loadbufferjob.cpp
index 4feb07358..4feb07358 100644
--- a/src/render/backend/jobs/loadbufferjob.cpp
+++ b/src/render/jobs/loadbufferjob.cpp
diff --git a/src/render/backend/jobs/loadbufferjob_p.h b/src/render/jobs/loadbufferjob_p.h
index 7ad43a8a0..7ad43a8a0 100644
--- a/src/render/backend/jobs/loadbufferjob_p.h
+++ b/src/render/jobs/loadbufferjob_p.h
diff --git a/src/render/backend/jobs/loadgeometryjob.cpp b/src/render/jobs/loadgeometryjob.cpp
index 695e32dc1..695e32dc1 100644
--- a/src/render/backend/jobs/loadgeometryjob.cpp
+++ b/src/render/jobs/loadgeometryjob.cpp
diff --git a/src/render/backend/jobs/loadgeometryjob_p.h b/src/render/jobs/loadgeometryjob_p.h
index 493b1b694..493b1b694 100644
--- a/src/render/backend/jobs/loadgeometryjob_p.h
+++ b/src/render/jobs/loadgeometryjob_p.h
diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index 6ceda73da..6ceda73da 100644
--- a/src/render/backend/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
diff --git a/src/render/backend/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index d4831d7ed..d4831d7ed 100644
--- a/src/render/backend/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
diff --git a/src/render/backend/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp
index 2dadcd69e..2dadcd69e 100644
--- a/src/render/backend/jobs/loadtexturedatajob.cpp
+++ b/src/render/jobs/loadtexturedatajob.cpp
diff --git a/src/render/backend/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index 15b32c79b..15b32c79b 100644
--- a/src/render/backend/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
diff --git a/src/render/backend/jobs/renderviewjob.cpp b/src/render/jobs/renderviewjob.cpp
index 962bcaaa7..962bcaaa7 100644
--- a/src/render/backend/jobs/renderviewjob.cpp
+++ b/src/render/jobs/renderviewjob.cpp
diff --git a/src/render/backend/jobs/renderviewjob_p.h b/src/render/jobs/renderviewjob_p.h
index 281928500..281928500 100644
--- a/src/render/backend/jobs/renderviewjob_p.h
+++ b/src/render/jobs/renderviewjob_p.h
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 9cf472549..9cf472549 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index 3e362b39c..3e362b39c 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/jobs/updateboundingvolumejob.cpp
index 3c8f47262..3c8f47262 100644
--- a/src/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/jobs/updateboundingvolumejob.cpp
diff --git a/src/render/backend/jobs/updateboundingvolumejob_p.h b/src/render/jobs/updateboundingvolumejob_p.h
index a26a1906b..a26a1906b 100644
--- a/src/render/backend/jobs/updateboundingvolumejob_p.h
+++ b/src/render/jobs/updateboundingvolumejob_p.h
diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp
index 20c58511c..20c58511c 100644
--- a/src/render/backend/jobs/updateworldtransformjob.cpp
+++ b/src/render/jobs/updateworldtransformjob.cpp
diff --git a/src/render/backend/jobs/updateworldtransformjob_p.h b/src/render/jobs/updateworldtransformjob_p.h
index 81559cf42..81559cf42 100644
--- a/src/render/backend/jobs/updateworldtransformjob_p.h
+++ b/src/render/jobs/updateworldtransformjob_p.h
diff --git a/src/render/render.pro b/src/render/render.pro
index 431abbb59..1bfc7bf98 100644
--- a/src/render/render.pro
+++ b/src/render/render.pro
@@ -14,11 +14,13 @@ load(qt_module)
 include (backend/render-backend.pri)
 include (geometry/geometry.pri)
 include (graphicshelpers/graphicshelpers.pri)
+include (framegraph/framegraph.pri)
 include (frontend/render-frontend.pri)
+include (jobs/jobs.pri)
 include (lights/lights.pri)
 include (materialsystem/materialsystem.pri)
 include (renderstates/renderstates.pri)
-include (io/render-io.pri)
+include (io/io.pri)
 include (defaults/defaults.pri)
 include (services/services.pri)
 include (texture/texture.pri)
diff --git a/src/render/texture/texture.pri b/src/render/texture/texture.pri
index adc07dcd9..9df52c131 100644
--- a/src/render/texture/texture.pri
+++ b/src/render/texture/texture.pri
@@ -10,6 +10,7 @@ HEADERS += \
     $$PWD/qtextureproviders.h \
     $$PWD/qwrapmode.h \
     $$PWD/texture_p.h \
+    $$PWD/texturedata.h \
     $$PWD/texturedatamanager_p.h \
     $$PWD/textureimage_p.h
 
@@ -20,5 +21,6 @@ SOURCES += \
     $$PWD/qtextureproviders.cpp \
     $$PWD/qwrapmode.cpp \
     $$PWD/texture.cpp \
+    $$PWD/texturedata.cpp \
     $$PWD/texturedatamanager.cpp \
     $$PWD/textureimage.cpp
diff --git a/src/render/io/texturedata.cpp b/src/render/texture/texturedata.cpp
index b54c526f9..b54c526f9 100644
--- a/src/render/io/texturedata.cpp
+++ b/src/render/texture/texturedata.cpp
diff --git a/src/render/io/texturedata.h b/src/render/texture/texturedata.h
index 2f3fdb9a9..2f3fdb9a9 100644
--- a/src/render/io/texturedata.h
+++ b/src/render/texture/texturedata.h