diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 379f2745ce..534c01ef53 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -26,12 +26,15 @@ symbian {
     include(s60framework/s60framework.pri)
 }
 
+# stuff that goes into new QtGui
+include(guikernel/guikernel.pri)
+include(image/image.pri)
+include(text/text.pri)
+include(painting/painting.pri)
+
 #modules
 include(animation/animation.pri)
 include(kernel/kernel.pri)
-include(image/image.pri)
-include(painting/painting.pri)
-include(text/text.pri)
 include(styles/styles.pri)
 include(widgets/widgets.pri)
 include(dialogs/dialogs.pri)
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/guikernel/qclipboard.cpp
similarity index 99%
rename from src/gui/kernel/qclipboard.cpp
rename to src/gui/guikernel/qclipboard.cpp
index ba7ad0caac..5ff47bd136 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/guikernel/qclipboard.cpp
@@ -44,7 +44,7 @@
 #ifndef QT_NO_CLIPBOARD
 
 #include "qapplication.h"
-#include "qapplication_p.h"
+#include "private/qapplication_p.h"
 #include "qpixmap.h"
 #include "qclipboard_p.h"
 #include "qvariant.h"
diff --git a/src/gui/kernel/qclipboard.h b/src/gui/guikernel/qclipboard.h
similarity index 100%
rename from src/gui/kernel/qclipboard.h
rename to src/gui/guikernel/qclipboard.h
diff --git a/src/gui/kernel/qclipboard_mac.cpp b/src/gui/guikernel/qclipboard_mac.cpp
similarity index 100%
rename from src/gui/kernel/qclipboard_mac.cpp
rename to src/gui/guikernel/qclipboard_mac.cpp
diff --git a/src/gui/kernel/qclipboard_p.h b/src/gui/guikernel/qclipboard_p.h
similarity index 100%
rename from src/gui/kernel/qclipboard_p.h
rename to src/gui/guikernel/qclipboard_p.h
diff --git a/src/gui/kernel/qclipboard_qpa.cpp b/src/gui/guikernel/qclipboard_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qclipboard_qpa.cpp
rename to src/gui/guikernel/qclipboard_qpa.cpp
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/guikernel/qclipboard_s60.cpp
similarity index 100%
rename from src/gui/kernel/qclipboard_s60.cpp
rename to src/gui/guikernel/qclipboard_s60.cpp
diff --git a/src/gui/kernel/qclipboard_win.cpp b/src/gui/guikernel/qclipboard_win.cpp
similarity index 100%
rename from src/gui/kernel/qclipboard_win.cpp
rename to src/gui/guikernel/qclipboard_win.cpp
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/guikernel/qclipboard_x11.cpp
similarity index 100%
rename from src/gui/kernel/qclipboard_x11.cpp
rename to src/gui/guikernel/qclipboard_x11.cpp
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/guikernel/qcursor.cpp
similarity index 100%
rename from src/gui/kernel/qcursor.cpp
rename to src/gui/guikernel/qcursor.cpp
diff --git a/src/gui/kernel/qcursor.h b/src/gui/guikernel/qcursor.h
similarity index 100%
rename from src/gui/kernel/qcursor.h
rename to src/gui/guikernel/qcursor.h
diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/guikernel/qcursor_mac.mm
similarity index 100%
rename from src/gui/kernel/qcursor_mac.mm
rename to src/gui/guikernel/qcursor_mac.mm
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/guikernel/qcursor_p.h
similarity index 100%
rename from src/gui/kernel/qcursor_p.h
rename to src/gui/guikernel/qcursor_p.h
diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/guikernel/qcursor_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qcursor_qpa.cpp
rename to src/gui/guikernel/qcursor_qpa.cpp
diff --git a/src/gui/kernel/qcursor_s60.cpp b/src/gui/guikernel/qcursor_s60.cpp
similarity index 100%
rename from src/gui/kernel/qcursor_s60.cpp
rename to src/gui/guikernel/qcursor_s60.cpp
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/guikernel/qcursor_win.cpp
similarity index 100%
rename from src/gui/kernel/qcursor_win.cpp
rename to src/gui/guikernel/qcursor_win.cpp
diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/guikernel/qcursor_x11.cpp
similarity index 100%
rename from src/gui/kernel/qcursor_x11.cpp
rename to src/gui/guikernel/qcursor_x11.cpp
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/guikernel/qdnd.cpp
similarity index 100%
rename from src/gui/kernel/qdnd.cpp
rename to src/gui/guikernel/qdnd.cpp
diff --git a/src/gui/kernel/qdnd_mac.mm b/src/gui/guikernel/qdnd_mac.mm
similarity index 100%
rename from src/gui/kernel/qdnd_mac.mm
rename to src/gui/guikernel/qdnd_mac.mm
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/guikernel/qdnd_p.h
similarity index 100%
rename from src/gui/kernel/qdnd_p.h
rename to src/gui/guikernel/qdnd_p.h
diff --git a/src/gui/kernel/qdnd_qpa.cpp b/src/gui/guikernel/qdnd_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qdnd_qpa.cpp
rename to src/gui/guikernel/qdnd_qpa.cpp
diff --git a/src/gui/kernel/qdnd_s60.cpp b/src/gui/guikernel/qdnd_s60.cpp
similarity index 100%
rename from src/gui/kernel/qdnd_s60.cpp
rename to src/gui/guikernel/qdnd_s60.cpp
diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/guikernel/qdnd_win.cpp
similarity index 100%
rename from src/gui/kernel/qdnd_win.cpp
rename to src/gui/guikernel/qdnd_win.cpp
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/guikernel/qdnd_x11.cpp
similarity index 100%
rename from src/gui/kernel/qdnd_x11.cpp
rename to src/gui/guikernel/qdnd_x11.cpp
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/guikernel/qdrag.cpp
similarity index 100%
rename from src/gui/kernel/qdrag.cpp
rename to src/gui/guikernel/qdrag.cpp
diff --git a/src/gui/kernel/qdrag.h b/src/gui/guikernel/qdrag.h
similarity index 100%
rename from src/gui/kernel/qdrag.h
rename to src/gui/guikernel/qdrag.h
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/guikernel/qevent.cpp
similarity index 99%
rename from src/gui/kernel/qevent.cpp
rename to src/gui/guikernel/qevent.cpp
index 5f0cfd7d69..b78a2632aa 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/guikernel/qevent.cpp
@@ -52,7 +52,7 @@
 #include "qdnd_p.h"
 #include "qevent_p.h"
 #include "qgesture.h"
-#include "qgesture_p.h"
+#include "private/qgesture_p.h"
 
 #ifdef Q_OS_SYMBIAN
 #include "private/qcore_symbian_p.h"
diff --git a/src/gui/kernel/qevent.h b/src/gui/guikernel/qevent.h
similarity index 100%
rename from src/gui/kernel/qevent.h
rename to src/gui/guikernel/qevent.h
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/guikernel/qevent_p.h
similarity index 100%
rename from src/gui/kernel/qevent_p.h
rename to src/gui/guikernel/qevent_p.h
diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
similarity index 99%
rename from src/gui/kernel/qeventdispatcher_glib_qpa.cpp
rename to src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
index c63e94e8c8..c63314c889 100644
--- a/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
+++ b/src/gui/guikernel/qeventdispatcher_glib_qpa.cpp
@@ -47,7 +47,7 @@
 #include "qapplication.h"
 
 #include <glib.h>
-#include "qapplication_p.h"
+#include "private/qapplication_p.h"
 
 #include <qdebug.h>
 
diff --git a/src/gui/kernel/qeventdispatcher_glib_qpa_p.h b/src/gui/guikernel/qeventdispatcher_glib_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_glib_qpa_p.h
rename to src/gui/guikernel/qeventdispatcher_glib_qpa_p.h
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/guikernel/qeventdispatcher_mac.mm
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_mac.mm
rename to src/gui/guikernel/qeventdispatcher_mac.mm
diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/guikernel/qeventdispatcher_mac_p.h
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_mac_p.h
rename to src/gui/guikernel/qeventdispatcher_mac_p.h
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/guikernel/qeventdispatcher_qpa.cpp
similarity index 99%
rename from src/gui/kernel/qeventdispatcher_qpa.cpp
rename to src/gui/guikernel/qeventdispatcher_qpa.cpp
index 26c8745954..6271804740 100644
--- a/src/gui/kernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/guikernel/qeventdispatcher_qpa.cpp
@@ -43,7 +43,7 @@
 #include "qapplication.h"
 #include "qeventdispatcher_qpa_p.h"
 #include "private/qeventdispatcher_unix_p.h"
-#include "qapplication_p.h"
+#include "private/qapplication_p.h"
 #include "qplatformeventloopintegration_qpa.h"
 
 #include <QWindowSystemInterface>
diff --git a/src/gui/kernel/qeventdispatcher_qpa_p.h b/src/gui/guikernel/qeventdispatcher_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_qpa_p.h
rename to src/gui/guikernel/qeventdispatcher_qpa_p.h
diff --git a/src/gui/kernel/qeventdispatcher_s60.cpp b/src/gui/guikernel/qeventdispatcher_s60.cpp
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_s60.cpp
rename to src/gui/guikernel/qeventdispatcher_s60.cpp
diff --git a/src/gui/kernel/qeventdispatcher_s60_p.h b/src/gui/guikernel/qeventdispatcher_s60_p.h
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_s60_p.h
rename to src/gui/guikernel/qeventdispatcher_s60_p.h
diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/guikernel/qeventdispatcher_x11.cpp
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_x11.cpp
rename to src/gui/guikernel/qeventdispatcher_x11.cpp
diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/guikernel/qeventdispatcher_x11_p.h
similarity index 100%
rename from src/gui/kernel/qeventdispatcher_x11_p.h
rename to src/gui/guikernel/qeventdispatcher_x11_p.h
diff --git a/src/gui/kernel/qgenericplugin_qpa.cpp b/src/gui/guikernel/qgenericplugin_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qgenericplugin_qpa.cpp
rename to src/gui/guikernel/qgenericplugin_qpa.cpp
diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/guikernel/qgenericplugin_qpa.h
similarity index 100%
rename from src/gui/kernel/qgenericplugin_qpa.h
rename to src/gui/guikernel/qgenericplugin_qpa.h
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.cpp b/src/gui/guikernel/qgenericpluginfactory_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qgenericpluginfactory_qpa.cpp
rename to src/gui/guikernel/qgenericpluginfactory_qpa.cpp
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/guikernel/qgenericpluginfactory_qpa.h
similarity index 100%
rename from src/gui/kernel/qgenericpluginfactory_qpa.h
rename to src/gui/guikernel/qgenericpluginfactory_qpa.h
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp
similarity index 100%
rename from src/gui/kernel/qguiapplication.cpp
rename to src/gui/guikernel/qguiapplication.cpp
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/guikernel/qguiapplication.h
similarity index 100%
rename from src/gui/kernel/qguiapplication.h
rename to src/gui/guikernel/qguiapplication.h
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/guikernel/qguiapplication_p.h
similarity index 100%
rename from src/gui/kernel/qguiapplication_p.h
rename to src/gui/guikernel/qguiapplication_p.h
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/guikernel/qguivariant.cpp
similarity index 100%
rename from src/gui/kernel/qguivariant.cpp
rename to src/gui/guikernel/qguivariant.cpp
diff --git a/src/gui/kernel/qhexstring_p.h b/src/gui/guikernel/qhexstring_p.h
similarity index 100%
rename from src/gui/kernel/qhexstring_p.h
rename to src/gui/guikernel/qhexstring_p.h
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/guikernel/qkeymapper.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper.cpp
rename to src/gui/guikernel/qkeymapper.cpp
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/guikernel/qkeymapper_mac.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_mac.cpp
rename to src/gui/guikernel/qkeymapper_mac.cpp
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/guikernel/qkeymapper_p.h
similarity index 100%
rename from src/gui/kernel/qkeymapper_p.h
rename to src/gui/guikernel/qkeymapper_p.h
diff --git a/src/gui/kernel/qkeymapper_qpa.cpp b/src/gui/guikernel/qkeymapper_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_qpa.cpp
rename to src/gui/guikernel/qkeymapper_qpa.cpp
diff --git a/src/gui/kernel/qkeymapper_s60.cpp b/src/gui/guikernel/qkeymapper_s60.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_s60.cpp
rename to src/gui/guikernel/qkeymapper_s60.cpp
diff --git a/src/gui/kernel/qkeymapper_win.cpp b/src/gui/guikernel/qkeymapper_win.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_win.cpp
rename to src/gui/guikernel/qkeymapper_win.cpp
diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/guikernel/qkeymapper_x11.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_x11.cpp
rename to src/gui/guikernel/qkeymapper_x11.cpp
diff --git a/src/gui/kernel/qkeymapper_x11_p.cpp b/src/gui/guikernel/qkeymapper_x11_p.cpp
similarity index 100%
rename from src/gui/kernel/qkeymapper_x11_p.cpp
rename to src/gui/guikernel/qkeymapper_x11_p.cpp
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/guikernel/qkeysequence.cpp
similarity index 100%
rename from src/gui/kernel/qkeysequence.cpp
rename to src/gui/guikernel/qkeysequence.cpp
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/guikernel/qkeysequence.h
similarity index 100%
rename from src/gui/kernel/qkeysequence.h
rename to src/gui/guikernel/qkeysequence.h
diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/guikernel/qkeysequence_p.h
similarity index 100%
rename from src/gui/kernel/qkeysequence_p.h
rename to src/gui/guikernel/qkeysequence_p.h
diff --git a/src/gui/kernel/qmime.cpp b/src/gui/guikernel/qmime.cpp
similarity index 100%
rename from src/gui/kernel/qmime.cpp
rename to src/gui/guikernel/qmime.cpp
diff --git a/src/gui/kernel/qmime.h b/src/gui/guikernel/qmime.h
similarity index 100%
rename from src/gui/kernel/qmime.h
rename to src/gui/guikernel/qmime.h
diff --git a/src/gui/kernel/qmime_mac.cpp b/src/gui/guikernel/qmime_mac.cpp
similarity index 100%
rename from src/gui/kernel/qmime_mac.cpp
rename to src/gui/guikernel/qmime_mac.cpp
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/guikernel/qmime_win.cpp
similarity index 100%
rename from src/gui/kernel/qmime_win.cpp
rename to src/gui/guikernel/qmime_win.cpp
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/guikernel/qmotifdnd_x11.cpp
similarity index 100%
rename from src/gui/kernel/qmotifdnd_x11.cpp
rename to src/gui/guikernel/qmotifdnd_x11.cpp
diff --git a/src/gui/kernel/qole_win.cpp b/src/gui/guikernel/qole_win.cpp
similarity index 100%
rename from src/gui/kernel/qole_win.cpp
rename to src/gui/guikernel/qole_win.cpp
diff --git a/src/gui/kernel/qplatformclipboard_qpa.cpp b/src/gui/guikernel/qplatformclipboard_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformclipboard_qpa.cpp
rename to src/gui/guikernel/qplatformclipboard_qpa.cpp
diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/guikernel/qplatformclipboard_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformclipboard_qpa.h
rename to src/gui/guikernel/qplatformclipboard_qpa.h
diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/guikernel/qplatformcursor_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformcursor_qpa.cpp
rename to src/gui/guikernel/qplatformcursor_qpa.cpp
diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/guikernel/qplatformcursor_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformcursor_qpa.h
rename to src/gui/guikernel/qplatformcursor_qpa.h
diff --git a/src/gui/kernel/qplatformeventloopintegration_qpa.cpp b/src/gui/guikernel/qplatformeventloopintegration_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformeventloopintegration_qpa.cpp
rename to src/gui/guikernel/qplatformeventloopintegration_qpa.cpp
diff --git a/src/gui/kernel/qplatformeventloopintegration_qpa.h b/src/gui/guikernel/qplatformeventloopintegration_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformeventloopintegration_qpa.h
rename to src/gui/guikernel/qplatformeventloopintegration_qpa.h
diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/guikernel/qplatformglcontext_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformglcontext_qpa.cpp
rename to src/gui/guikernel/qplatformglcontext_qpa.cpp
diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/guikernel/qplatformglcontext_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformglcontext_qpa.h
rename to src/gui/guikernel/qplatformglcontext_qpa.h
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/guikernel/qplatformintegration_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformintegration_qpa.cpp
rename to src/gui/guikernel/qplatformintegration_qpa.cpp
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/guikernel/qplatformintegration_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformintegration_qpa.h
rename to src/gui/guikernel/qplatformintegration_qpa.h
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa.cpp b/src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformintegrationfactory_qpa.cpp
rename to src/gui/guikernel/qplatformintegrationfactory_qpa.cpp
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/guikernel/qplatformintegrationfactory_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qplatformintegrationfactory_qpa_p.h
rename to src/gui/guikernel/qplatformintegrationfactory_qpa_p.h
diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.cpp b/src/gui/guikernel/qplatformintegrationplugin_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformintegrationplugin_qpa.cpp
rename to src/gui/guikernel/qplatformintegrationplugin_qpa.cpp
diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/guikernel/qplatformintegrationplugin_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformintegrationplugin_qpa.h
rename to src/gui/guikernel/qplatformintegrationplugin_qpa.h
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/guikernel/qplatformnativeinterface_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformnativeinterface_qpa.cpp
rename to src/gui/guikernel/qplatformnativeinterface_qpa.cpp
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/guikernel/qplatformnativeinterface_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformnativeinterface_qpa.h
rename to src/gui/guikernel/qplatformnativeinterface_qpa.h
diff --git a/src/gui/kernel/qplatformscreen_qpa.cpp b/src/gui/guikernel/qplatformscreen_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformscreen_qpa.cpp
rename to src/gui/guikernel/qplatformscreen_qpa.cpp
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/guikernel/qplatformscreen_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformscreen_qpa.h
rename to src/gui/guikernel/qplatformscreen_qpa.h
diff --git a/src/gui/kernel/qplatformwindow_qpa.cpp b/src/gui/guikernel/qplatformwindow_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qplatformwindow_qpa.cpp
rename to src/gui/guikernel/qplatformwindow_qpa.cpp
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/guikernel/qplatformwindow_qpa.h
similarity index 100%
rename from src/gui/kernel/qplatformwindow_qpa.h
rename to src/gui/guikernel/qplatformwindow_qpa.h
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/guikernel/qsessionmanager.h
similarity index 100%
rename from src/gui/kernel/qsessionmanager.h
rename to src/gui/guikernel/qsessionmanager.h
diff --git a/src/gui/kernel/qsessionmanager_qpa.cpp b/src/gui/guikernel/qsessionmanager_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qsessionmanager_qpa.cpp
rename to src/gui/guikernel/qsessionmanager_qpa.cpp
diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/guikernel/qshortcut.cpp
similarity index 100%
rename from src/gui/kernel/qshortcut.cpp
rename to src/gui/guikernel/qshortcut.cpp
diff --git a/src/gui/kernel/qshortcut.h b/src/gui/guikernel/qshortcut.h
similarity index 100%
rename from src/gui/kernel/qshortcut.h
rename to src/gui/guikernel/qshortcut.h
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/guikernel/qshortcutmap.cpp
similarity index 99%
rename from src/gui/kernel/qshortcutmap.cpp
rename to src/gui/guikernel/qshortcutmap.cpp
index 5e65e676d9..32b70ed758 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/guikernel/qshortcutmap.cpp
@@ -52,7 +52,7 @@
 #include "qmenu.h"
 #include "qmenubar.h"
 #include "qshortcut.h"
-#include "qapplication_p.h"
+#include "private/qapplication_p.h"
 #include <private/qaction_p.h>
 #include <private/qkeymapper_p.h>
 #include <private/qwidget_p.h>
@@ -337,7 +337,7 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e)
         ushort orgType = e->t;
         e->t = QEvent::ShortcutOverride;
         e->ignore();
-        QApplication::sendEvent(o, e);
+        QCoreApplication::sendEvent(o, e);
         e->t = orgType;
         e->spont = wasSpontaneous;
         if (e->isAccepted()) {
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/guikernel/qshortcutmap_p.h
similarity index 100%
rename from src/gui/kernel/qshortcutmap_p.h
rename to src/gui/guikernel/qshortcutmap_p.h
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/guikernel/qwindow.cpp
similarity index 99%
rename from src/gui/kernel/qwindow.cpp
rename to src/gui/guikernel/qwindow.cpp
index 92b62e9276..7b57a949f0 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/guikernel/qwindow.cpp
@@ -47,7 +47,7 @@
 #include "qwindowcontext_qpa.h"
 
 #include "qwindow_p.h"
-#include "qapplication_p.h"
+#include "qguiapplication_p.h"
 
 #include <QtCore/QDebug>
 
diff --git a/src/gui/kernel/qwindow.h b/src/gui/guikernel/qwindow.h
similarity index 100%
rename from src/gui/kernel/qwindow.h
rename to src/gui/guikernel/qwindow.h
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/guikernel/qwindow_p.h
similarity index 100%
rename from src/gui/kernel/qwindow_p.h
rename to src/gui/guikernel/qwindow_p.h
diff --git a/src/gui/kernel/qwindowcontext_qpa.cpp b/src/gui/guikernel/qwindowcontext_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qwindowcontext_qpa.cpp
rename to src/gui/guikernel/qwindowcontext_qpa.cpp
diff --git a/src/gui/kernel/qwindowcontext_qpa.h b/src/gui/guikernel/qwindowcontext_qpa.h
similarity index 100%
rename from src/gui/kernel/qwindowcontext_qpa.h
rename to src/gui/guikernel/qwindowcontext_qpa.h
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/guikernel/qwindowdefs.h
similarity index 100%
rename from src/gui/kernel/qwindowdefs.h
rename to src/gui/guikernel/qwindowdefs.h
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/guikernel/qwindowdefs_win.h
similarity index 100%
rename from src/gui/kernel/qwindowdefs_win.h
rename to src/gui/guikernel/qwindowdefs_win.h
diff --git a/src/gui/kernel/qwindowformat_qpa.cpp b/src/gui/guikernel/qwindowformat_qpa.cpp
similarity index 100%
rename from src/gui/kernel/qwindowformat_qpa.cpp
rename to src/gui/guikernel/qwindowformat_qpa.cpp
diff --git a/src/gui/kernel/qwindowformat_qpa.h b/src/gui/guikernel/qwindowformat_qpa.h
similarity index 100%
rename from src/gui/kernel/qwindowformat_qpa.h
rename to src/gui/guikernel/qwindowformat_qpa.h
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.cpp b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
similarity index 99%
rename from src/gui/kernel/qwindowsysteminterface_qpa.cpp
rename to src/gui/guikernel/qwindowsysteminterface_qpa.cpp
index fd143c3ab8..5fd7d76003 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include "qwindowsysteminterface_qpa.h"
 #include "qwindowsysteminterface_qpa_p.h"
-#include "qapplication_p.h"
+#include "private/qapplication_p.h"
 #include <QAbstractEventDispatcher>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/guikernel/qwindowsysteminterface_qpa.h
similarity index 100%
rename from src/gui/kernel/qwindowsysteminterface_qpa.h
rename to src/gui/guikernel/qwindowsysteminterface_qpa.h
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa_p.h b/src/gui/guikernel/qwindowsysteminterface_qpa_p.h
similarity index 100%
rename from src/gui/kernel/qwindowsysteminterface_qpa_p.h
rename to src/gui/guikernel/qwindowsysteminterface_qpa_p.h
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 09ef146597..c2559b1225 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -11,25 +11,15 @@ HEADERS += \
 	kernel/qactiongroup.h \
 	kernel/qapplication.h \
 	kernel/qapplication_p.h \
+        kernel/qbackingstore_p.h \
 	kernel/qboxlayout.h \
-	kernel/qclipboard.h \
-	kernel/qcursor.h \
 	kernel/qdesktopwidget.h \
-	kernel/qdrag.h \
-	kernel/qdnd_p.h \
-	kernel/qevent.h \
-	kernel/qevent_p.h \
 	kernel/qformlayout.h \
 	kernel/qgridlayout.h \
-	kernel/qkeysequence.h \
 	kernel/qlayout.h \
 	kernel/qlayout_p.h \
 	kernel/qlayoutengine_p.h \
 	kernel/qlayoutitem.h \
-	kernel/qmime.h \
-	kernel/qsessionmanager.h \
-	kernel/qshortcut.h \
-	kernel/qshortcutmap_p.h \
 	kernel/qsizepolicy.h \
 	kernel/qpalette.h \
 	kernel/qstackedlayout.h \
@@ -39,8 +29,6 @@ HEADERS += \
     kernel/qwidget_p.h \
 	kernel/qwidgetaction.h \
 	kernel/qwidgetaction_p.h \
-	kernel/qwindowdefs.h \
-	kernel/qkeymapper_p.h \
 	kernel/qgesture.h \
 	kernel/qgesture_p.h \
 	kernel/qstandardgestures_p.h \
@@ -48,36 +36,25 @@ HEADERS += \
 	kernel/qgesturemanager_p.h \
 	kernel/qsoftkeymanager_p.h \
     kernel/qsoftkeymanager_common_p.h \
-	kernel/qguiplatformplugin_p.h \
-        kernel/qhexstring_p.h
+        kernel/qguiplatformplugin_p.h
 
 SOURCES += \
 	kernel/qaction.cpp \
 	kernel/qactiongroup.cpp \
 	kernel/qapplication.cpp \
-	kernel/qboxlayout.cpp \
-	kernel/qclipboard.cpp \
-	kernel/qcursor.cpp \
-	kernel/qdrag.cpp \
-	kernel/qdnd.cpp \
-	kernel/qevent.cpp \
+        kernel/qbackingstore.cpp \
+        kernel/qboxlayout.cpp \
 	kernel/qformlayout.cpp \
 	kernel/qgridlayout.cpp \
-	kernel/qkeysequence.cpp \
 	kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
 	kernel/qlayoutitem.cpp \
-        kernel/qmime.cpp \
         kernel/qpalette.cpp \
-	kernel/qshortcut.cpp \
-	kernel/qshortcutmap.cpp \
 	kernel/qstackedlayout.cpp \
 	kernel/qtooltip.cpp \
-	kernel/qguivariant.cpp \
 	kernel/qwhatsthis.cpp \
 	kernel/qwidget.cpp \
 	kernel/qwidgetaction.cpp \
-	kernel/qkeymapper.cpp \
 	kernel/qgesture.cpp \
 	kernel/qstandardgestures.cpp \
 	kernel/qgesturerecognizer.cpp \
@@ -184,68 +161,15 @@ unix:x11 {
 }
 
 qpa {
-	HEADERS += \
-                kernel/qgenericpluginfactory_qpa.h \
-                kernel/qgenericplugin_qpa.h \
-                kernel/qeventdispatcher_qpa_p.h \
-                kernel/qwindowsysteminterface_qpa.h \
-                kernel/qwindowsysteminterface_qpa_p.h \
-                kernel/qplatformintegration_qpa.h \
-                kernel/qplatformscreen_qpa.h \
-                kernel/qplatformintegrationfactory_qpa_p.h \
-                kernel/qplatformintegrationplugin_qpa.h \
-                kernel/qplatformwindow_qpa.h \
-                kernel/qplatformglcontext_qpa.h \
-                kernel/qwindowcontext_qpa.h \
+        HEADERS += \
                 kernel/qdesktopwidget_qpa_p.h \
-                kernel/qplatformeventloopintegration_qpa.h \
-                kernel/qplatformcursor_qpa.h \
-                kernel/qplatformclipboard_qpa.h \
-                kernel/qplatformnativeinterface_qpa.h \
-                kernel/qwindowformat_qpa.h \
-                kernel/qguiapplication.h \
-                kernel/qguiapplication_p.h \
                 kernel/qwidgetwindow_qpa_p.h \
-                kernel/qwindow_p.h \
-                kernel/qwindow.h
 
-	SOURCES += \
+        SOURCES += \
                 kernel/qapplication_qpa.cpp \
-                kernel/qclipboard_qpa.cpp \
-                kernel/qcursor_qpa.cpp \
-                kernel/qdnd_qpa.cpp \
                 kernel/qdesktopwidget_qpa.cpp \
-                kernel/qgenericpluginfactory_qpa.cpp \
-                kernel/qgenericplugin_qpa.cpp \
-                kernel/qkeymapper_qpa.cpp \
                 kernel/qwidget_qpa.cpp \
-                kernel/qeventdispatcher_qpa.cpp \
-                kernel/qwindowsysteminterface_qpa.cpp \
-                kernel/qplatformintegration_qpa.cpp \
-                kernel/qplatformscreen_qpa.cpp \
-                kernel/qplatformintegrationfactory_qpa.cpp \
-                kernel/qplatformintegrationplugin_qpa.cpp \
-                kernel/qplatformwindow_qpa.cpp \
-                kernel/qplatformeventloopintegration_qpa.cpp \
-                kernel/qplatformglcontext_qpa.cpp \
-                kernel/qwindowcontext_qpa.cpp \
-                kernel/qplatformcursor_qpa.cpp \
-                kernel/qplatformclipboard_qpa.cpp \
-                kernel/qplatformnativeinterface_qpa.cpp \
-                kernel/qsessionmanager_qpa.cpp \
-                kernel/qwindowformat_qpa.cpp \
-                kernel/qguiapplication.cpp \
                 kernel/qwidgetwindow_qpa.cpp \
-                kernel/qwindow.cpp
-
-        contains(QT_CONFIG, glib) {
-            SOURCES += \
-		kernel/qeventdispatcher_glib_qpa.cpp
-            HEADERS += \
-                kernel/qeventdispatcher_glib_qpa_p.h
-            QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-            LIBS_PRIVATE +=$$QT_LIBS_GLIB
-	}
 }
 
 !qpa:!x11:mac {
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 08a6f540a8..d489aaf6bd 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -61,7 +61,7 @@
 #include "qtranslator.h"
 #include "qvariant.h"
 #include "qwidget.h"
-#include "qdnd_p.h"
+#include "private/qdnd_p.h"
 #include "qcolormap.h"
 #include "qdebug.h"
 #include "private/qstylesheetstyle_p.h"
@@ -70,7 +70,7 @@
 #include <QtGui/qgraphicsproxywidget.h>
 
 #include "qinputcontext.h"
-#include "qkeymapper_p.h"
+#include "private/qkeymapper_p.h"
 
 #ifdef Q_WS_X11
 #include <private/qt_x11_p.h>
@@ -94,7 +94,7 @@
 #endif
 
 #include "qapplication_p.h"
-#include "qevent_p.h"
+#include "private/qevent_p.h"
 #include "qwidget_p.h"
 
 #include "qapplication.h"
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index acad22d4a9..41d05f5978 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -74,7 +74,7 @@
 #endif
 #ifdef Q_WS_QPA
 #include <QWindowSystemInterface>
-#include "qwindowsysteminterface_qpa_p.h"
+#include "private/qwindowsysteminterface_qpa_p.h"
 #include "QtGui/qplatformintegration_qpa.h"
 #include "QtGui/private/qguiapplication_p.h"
 #endif
diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index 1996bdaa13..30ae8cf3f1 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -43,9 +43,9 @@
 #include "qcolormap.h"
 #include "qpixmapcache.h"
 #if !defined(QT_NO_GLIB)
-#include "qeventdispatcher_glib_qpa_p.h"
+#include "private/qeventdispatcher_glib_qpa_p.h"
 #endif
-#include "qeventdispatcher_qpa_p.h"
+#include "private/qeventdispatcher_qpa_p.h"
 #ifndef QT_NO_CURSOR
 #include "private/qcursor_p.h"
 #endif
@@ -54,14 +54,14 @@
 #include "private/qevent_p.h"
 
 #include "qgenericpluginfactory_qpa.h"
-#include "qplatformintegrationfactory_qpa_p.h"
+#include "private/qplatformintegrationfactory_qpa_p.h"
 #include <qdesktopwidget.h>
 
 #include <qinputcontext.h>
 #include <QPlatformCursor>
 #include <qdebug.h>
 #include <QWindowSystemInterface>
-#include "qwindowsysteminterface_qpa_p.h"
+#include "private/qwindowsysteminterface_qpa_p.h"
 #include <QPlatformIntegration>
 
 #include "qdesktopwidget_qpa_p.h"
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/kernel/qbackingstore.cpp
similarity index 100%
rename from src/gui/painting/qbackingstore.cpp
rename to src/gui/kernel/qbackingstore.cpp
diff --git a/src/gui/painting/qbackingstore_p.h b/src/gui/kernel/qbackingstore_p.h
similarity index 100%
rename from src/gui/painting/qbackingstore_p.h
rename to src/gui/kernel/qbackingstore_p.h
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index a05c99a610..c311739a72 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -140,11 +140,6 @@ unix:!mac:!symbian|qpa {
                 painting/qprinterinfo_unix.cpp
 }
 
-win32|x11|mac|qpa|symbian {
-        SOURCES += painting/qbackingstore.cpp
-        HEADERS += painting/qbackingstore_p.h
-}
-
 qpa {
         SOURCES += \
                 painting/qcolormap_qpa.cpp \