diff --git a/reactos/subsystems/win32/CMakeLists.txt b/reactos/subsystems/win32/CMakeLists.txt
index f7e923f7976..5c1ee84174d 100644
--- a/reactos/subsystems/win32/CMakeLists.txt
+++ b/reactos/subsystems/win32/CMakeLists.txt
@@ -1,3 +1,2 @@
 
 add_subdirectory(csrss)
-add_subdirectory(win32k)
diff --git a/reactos/subsystems/win32/win32k/CMakeLists.txt b/reactos/subsystems/win32/win32k/CMakeLists.txt
deleted file mode 100644
index 59f6b076a64..00000000000
--- a/reactos/subsystems/win32/win32k/CMakeLists.txt
+++ /dev/null
@@ -1,226 +0,0 @@
-
-set (USE_DIBLIB FALSE)
-
-spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
-
-include_directories(
-    .
-    include
-    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
-    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
-
-add_definitions(
-    -DLANGPACK
-    -D_WIN32K_)
-
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dib)
-
-list(APPEND GENDIB_FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib8gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib16gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/dib/dib32gen.c)
-
-add_custom_command(
-    OUTPUT ${GENDIB_FILES}
-    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/dib
-    DEPENDS native-gendib)
-
-list(APPEND SOURCE
-    dib/alphablend.c
-    dib/dib1bpp.c
-    dib/dib4bpp.c
-    dib/dib8bpp.c
-    dib/dib16bpp.c
-    dib/dib24bpp.c
-    dib/dib32bpp.c
-    dib/floodfill.c
-    dib/stretchblt.c
-    eng/alphablend.c
-    eng/bitblt.c
-    eng/engbrush.c
-    eng/engevent.c
-    eng/clip.c
-    eng/debug.c
-    #eng/drvdbg.c
-    eng/device.c
-    eng/driverobj.c
-    eng/error.c
-    eng/float.c
-    eng/gradient.c
-    eng/lineto.c
-    eng/ldevobj.c
-    eng/mapping.c
-    eng/mem.c
-    eng/engmisc.c
-    eng/mouse.c
-    eng/paint.c
-    eng/pdevobj.c
-    eng/perfcnt.c
-    eng/rlecomp.c
-    eng/semaphor.c
-    eng/sort.c
-    eng/string.c
-    eng/stretchblt.c
-    eng/surface.c
-    eng/transblt.c
-    eng/engwindow.c
-    eng/xlate.c
-    main/dllmain.c
-    misc/driver.c
-    misc/file.c
-    misc/math.c
-    misc/rtlstr.c
-    misc/copy.c
-    misc/registry.c
-    misc/usrheap.c
-    ntddraw/ddraw.c
-    ntddraw/dd.c
-    ntddraw/ddsurf.c
-    ntddraw/d3d.c
-    ntddraw/dvp.c
-    ntddraw/mocomp.c
-    ntddraw/eng.c
-    ntddraw/dxeng.c
-    ntuser/accelerator.c
-    ntuser/callback.c
-    ntuser/callproc.c
-    ntuser/caret.c
-    ntuser/class.c
-    ntuser/clipboard.c
-    ntuser/csr.c
-    ntuser/cursoricon.c
-    ntuser/defwnd.c
-    ntuser/desktop.c
-    ntuser/display.c
-    ntuser/event.c
-    ntuser/focus.c
-    ntuser/guicheck.c
-    ntuser/hook.c
-    ntuser/hotkey.c
-    ntuser/input.c
-    ntuser/keyboard.c
-    ntuser/kbdlayout.c
-    ntuser/menu.c
-    ntuser/message.c
-    ntuser/metric.c
-    ntuser/misc.c
-    ntuser/monitor.c
-    ntuser/mouse.c
-    ntuser/msgqueue.c
-    ntuser/ntstubs.c
-    ntuser/ntuser.c
-    ntuser/painting.c
-    ntuser/prop.c
-    ntuser/scrollbar.c
-    ntuser/session.c
-    ntuser/simplecall.c
-    ntuser/sysparams.c
-    ntuser/timer.c
-    ntuser/useratom.c
-    ntuser/vis.c
-    ntuser/windc.c
-    ntuser/window.c
-    ntuser/winpos.c
-    ntuser/winsta.c
-    ntuser/object.c
-    objects/arc.c
-    objects/bezier.c
-    objects/bitblt.c
-    objects/bitmaps.c
-    objects/brush.c
-    objects/cliprgn.c
-    objects/coord.c
-    objects/dcattr.c
-    objects/dclife.c
-    objects/dcobjs.c
-    objects/dcstate.c
-    objects/dcutil.c
-    objects/device.c
-    objects/dibobj.c
-    objects/drawing.c
-    objects/fillshap.c
-    objects/font.c
-    objects/freetype.c
-    objects/gdibatch.c
-    objects/gdidbg.c
-    objects/gdiobj.c
-    objects/gdipool.c
-    objects/icm.c
-    objects/line.c
-    objects/metafile.c
-    objects/palette.c
-    objects/path.c
-    objects/pen.c
-    objects/polyfill.c
-    objects/print.c
-    objects/rect.c
-    objects/region.c
-    objects/stockobj.c
-    objects/text.c
-    objects/wingl.c
-    objects/xformobj.c
-    stubs/stubs.c
-    stubs/umpdstubs.c
-    win32k.rc)
-
-if (USE_DIBLIB)
-    add_definitions(
-        -D_USE_DIBLIB_)
-    list(APPEND SOURCE
-        dib/dib_new.c
-        eng/bitblt_new.c)
-else()
-    list(APPEND SOURCE
-        dib/dib.c
-        eng/copybits.c
-         ${GENDIB_FILES})
-endif()
-
-if(ARCH MATCHES i386)
-list(APPEND SOURCE
-    dib/i386/dib24bpp_hline.s
-    dib/i386/dib32bpp_hline.s
-    dib/i386/dib32bpp_colorfill.s
-    eng/i386/floatobj.S
-    misc/i386/cos_asm.s
-    misc/i386/sin_asm.s
-    misc/i386/atan2_asm.s
-    misc/i386/floor_asm.s
-    misc/i386/ceil_asm.s)
-else()
-list(APPEND SOURCE
-    dib/dib24bppc.c
-    dib/dib32bppc.c)
-endif()
-
-add_library(win32k SHARED
-    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
-    ${SOURCE})
-
-set_module_type(win32k kernelmodedriver)
-
-target_link_libraries(win32k
-    ${PSEH_LIB}
-    dxguid
-    libcntpr)
-
-if (USE_DIBLIB)
-    target_link_libraries(win32k
-        diblib)
-endif()
-
-add_importlibs(win32k ntoskrnl hal ftfd)
-add_pch(win32k pch.h)
-add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
-
-
-add_library(win32ksys sys-stubs.S)
-set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
-
-if (USE_DIBLIB)
-    add_subdirectory(diblib)
-endif()
-
-
diff --git a/reactos/subsystems/win32/win32k/include/win32kp.h b/reactos/subsystems/win32/win32k/include/win32kp.h
deleted file mode 100644
index 06791dc7b34..00000000000
--- a/reactos/subsystems/win32/win32k/include/win32kp.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Graphics Subsystem
- * FILE:            subsys/win32k/include/win32k.h
- * PURPOSE:         Internal Win32K Header
- * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
- */
-
-/* INCLUDES ******************************************************************/
-
-#pragma once
-
-#if 0
-#ifndef _MSC_VER
-#define PLACE_IN_SECTION(s) __attribute__((section(s)))
-#define INIT_FUNCTION PLACE_IN_SECTION("INIT")
-#else
-#define INIT_FUNCTION
-#endif
-#else
-#define INIT_FUNCTION
-#endif
-
-/* Enable debugging features */
-#define GDI_DEBUG 0
-#define DBG_ENABLE_EVENT_LOGGING 0
-#define DBG_ENABLE_SERVICE_HOOKS 0
-
-/* Misc headers  */
-#include <include/win32kdebug.h>
-#include <include/mmcopy.h>
-#include <include/tags.h>
-#include <include/rect.h>
-#include <include/misc.h>
-
-/* Internal NtGdi Headers */
-typedef struct _DC *PDC;
-#include <include/gdiobj.h>
-#include <include/surface.h>
-#include <include/pdevobj.h>
-#include <include/ldevobj.h>
-#include <include/xformobj.h>
-#include <include/bitmaps.h>
-#include <include/engobjects.h>
-#include <include/eng.h>
-#include <include/brush.h>
-#include <include/color.h>
-#include <include/driverobj.h>
-#include <include/palette.h>
-#include <include/region.h>
-#include <include/dc.h>
-#include <include/dib.h>
-#include <include/xlateobj.h>
-#include <include/cliprgn.h>
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/intddraw.h>
-#include <include/paint.h>
-#include <include/text.h>
-#include <include/engevent.h>
-#include <include/device.h>
-#include <include/pen.h>
-#include <include/cliprgn.h>
-#include <include/coord.h>
-#include <include/gdifloat.h>
-#include <include/path.h>
-#include <include/floatobj.h>
-#include <dib/dib.h>
-#include <include/mouse.h>
-
-/* Internal NtUser Headers */
-typedef struct _DESKTOP *PDESKTOP;
-#include <include/win32.h>
-#include <include/object.h>
-#include <include/ntuser.h>
-#include <include/cursoricon.h>
-#include <include/accelerator.h>
-#include <include/hook.h>
-#include <include/clipboard.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/desktop.h>
-#include <include/dce.h>
-#include <include/focus.h>
-#include <include/hotkey.h>
-#include <include/input.h>
-#include <include/menu.h>
-#include <include/monitor.h>
-#include <include/timer.h>
-#include <include/caret.h>
-#include <include/painting.h>
-#include <include/class.h>
-#include <include/window.h>
-#include <include/sysparams.h>
-#include <include/prop.h>
-#include <include/guicheck.h>
-#include <include/useratom.h>
-#include <include/vis.h>
-#include <include/userfuncs.h>
-#include <include/scroll.h>
-#include <include/csr.h>
-#include <include/winpos.h>
-#include <include/callback.h>
-
-#include <include/gdidebug.h>
diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index dff1d87bf86..26b6b6697c8 100644
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -1,6 +1,222 @@
 
+set(USE_DIBLIB FALSE)
+
 add_subdirectory(drivers)
+add_subdirectory(gdi/diblib)
 add_subdirectory(gdi/gdi32)
 add_subdirectory(reactx)
 add_subdirectory(user/user32)
 add_subdirectory(user/win32csr)
+
+spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
+
+include_directories(
+    .
+    include
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_definitions(
+    -DLANGPACK
+    -D_WIN32K_)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib)
+
+list(APPEND GENDIB_FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c)
+
+add_custom_command(
+    OUTPUT ${GENDIB_FILES}
+    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib
+    DEPENDS native-gendib)
+
+list(APPEND SOURCE
+    gdi/dib/alphablend.c
+    gdi/dib/dib1bpp.c
+    gdi/dib/dib4bpp.c
+    gdi/dib/dib8bpp.c
+    gdi/dib/dib16bpp.c
+    gdi/dib/dib24bpp.c
+    gdi/dib/dib32bpp.c
+    gdi/dib/floodfill.c
+    gdi/dib/stretchblt.c
+    gdi/eng/alphablend.c
+    gdi/eng/bitblt.c
+    gdi/eng/engbrush.c
+    gdi/eng/engevent.c
+    gdi/eng/clip.c
+    gdi/eng/debug.c
+    gdi/eng/device.c
+    gdi/eng/driverobj.c
+    gdi/eng/error.c
+    gdi/eng/float.c
+    gdi/eng/gradient.c
+    gdi/eng/lineto.c
+    gdi/eng/ldevobj.c
+    gdi/eng/mapping.c
+    gdi/eng/mem.c
+    gdi/eng/engmisc.c
+    gdi/eng/mouse.c
+    gdi/eng/paint.c
+    gdi/eng/pdevobj.c
+    gdi/eng/perfcnt.c
+    gdi/eng/rlecomp.c
+    gdi/eng/semaphor.c
+    gdi/eng/sort.c
+    gdi/eng/string.c
+    gdi/eng/stretchblt.c
+    gdi/eng/surface.c
+    gdi/eng/transblt.c
+    gdi/eng/engwindow.c
+    gdi/eng/xlate.c
+    user/ntuser/main.c
+    user/ntuser/misc/file.c
+    user/ntuser/misc/math.c
+    user/ntuser/misc/rtlstr.c
+    user/ntuser/misc/copy.c
+    user/ntuser/misc/registry.c
+    user/ntuser/misc/usrheap.c
+    reactx/ntddraw/ddraw.c
+    reactx/ntddraw/dd.c
+    reactx/ntddraw/ddsurf.c
+    reactx/ntddraw/d3d.c
+    reactx/ntddraw/dvp.c
+    reactx/ntddraw/mocomp.c
+    reactx/ntddraw/eng.c
+    reactx/ntddraw/dxeng.c
+    user/ntuser/accelerator.c
+    user/ntuser/callback.c
+    user/ntuser/callproc.c
+    user/ntuser/caret.c
+    user/ntuser/class.c
+    user/ntuser/clipboard.c
+    user/ntuser/csr.c
+    user/ntuser/cursoricon.c
+    user/ntuser/defwnd.c
+    user/ntuser/desktop.c
+    user/ntuser/display.c
+    user/ntuser/event.c
+    user/ntuser/focus.c
+    user/ntuser/guicheck.c
+    user/ntuser/hook.c
+    user/ntuser/hotkey.c
+    user/ntuser/input.c
+    user/ntuser/keyboard.c
+    user/ntuser/kbdlayout.c
+    user/ntuser/menu.c
+    user/ntuser/message.c
+    user/ntuser/metric.c
+    user/ntuser/misc.c
+    user/ntuser/monitor.c
+    user/ntuser/mouse.c
+    user/ntuser/msgqueue.c
+    user/ntuser/ntstubs.c
+    user/ntuser/ntuser.c
+    user/ntuser/painting.c
+    user/ntuser/prop.c
+    user/ntuser/scrollbar.c
+    user/ntuser/session.c
+    user/ntuser/simplecall.c
+    user/ntuser/sysparams.c
+    user/ntuser/timer.c
+    user/ntuser/useratom.c
+    user/ntuser/vis.c
+    user/ntuser/windc.c
+    user/ntuser/window.c
+    user/ntuser/winpos.c
+    user/ntuser/winsta.c
+    user/ntuser/object.c
+    gdi/ntgdi/arc.c
+    gdi/ntgdi/bezier.c
+    gdi/ntgdi/bitblt.c
+    gdi/ntgdi/bitmaps.c
+    gdi/ntgdi/brush.c
+    gdi/ntgdi/cliprgn.c
+    gdi/ntgdi/coord.c
+    gdi/ntgdi/dcattr.c
+    gdi/ntgdi/dclife.c
+    gdi/ntgdi/dcobjs.c
+    gdi/ntgdi/dcstate.c
+    gdi/ntgdi/dcutil.c
+    gdi/ntgdi/device.c
+    gdi/ntgdi/dibobj.c
+    gdi/ntgdi/drawing.c
+    gdi/ntgdi/fillshap.c
+    gdi/ntgdi/font.c
+    gdi/ntgdi/freetype.c
+    gdi/ntgdi/gdibatch.c
+    gdi/ntgdi/gdidbg.c
+    gdi/ntgdi/gdiobj.c
+    gdi/ntgdi/gdipool.c
+    gdi/ntgdi/icm.c
+    gdi/ntgdi/line.c
+    gdi/ntgdi/metafile.c
+    gdi/ntgdi/palette.c
+    gdi/ntgdi/path.c
+    gdi/ntgdi/pen.c
+    gdi/ntgdi/polyfill.c
+    gdi/ntgdi/print.c
+    gdi/ntgdi/rect.c
+    gdi/ntgdi/region.c
+    gdi/ntgdi/stockobj.c
+    gdi/ntgdi/text.c
+    gdi/ntgdi/wingl.c
+    gdi/ntgdi/xformobj.c
+    gdi/eng/stubs.c
+    gdi/eng/umpdstubs.c
+    win32k.rc)
+
+if(USE_DIBLIB)
+    add_definitions(-D_USE_DIBLIB_)
+    list(APPEND SOURCE
+        gdi/dib/dib_new.c
+        gdi/eng/bitblt_new.c)
+else()
+    list(APPEND SOURCE
+        gdi/dib/dib.c
+        gdi/eng/copybits.c
+        ${GENDIB_FILES})
+endif()
+
+if(ARCH MATCHES i386)
+list(APPEND SOURCE
+    gdi/dib/i386/dib24bpp_hline.s
+    gdi/dib/i386/dib32bpp_hline.s
+    gdi/dib/i386/dib32bpp_colorfill.s
+    gdi/eng/i386/floatobj.S
+    user/ntuser/misc/i386/cos_asm.s
+    user/ntuser/misc/i386/sin_asm.s
+    user/ntuser/misc/i386/atan2_asm.s
+    user/ntuser/misc/i386/floor_asm.s
+    user/ntuser/misc/i386/ceil_asm.s)
+else()
+list(APPEND SOURCE
+    gdi/dib/dib24bppc.c
+    gdi/dib/dib32bppc.c)
+endif()
+
+add_library(win32k SHARED
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def
+    ${SOURCE})
+
+set_module_type(win32k kernelmodedriver)
+
+target_link_libraries(win32k
+    ${PSEH_LIB}
+    dxguid
+    libcntpr)
+
+if(USE_DIBLIB)
+    target_link_libraries(win32k diblib)
+endif()
+
+add_importlibs(win32k ntoskrnl hal ftfd)
+add_pch(win32k pch.h)
+add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
+
+add_library(win32ksys sys-stubs.S)
+set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
diff --git a/reactos/win32ss/drivers/videoprt/event.c b/reactos/win32ss/drivers/videoprt/event.c
index c4359755cbd..7f14c46ad67 100644
--- a/reactos/win32ss/drivers/videoprt/event.c
+++ b/reactos/win32ss/drivers/videoprt/event.c
@@ -9,7 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "videoprt.h"
-#include "../../subsystems/win32/win32k/include/engevent.h"
+#include "../../gdi/eng/engevent.h"
 
 /* PUBLIC FUNCTIONS ***********************************************************/
 
diff --git a/reactos/subsystems/win32/win32k/dib/alphablend.c b/reactos/win32ss/gdi/dib/alphablend.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/alphablend.c
rename to reactos/win32ss/gdi/dib/alphablend.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib.c b/reactos/win32ss/gdi/dib/dib.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib.c
rename to reactos/win32ss/gdi/dib/dib.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib.h b/reactos/win32ss/gdi/dib/dib.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib.h
rename to reactos/win32ss/gdi/dib/dib.h
diff --git a/reactos/subsystems/win32/win32k/dib/dib16bpp.c b/reactos/win32ss/gdi/dib/dib16bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib16bpp.c
rename to reactos/win32ss/gdi/dib/dib16bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib1bpp.c b/reactos/win32ss/gdi/dib/dib1bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib1bpp.c
rename to reactos/win32ss/gdi/dib/dib1bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib24bpp.c b/reactos/win32ss/gdi/dib/dib24bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib24bpp.c
rename to reactos/win32ss/gdi/dib/dib24bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib24bppc.c b/reactos/win32ss/gdi/dib/dib24bppc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib24bppc.c
rename to reactos/win32ss/gdi/dib/dib24bppc.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib32bpp.c b/reactos/win32ss/gdi/dib/dib32bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib32bpp.c
rename to reactos/win32ss/gdi/dib/dib32bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib32bppc.c b/reactos/win32ss/gdi/dib/dib32bppc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib32bppc.c
rename to reactos/win32ss/gdi/dib/dib32bppc.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib4bpp.c b/reactos/win32ss/gdi/dib/dib4bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib4bpp.c
rename to reactos/win32ss/gdi/dib/dib4bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib8bpp.c b/reactos/win32ss/gdi/dib/dib8bpp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib8bpp.c
rename to reactos/win32ss/gdi/dib/dib8bpp.c
diff --git a/reactos/subsystems/win32/win32k/dib/dib_new.c b/reactos/win32ss/gdi/dib/dib_new.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/dib_new.c
rename to reactos/win32ss/gdi/dib/dib_new.c
diff --git a/reactos/subsystems/win32/win32k/dib/floodfill.c b/reactos/win32ss/gdi/dib/floodfill.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/floodfill.c
rename to reactos/win32ss/gdi/dib/floodfill.c
diff --git a/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s
rename to reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
diff --git a/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s
rename to reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
diff --git a/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s
rename to reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
diff --git a/reactos/subsystems/win32/win32k/dib/stretchblt.c b/reactos/win32ss/gdi/dib/stretchblt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/dib/stretchblt.c
rename to reactos/win32ss/gdi/dib/stretchblt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt.c b/reactos/win32ss/gdi/diblib/BitBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt.c
rename to reactos/win32ss/gdi/diblib/BitBlt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_DSTINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_DSTINVERT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_DSTINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_DSTINVERT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGECOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_MERGECOPY.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_MERGECOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_MERGECOPY.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_MERGEPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_MERGEPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTPATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_NOTPATCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_NOTSRCERASE.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_PATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_PATCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_PATINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_PATINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_PATPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_PATPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCAND.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_SRCAND.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_SRCCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_SRCERASE.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_SRCINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_SRCPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_SRCPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
diff --git a/reactos/subsystems/win32/win32k/diblib/BitBlt_other.c b/reactos/win32ss/gdi/diblib/BitBlt_other.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/BitBlt_other.c
rename to reactos/win32ss/gdi/diblib/BitBlt_other.c
diff --git a/reactos/subsystems/win32/win32k/diblib/CMakeLists.txt b/reactos/win32ss/gdi/diblib/CMakeLists.txt
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/CMakeLists.txt
rename to reactos/win32ss/gdi/diblib/CMakeLists.txt
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib.c b/reactos/win32ss/gdi/diblib/DibLib.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib.c
rename to reactos/win32ss/gdi/diblib/DibLib.c
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib.h b/reactos/win32ss/gdi/diblib/DibLib.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib.h
rename to reactos/win32ss/gdi/diblib/DibLib.h
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib_AllDstBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib_AllDstBPP.h
rename to reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib_AllSrcBPP.h
rename to reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h b/reactos/win32ss/gdi/diblib/DibLib_BitBlt.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib_BitBlt.h
rename to reactos/win32ss/gdi/diblib/DibLib_BitBlt.h
diff --git a/reactos/subsystems/win32/win32k/diblib/DibLib_interface.h b/reactos/win32ss/gdi/diblib/DibLib_interface.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/DibLib_interface.h
rename to reactos/win32ss/gdi/diblib/DibLib_interface.h
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskBlt.c b/reactos/win32ss/gdi/diblib/MaskBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskBlt.c
rename to reactos/win32ss/gdi/diblib/MaskBlt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskCopy.c b/reactos/win32ss/gdi/diblib/MaskCopy.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskCopy.c
rename to reactos/win32ss/gdi/diblib/MaskCopy.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskPaint.c b/reactos/win32ss/gdi/diblib/MaskPaint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskPaint.c
rename to reactos/win32ss/gdi/diblib/MaskPaint.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskPatBlt.c b/reactos/win32ss/gdi/diblib/MaskPatBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskPatBlt.c
rename to reactos/win32ss/gdi/diblib/MaskPatBlt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskPatPaint.c b/reactos/win32ss/gdi/diblib/MaskPatPaint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskPatPaint.c
rename to reactos/win32ss/gdi/diblib/MaskPatPaint.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskSrcBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskSrcBlt.c
rename to reactos/win32ss/gdi/diblib/MaskSrcBlt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskSrcPaint.c b/reactos/win32ss/gdi/diblib/MaskSrcPaint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskSrcPaint.c
rename to reactos/win32ss/gdi/diblib/MaskSrcPaint.c
diff --git a/reactos/subsystems/win32/win32k/diblib/MaskSrcPatBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/MaskSrcPatBlt.c
rename to reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
diff --git a/reactos/subsystems/win32/win32k/diblib/PatPaint.c b/reactos/win32ss/gdi/diblib/PatPaint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/PatPaint.c
rename to reactos/win32ss/gdi/diblib/PatPaint.c
diff --git a/reactos/subsystems/win32/win32k/diblib/RopFunctions.c b/reactos/win32ss/gdi/diblib/RopFunctions.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/RopFunctions.c
rename to reactos/win32ss/gdi/diblib/RopFunctions.c
diff --git a/reactos/subsystems/win32/win32k/diblib/RopFunctions.h b/reactos/win32ss/gdi/diblib/RopFunctions.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/RopFunctions.h
rename to reactos/win32ss/gdi/diblib/RopFunctions.h
diff --git a/reactos/subsystems/win32/win32k/diblib/SrcPaint.c b/reactos/win32ss/gdi/diblib/SrcPaint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/SrcPaint.c
rename to reactos/win32ss/gdi/diblib/SrcPaint.c
diff --git a/reactos/subsystems/win32/win32k/diblib/SrcPatBlt.c b/reactos/win32ss/gdi/diblib/SrcPatBlt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/diblib/SrcPatBlt.c
rename to reactos/win32ss/gdi/diblib/SrcPatBlt.c
diff --git a/reactos/subsystems/win32/win32k/eng/alphablend.c b/reactos/win32ss/gdi/eng/alphablend.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/alphablend.c
rename to reactos/win32ss/gdi/eng/alphablend.c
diff --git a/reactos/subsystems/win32/win32k/eng/bitblt.c b/reactos/win32ss/gdi/eng/bitblt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/bitblt.c
rename to reactos/win32ss/gdi/eng/bitblt.c
diff --git a/reactos/subsystems/win32/win32k/eng/bitblt_new.c b/reactos/win32ss/gdi/eng/bitblt_new.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/bitblt_new.c
rename to reactos/win32ss/gdi/eng/bitblt_new.c
diff --git a/reactos/subsystems/win32/win32k/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/clip.c
rename to reactos/win32ss/gdi/eng/clip.c
diff --git a/reactos/subsystems/win32/win32k/eng/copybits.c b/reactos/win32ss/gdi/eng/copybits.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/copybits.c
rename to reactos/win32ss/gdi/eng/copybits.c
diff --git a/reactos/subsystems/win32/win32k/eng/debug.c b/reactos/win32ss/gdi/eng/debug.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/debug.c
rename to reactos/win32ss/gdi/eng/debug.c
diff --git a/reactos/subsystems/win32/win32k/eng/device.c b/reactos/win32ss/gdi/eng/device.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/device.c
rename to reactos/win32ss/gdi/eng/device.c
diff --git a/reactos/subsystems/win32/win32k/include/device.h b/reactos/win32ss/gdi/eng/device.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/device.h
rename to reactos/win32ss/gdi/eng/device.h
diff --git a/reactos/subsystems/win32/win32k/eng/driverobj.c b/reactos/win32ss/gdi/eng/driverobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/driverobj.c
rename to reactos/win32ss/gdi/eng/driverobj.c
diff --git a/reactos/subsystems/win32/win32k/include/driverobj.h b/reactos/win32ss/gdi/eng/driverobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/driverobj.h
rename to reactos/win32ss/gdi/eng/driverobj.h
diff --git a/reactos/subsystems/win32/win32k/eng/drvdbg.c b/reactos/win32ss/gdi/eng/drvdbg.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/drvdbg.c
rename to reactos/win32ss/gdi/eng/drvdbg.c
diff --git a/reactos/subsystems/win32/win32k/include/eng.h b/reactos/win32ss/gdi/eng/eng.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/eng.h
rename to reactos/win32ss/gdi/eng/eng.h
diff --git a/reactos/subsystems/win32/win32k/eng/engbrush.c b/reactos/win32ss/gdi/eng/engbrush.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/engbrush.c
rename to reactos/win32ss/gdi/eng/engbrush.c
diff --git a/reactos/subsystems/win32/win32k/eng/engevent.c b/reactos/win32ss/gdi/eng/engevent.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/engevent.c
rename to reactos/win32ss/gdi/eng/engevent.c
diff --git a/reactos/subsystems/win32/win32k/include/engevent.h b/reactos/win32ss/gdi/eng/engevent.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/engevent.h
rename to reactos/win32ss/gdi/eng/engevent.h
diff --git a/reactos/subsystems/win32/win32k/eng/engmisc.c b/reactos/win32ss/gdi/eng/engmisc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/engmisc.c
rename to reactos/win32ss/gdi/eng/engmisc.c
diff --git a/reactos/subsystems/win32/win32k/include/engobjects.h b/reactos/win32ss/gdi/eng/engobjects.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/engobjects.h
rename to reactos/win32ss/gdi/eng/engobjects.h
diff --git a/reactos/subsystems/win32/win32k/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/engwindow.c
rename to reactos/win32ss/gdi/eng/engwindow.c
diff --git a/reactos/subsystems/win32/win32k/eng/error.c b/reactos/win32ss/gdi/eng/error.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/error.c
rename to reactos/win32ss/gdi/eng/error.c
diff --git a/reactos/subsystems/win32/win32k/eng/float.c b/reactos/win32ss/gdi/eng/float.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/float.c
rename to reactos/win32ss/gdi/eng/float.c
diff --git a/reactos/subsystems/win32/win32k/include/floatobj.h b/reactos/win32ss/gdi/eng/floatobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/floatobj.h
rename to reactos/win32ss/gdi/eng/floatobj.h
diff --git a/reactos/subsystems/win32/win32k/eng/gradient.c b/reactos/win32ss/gdi/eng/gradient.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/gradient.c
rename to reactos/win32ss/gdi/eng/gradient.c
diff --git a/reactos/subsystems/win32/win32k/eng/i386/floatobj.S b/reactos/win32ss/gdi/eng/i386/floatobj.S
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/i386/floatobj.S
rename to reactos/win32ss/gdi/eng/i386/floatobj.S
diff --git a/reactos/subsystems/win32/win32k/include/inteng.h b/reactos/win32ss/gdi/eng/inteng.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/inteng.h
rename to reactos/win32ss/gdi/eng/inteng.h
diff --git a/reactos/subsystems/win32/win32k/eng/ldevobj.c b/reactos/win32ss/gdi/eng/ldevobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/ldevobj.c
rename to reactos/win32ss/gdi/eng/ldevobj.c
diff --git a/reactos/subsystems/win32/win32k/include/ldevobj.h b/reactos/win32ss/gdi/eng/ldevobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/ldevobj.h
rename to reactos/win32ss/gdi/eng/ldevobj.h
diff --git a/reactos/subsystems/win32/win32k/eng/lineto.c b/reactos/win32ss/gdi/eng/lineto.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/lineto.c
rename to reactos/win32ss/gdi/eng/lineto.c
diff --git a/reactos/subsystems/win32/win32k/eng/mapping.c b/reactos/win32ss/gdi/eng/mapping.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/mapping.c
rename to reactos/win32ss/gdi/eng/mapping.c
diff --git a/reactos/subsystems/win32/win32k/eng/mem.c b/reactos/win32ss/gdi/eng/mem.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/mem.c
rename to reactos/win32ss/gdi/eng/mem.c
diff --git a/reactos/subsystems/win32/win32k/eng/mouse.c b/reactos/win32ss/gdi/eng/mouse.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/mouse.c
rename to reactos/win32ss/gdi/eng/mouse.c
diff --git a/reactos/subsystems/win32/win32k/include/mouse.h b/reactos/win32ss/gdi/eng/mouse.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/mouse.h
rename to reactos/win32ss/gdi/eng/mouse.h
diff --git a/reactos/subsystems/win32/win32k/eng/paint.c b/reactos/win32ss/gdi/eng/paint.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/paint.c
rename to reactos/win32ss/gdi/eng/paint.c
diff --git a/reactos/subsystems/win32/win32k/eng/pdevobj.c b/reactos/win32ss/gdi/eng/pdevobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/pdevobj.c
rename to reactos/win32ss/gdi/eng/pdevobj.c
diff --git a/reactos/subsystems/win32/win32k/include/pdevobj.h b/reactos/win32ss/gdi/eng/pdevobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/pdevobj.h
rename to reactos/win32ss/gdi/eng/pdevobj.h
diff --git a/reactos/subsystems/win32/win32k/eng/perfcnt.c b/reactos/win32ss/gdi/eng/perfcnt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/perfcnt.c
rename to reactos/win32ss/gdi/eng/perfcnt.c
diff --git a/reactos/subsystems/win32/win32k/eng/rlecomp.c b/reactos/win32ss/gdi/eng/rlecomp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/rlecomp.c
rename to reactos/win32ss/gdi/eng/rlecomp.c
diff --git a/reactos/subsystems/win32/win32k/eng/semaphor.c b/reactos/win32ss/gdi/eng/semaphor.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/semaphor.c
rename to reactos/win32ss/gdi/eng/semaphor.c
diff --git a/reactos/subsystems/win32/win32k/eng/sort.c b/reactos/win32ss/gdi/eng/sort.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/sort.c
rename to reactos/win32ss/gdi/eng/sort.c
diff --git a/reactos/subsystems/win32/win32k/eng/stretchblt.c b/reactos/win32ss/gdi/eng/stretchblt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/stretchblt.c
rename to reactos/win32ss/gdi/eng/stretchblt.c
diff --git a/reactos/subsystems/win32/win32k/eng/string.c b/reactos/win32ss/gdi/eng/string.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/string.c
rename to reactos/win32ss/gdi/eng/string.c
diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/win32ss/gdi/eng/stubs.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/stubs/stubs.c
rename to reactos/win32ss/gdi/eng/stubs.c
diff --git a/reactos/subsystems/win32/win32k/eng/surface.c b/reactos/win32ss/gdi/eng/surface.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/surface.c
rename to reactos/win32ss/gdi/eng/surface.c
diff --git a/reactos/subsystems/win32/win32k/include/surface.h b/reactos/win32ss/gdi/eng/surface.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/surface.h
rename to reactos/win32ss/gdi/eng/surface.h
diff --git a/reactos/subsystems/win32/win32k/eng/transblt.c b/reactos/win32ss/gdi/eng/transblt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/transblt.c
rename to reactos/win32ss/gdi/eng/transblt.c
diff --git a/reactos/subsystems/win32/win32k/stubs/umpdstubs.c b/reactos/win32ss/gdi/eng/umpdstubs.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/stubs/umpdstubs.c
rename to reactos/win32ss/gdi/eng/umpdstubs.c
diff --git a/reactos/subsystems/win32/win32k/eng/xlate.c b/reactos/win32ss/gdi/eng/xlate.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/eng/xlate.c
rename to reactos/win32ss/gdi/eng/xlate.c
diff --git a/reactos/subsystems/win32/win32k/include/xlateobj.h b/reactos/win32ss/gdi/eng/xlateobj.h
similarity index 92%
rename from reactos/subsystems/win32/win32k/include/xlateobj.h
rename to reactos/win32ss/gdi/eng/xlateobj.h
index 54b5807fa9b..3cf240bd3c7 100644
--- a/reactos/subsystems/win32/win32k/include/xlateobj.h
+++ b/reactos/win32ss/gdi/eng/xlateobj.h
@@ -54,7 +54,7 @@ EXLATEOBJ_iXlateTrivial(PEXLATEOBJ pexlo, ULONG iColor);
 void
 DbgCmpXlate(XLATEOBJ *pxlo1, XLATEOBJ *pxlo2);
 
-VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PALETTE *ppalSrc, PALETTE *ppalDst, ULONG, ULONG, ULONG);
+VOID NTAPI EXLATEOBJ_vInitialize(PEXLATEOBJ pexlo, PPALETTE ppalSrc, PPALETTE ppalDst, ULONG, ULONG, ULONG);
 VOID NTAPI EXLATEOBJ_vInitXlateFromDCs(PEXLATEOBJ pexlo, PDC pdcSrc, PDC pdcDst);
 VOID NTAPI EXLATEOBJ_vInitSrcMonoXlate(PEXLATEOBJ pexlo, PPALETTE ppalDst, ULONG Color0, ULONG Color1);
 VOID NTAPI EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo);
diff --git a/reactos/subsystems/win32/win32k/objects/arc.c b/reactos/win32ss/gdi/ntgdi/arc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/arc.c
rename to reactos/win32ss/gdi/ntgdi/arc.c
diff --git a/reactos/subsystems/win32/win32k/objects/bezier.c b/reactos/win32ss/gdi/ntgdi/bezier.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/bezier.c
rename to reactos/win32ss/gdi/ntgdi/bezier.c
diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/win32ss/gdi/ntgdi/bitblt.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/bitblt.c
rename to reactos/win32ss/gdi/ntgdi/bitblt.c
diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/win32ss/gdi/ntgdi/bitmaps.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/bitmaps.c
rename to reactos/win32ss/gdi/ntgdi/bitmaps.c
diff --git a/reactos/subsystems/win32/win32k/include/bitmaps.h b/reactos/win32ss/gdi/ntgdi/bitmaps.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/bitmaps.h
rename to reactos/win32ss/gdi/ntgdi/bitmaps.h
diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/win32ss/gdi/ntgdi/brush.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/brush.c
rename to reactos/win32ss/gdi/ntgdi/brush.c
diff --git a/reactos/subsystems/win32/win32k/include/brush.h b/reactos/win32ss/gdi/ntgdi/brush.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/brush.h
rename to reactos/win32ss/gdi/ntgdi/brush.h
diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/cliprgn.c
rename to reactos/win32ss/gdi/ntgdi/cliprgn.c
diff --git a/reactos/subsystems/win32/win32k/include/cliprgn.h b/reactos/win32ss/gdi/ntgdi/cliprgn.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/cliprgn.h
rename to reactos/win32ss/gdi/ntgdi/cliprgn.h
diff --git a/reactos/subsystems/win32/win32k/include/color.h b/reactos/win32ss/gdi/ntgdi/color.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/color.h
rename to reactos/win32ss/gdi/ntgdi/color.h
diff --git a/reactos/subsystems/win32/win32k/objects/coord.c b/reactos/win32ss/gdi/ntgdi/coord.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/coord.c
rename to reactos/win32ss/gdi/ntgdi/coord.c
diff --git a/reactos/subsystems/win32/win32k/include/coord.h b/reactos/win32ss/gdi/ntgdi/coord.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/coord.h
rename to reactos/win32ss/gdi/ntgdi/coord.h
diff --git a/reactos/subsystems/win32/win32k/include/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/dc.h
rename to reactos/win32ss/gdi/ntgdi/dc.h
diff --git a/reactos/subsystems/win32/win32k/objects/dcattr.c b/reactos/win32ss/gdi/ntgdi/dcattr.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dcattr.c
rename to reactos/win32ss/gdi/ntgdi/dcattr.c
diff --git a/reactos/subsystems/win32/win32k/objects/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dclife.c
rename to reactos/win32ss/gdi/ntgdi/dclife.c
diff --git a/reactos/subsystems/win32/win32k/objects/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dcobjs.c
rename to reactos/win32ss/gdi/ntgdi/dcobjs.c
diff --git a/reactos/subsystems/win32/win32k/objects/dcstate.c b/reactos/win32ss/gdi/ntgdi/dcstate.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dcstate.c
rename to reactos/win32ss/gdi/ntgdi/dcstate.c
diff --git a/reactos/subsystems/win32/win32k/objects/dcutil.c b/reactos/win32ss/gdi/ntgdi/dcutil.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dcutil.c
rename to reactos/win32ss/gdi/ntgdi/dcutil.c
diff --git a/reactos/subsystems/win32/win32k/objects/device.c b/reactos/win32ss/gdi/ntgdi/device.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/device.c
rename to reactos/win32ss/gdi/ntgdi/device.c
diff --git a/reactos/subsystems/win32/win32k/include/dib.h b/reactos/win32ss/gdi/ntgdi/dib.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/dib.h
rename to reactos/win32ss/gdi/ntgdi/dib.h
diff --git a/reactos/subsystems/win32/win32k/objects/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/dibobj.c
rename to reactos/win32ss/gdi/ntgdi/dibobj.c
diff --git a/reactos/subsystems/win32/win32k/objects/drawing.c b/reactos/win32ss/gdi/ntgdi/drawing.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/drawing.c
rename to reactos/win32ss/gdi/ntgdi/drawing.c
diff --git a/reactos/subsystems/win32/win32k/objects/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/fillshap.c
rename to reactos/win32ss/gdi/ntgdi/fillshap.c
diff --git a/reactos/subsystems/win32/win32k/objects/font.c b/reactos/win32ss/gdi/ntgdi/font.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/font.c
rename to reactos/win32ss/gdi/ntgdi/font.c
diff --git a/reactos/subsystems/win32/win32k/objects/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/freetype.c
rename to reactos/win32ss/gdi/ntgdi/freetype.c
diff --git a/reactos/subsystems/win32/win32k/objects/gdibatch.c b/reactos/win32ss/gdi/ntgdi/gdibatch.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/gdibatch.c
rename to reactos/win32ss/gdi/ntgdi/gdibatch.c
diff --git a/reactos/subsystems/win32/win32k/objects/gdidbg.c b/reactos/win32ss/gdi/ntgdi/gdidbg.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/gdidbg.c
rename to reactos/win32ss/gdi/ntgdi/gdidbg.c
diff --git a/reactos/subsystems/win32/win32k/include/gdidebug.h b/reactos/win32ss/gdi/ntgdi/gdidebug.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/gdidebug.h
rename to reactos/win32ss/gdi/ntgdi/gdidebug.h
diff --git a/reactos/subsystems/win32/win32k/include/gdifloat.h b/reactos/win32ss/gdi/ntgdi/gdifloat.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/gdifloat.h
rename to reactos/win32ss/gdi/ntgdi/gdifloat.h
diff --git a/reactos/subsystems/win32/win32k/objects/gdiobj.c b/reactos/win32ss/gdi/ntgdi/gdiobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/gdiobj.c
rename to reactos/win32ss/gdi/ntgdi/gdiobj.c
diff --git a/reactos/subsystems/win32/win32k/include/gdiobj.h b/reactos/win32ss/gdi/ntgdi/gdiobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/gdiobj.h
rename to reactos/win32ss/gdi/ntgdi/gdiobj.h
diff --git a/reactos/subsystems/win32/win32k/objects/gdipool.c b/reactos/win32ss/gdi/ntgdi/gdipool.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/gdipool.c
rename to reactos/win32ss/gdi/ntgdi/gdipool.c
diff --git a/reactos/subsystems/win32/win32k/objects/icm.c b/reactos/win32ss/gdi/ntgdi/icm.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/icm.c
rename to reactos/win32ss/gdi/ntgdi/icm.c
diff --git a/reactos/subsystems/win32/win32k/include/intgdi.h b/reactos/win32ss/gdi/ntgdi/intgdi.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/intgdi.h
rename to reactos/win32ss/gdi/ntgdi/intgdi.h
diff --git a/reactos/subsystems/win32/win32k/objects/line.c b/reactos/win32ss/gdi/ntgdi/line.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/line.c
rename to reactos/win32ss/gdi/ntgdi/line.c
diff --git a/reactos/subsystems/win32/win32k/objects/metafile.c b/reactos/win32ss/gdi/ntgdi/metafile.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/metafile.c
rename to reactos/win32ss/gdi/ntgdi/metafile.c
diff --git a/reactos/subsystems/win32/win32k/include/misc.h b/reactos/win32ss/gdi/ntgdi/misc.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/misc.h
rename to reactos/win32ss/gdi/ntgdi/misc.h
diff --git a/reactos/subsystems/win32/win32k/include/paint.h b/reactos/win32ss/gdi/ntgdi/paint.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/paint.h
rename to reactos/win32ss/gdi/ntgdi/paint.h
diff --git a/reactos/subsystems/win32/win32k/objects/palette.c b/reactos/win32ss/gdi/ntgdi/palette.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/palette.c
rename to reactos/win32ss/gdi/ntgdi/palette.c
diff --git a/reactos/subsystems/win32/win32k/include/palette.h b/reactos/win32ss/gdi/ntgdi/palette.h
similarity index 99%
rename from reactos/subsystems/win32/win32k/include/palette.h
rename to reactos/win32ss/gdi/ntgdi/palette.h
index 857eeafb034..fc359da1e43 100644
--- a/reactos/subsystems/win32/win32k/include/palette.h
+++ b/reactos/win32ss/gdi/ntgdi/palette.h
@@ -48,7 +48,7 @@ typedef struct _PALETTE
   ULONG ulGreenShift;
   ULONG ulBlueShift;
   HDEV  hPDev;
-} PALETTE, *PPALETTE;
+} PALETTE;
 
 extern PALETTE gpalRGB, gpalBGR, gpalMono, gpalRGB555, gpalRGB565, *gppalDefault;
 extern PPALETTE appalSurfaceDefault[];
@@ -104,3 +104,4 @@ PALETTE_ulGetRGBColorFromIndex(PPALETTE ppal, ULONG ulIndex)
                ppal->IndexedColors[ulIndex].peGreen,
                ppal->IndexedColors[ulIndex].peBlue);
 }
+
diff --git a/reactos/subsystems/win32/win32k/objects/path.c b/reactos/win32ss/gdi/ntgdi/path.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/path.c
rename to reactos/win32ss/gdi/ntgdi/path.c
diff --git a/reactos/subsystems/win32/win32k/include/path.h b/reactos/win32ss/gdi/ntgdi/path.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/path.h
rename to reactos/win32ss/gdi/ntgdi/path.h
diff --git a/reactos/subsystems/win32/win32k/objects/pen.c b/reactos/win32ss/gdi/ntgdi/pen.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/pen.c
rename to reactos/win32ss/gdi/ntgdi/pen.c
diff --git a/reactos/subsystems/win32/win32k/include/pen.h b/reactos/win32ss/gdi/ntgdi/pen.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/pen.h
rename to reactos/win32ss/gdi/ntgdi/pen.h
diff --git a/reactos/subsystems/win32/win32k/objects/polyfill.c b/reactos/win32ss/gdi/ntgdi/polyfill.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/polyfill.c
rename to reactos/win32ss/gdi/ntgdi/polyfill.c
diff --git a/reactos/subsystems/win32/win32k/objects/print.c b/reactos/win32ss/gdi/ntgdi/print.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/print.c
rename to reactos/win32ss/gdi/ntgdi/print.c
diff --git a/reactos/subsystems/win32/win32k/objects/rect.c b/reactos/win32ss/gdi/ntgdi/rect.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/rect.c
rename to reactos/win32ss/gdi/ntgdi/rect.c
diff --git a/reactos/subsystems/win32/win32k/include/rect.h b/reactos/win32ss/gdi/ntgdi/rect.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/rect.h
rename to reactos/win32ss/gdi/ntgdi/rect.h
diff --git a/reactos/subsystems/win32/win32k/objects/region.c b/reactos/win32ss/gdi/ntgdi/region.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/region.c
rename to reactos/win32ss/gdi/ntgdi/region.c
diff --git a/reactos/subsystems/win32/win32k/include/region.h b/reactos/win32ss/gdi/ntgdi/region.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/region.h
rename to reactos/win32ss/gdi/ntgdi/region.h
diff --git a/reactos/subsystems/win32/win32k/objects/stockobj.c b/reactos/win32ss/gdi/ntgdi/stockobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/stockobj.c
rename to reactos/win32ss/gdi/ntgdi/stockobj.c
diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/win32ss/gdi/ntgdi/text.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/text.c
rename to reactos/win32ss/gdi/ntgdi/text.c
diff --git a/reactos/subsystems/win32/win32k/include/text.h b/reactos/win32ss/gdi/ntgdi/text.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/text.h
rename to reactos/win32ss/gdi/ntgdi/text.h
diff --git a/reactos/subsystems/win32/win32k/objects/wingl.c b/reactos/win32ss/gdi/ntgdi/wingl.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/wingl.c
rename to reactos/win32ss/gdi/ntgdi/wingl.c
diff --git a/reactos/subsystems/win32/win32k/objects/xformobj.c b/reactos/win32ss/gdi/ntgdi/xformobj.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/objects/xformobj.c
rename to reactos/win32ss/gdi/ntgdi/xformobj.c
diff --git a/reactos/subsystems/win32/win32k/include/xformobj.h b/reactos/win32ss/gdi/ntgdi/xformobj.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/xformobj.h
rename to reactos/win32ss/gdi/ntgdi/xformobj.h
diff --git a/reactos/subsystems/win32/win32k/include/napi.h b/reactos/win32ss/napi.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/napi.h
rename to reactos/win32ss/napi.h
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/win32ss/pch.h
similarity index 98%
rename from reactos/subsystems/win32/win32k/pch.h
rename to reactos/win32ss/pch.h
index 0906147a1c1..90bc9992909 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/win32ss/pch.h
@@ -97,6 +97,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 #include <freetype/freetype.h>
 
 /* Internal Win32K header */
-#include "include/win32kp.h"
+#include "win32kp.h"
 
 #endif /* __W32K_H */
diff --git a/reactos/subsystems/win32/win32k/ntddraw/d3d.c b/reactos/win32ss/reactx/ntddraw/d3d.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/d3d.c
rename to reactos/win32ss/reactx/ntddraw/d3d.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/dd.c b/reactos/win32ss/reactx/ntddraw/dd.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/dd.c
rename to reactos/win32ss/reactx/ntddraw/dd.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/win32ss/reactx/ntddraw/ddraw.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/ddraw.c
rename to reactos/win32ss/reactx/ntddraw/ddraw.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c b/reactos/win32ss/reactx/ntddraw/ddsurf.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/ddsurf.c
rename to reactos/win32ss/reactx/ntddraw/ddsurf.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/dvp.c b/reactos/win32ss/reactx/ntddraw/dvp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/dvp.c
rename to reactos/win32ss/reactx/ntddraw/dvp.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/win32ss/reactx/ntddraw/dxeng.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/dxeng.c
rename to reactos/win32ss/reactx/ntddraw/dxeng.c
diff --git a/reactos/subsystems/win32/win32k/ntddraw/eng.c b/reactos/win32ss/reactx/ntddraw/eng.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/eng.c
rename to reactos/win32ss/reactx/ntddraw/eng.c
diff --git a/reactos/subsystems/win32/win32k/include/intddraw.h b/reactos/win32ss/reactx/ntddraw/intddraw.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/intddraw.h
rename to reactos/win32ss/reactx/ntddraw/intddraw.h
diff --git a/reactos/subsystems/win32/win32k/ntddraw/mocomp.c b/reactos/win32ss/reactx/ntddraw/mocomp.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntddraw/mocomp.c
rename to reactos/win32ss/reactx/ntddraw/mocomp.c
diff --git a/reactos/subsystems/win32/win32k/sys-stubs.S b/reactos/win32ss/sys-stubs.S
similarity index 100%
rename from reactos/subsystems/win32/win32k/sys-stubs.S
rename to reactos/win32ss/sys-stubs.S
diff --git a/reactos/subsystems/win32/win32k/ntuser/accelerator.c b/reactos/win32ss/user/ntuser/accelerator.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/accelerator.c
rename to reactos/win32ss/user/ntuser/accelerator.c
diff --git a/reactos/subsystems/win32/win32k/include/accelerator.h b/reactos/win32ss/user/ntuser/accelerator.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/accelerator.h
rename to reactos/win32ss/user/ntuser/accelerator.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/callback.c b/reactos/win32ss/user/ntuser/callback.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/callback.c
rename to reactos/win32ss/user/ntuser/callback.c
diff --git a/reactos/subsystems/win32/win32k/include/callback.h b/reactos/win32ss/user/ntuser/callback.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/callback.h
rename to reactos/win32ss/user/ntuser/callback.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/callproc.c b/reactos/win32ss/user/ntuser/callproc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/callproc.c
rename to reactos/win32ss/user/ntuser/callproc.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/caret.c b/reactos/win32ss/user/ntuser/caret.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/caret.c
rename to reactos/win32ss/user/ntuser/caret.c
diff --git a/reactos/subsystems/win32/win32k/include/caret.h b/reactos/win32ss/user/ntuser/caret.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/caret.h
rename to reactos/win32ss/user/ntuser/caret.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/class.c b/reactos/win32ss/user/ntuser/class.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/class.c
rename to reactos/win32ss/user/ntuser/class.c
diff --git a/reactos/subsystems/win32/win32k/include/class.h b/reactos/win32ss/user/ntuser/class.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/class.h
rename to reactos/win32ss/user/ntuser/class.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/win32ss/user/ntuser/clipboard.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/clipboard.c
rename to reactos/win32ss/user/ntuser/clipboard.c
diff --git a/reactos/subsystems/win32/win32k/include/clipboard.h b/reactos/win32ss/user/ntuser/clipboard.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/clipboard.h
rename to reactos/win32ss/user/ntuser/clipboard.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/csr.c b/reactos/win32ss/user/ntuser/csr.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/csr.c
rename to reactos/win32ss/user/ntuser/csr.c
diff --git a/reactos/subsystems/win32/win32k/include/csr.h b/reactos/win32ss/user/ntuser/csr.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/csr.h
rename to reactos/win32ss/user/ntuser/csr.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/cursoricon.c
rename to reactos/win32ss/user/ntuser/cursoricon.c
diff --git a/reactos/subsystems/win32/win32k/include/cursoricon.h b/reactos/win32ss/user/ntuser/cursoricon.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/cursoricon.h
rename to reactos/win32ss/user/ntuser/cursoricon.h
diff --git a/reactos/subsystems/win32/win32k/include/dce.h b/reactos/win32ss/user/ntuser/dce.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/dce.h
rename to reactos/win32ss/user/ntuser/dce.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/defwnd.c b/reactos/win32ss/user/ntuser/defwnd.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/defwnd.c
rename to reactos/win32ss/user/ntuser/defwnd.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/desktop.c
rename to reactos/win32ss/user/ntuser/desktop.c
diff --git a/reactos/subsystems/win32/win32k/include/desktop.h b/reactos/win32ss/user/ntuser/desktop.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/desktop.h
rename to reactos/win32ss/user/ntuser/desktop.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/display.c b/reactos/win32ss/user/ntuser/display.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/display.c
rename to reactos/win32ss/user/ntuser/display.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/event.c b/reactos/win32ss/user/ntuser/event.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/event.c
rename to reactos/win32ss/user/ntuser/event.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/focus.c b/reactos/win32ss/user/ntuser/focus.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/focus.c
rename to reactos/win32ss/user/ntuser/focus.c
diff --git a/reactos/subsystems/win32/win32k/include/focus.h b/reactos/win32ss/user/ntuser/focus.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/focus.h
rename to reactos/win32ss/user/ntuser/focus.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/guicheck.c b/reactos/win32ss/user/ntuser/guicheck.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/guicheck.c
rename to reactos/win32ss/user/ntuser/guicheck.c
diff --git a/reactos/subsystems/win32/win32k/include/guicheck.h b/reactos/win32ss/user/ntuser/guicheck.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/guicheck.h
rename to reactos/win32ss/user/ntuser/guicheck.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/hook.c b/reactos/win32ss/user/ntuser/hook.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/hook.c
rename to reactos/win32ss/user/ntuser/hook.c
diff --git a/reactos/subsystems/win32/win32k/include/hook.h b/reactos/win32ss/user/ntuser/hook.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/hook.h
rename to reactos/win32ss/user/ntuser/hook.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/hotkey.c b/reactos/win32ss/user/ntuser/hotkey.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/hotkey.c
rename to reactos/win32ss/user/ntuser/hotkey.c
diff --git a/reactos/subsystems/win32/win32k/include/hotkey.h b/reactos/win32ss/user/ntuser/hotkey.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/hotkey.h
rename to reactos/win32ss/user/ntuser/hotkey.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/input.c b/reactos/win32ss/user/ntuser/input.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/input.c
rename to reactos/win32ss/user/ntuser/input.c
diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/win32ss/user/ntuser/input.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/input.h
rename to reactos/win32ss/user/ntuser/input.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c b/reactos/win32ss/user/ntuser/kbdlayout.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/kbdlayout.c
rename to reactos/win32ss/user/ntuser/kbdlayout.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/keyboard.c b/reactos/win32ss/user/ntuser/keyboard.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/keyboard.c
rename to reactos/win32ss/user/ntuser/keyboard.c
diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/win32ss/user/ntuser/main.c
similarity index 99%
rename from reactos/subsystems/win32/win32k/main/dllmain.c
rename to reactos/win32ss/user/ntuser/main.c
index 53b031e20c7..9c145b2b880 100644
--- a/reactos/subsystems/win32/win32k/main/dllmain.c
+++ b/reactos/win32ss/user/ntuser/main.c
@@ -7,7 +7,7 @@
  */
 
 #include <win32k.h>
-#include <include/napi.h>
+#include <napi.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsystems/win32/win32k/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/menu.c
rename to reactos/win32ss/user/ntuser/menu.c
diff --git a/reactos/subsystems/win32/win32k/include/menu.h b/reactos/win32ss/user/ntuser/menu.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/menu.h
rename to reactos/win32ss/user/ntuser/menu.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/message.c b/reactos/win32ss/user/ntuser/message.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/message.c
rename to reactos/win32ss/user/ntuser/message.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/metric.c b/reactos/win32ss/user/ntuser/metric.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/metric.c
rename to reactos/win32ss/user/ntuser/metric.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/win32ss/user/ntuser/misc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/misc.c
rename to reactos/win32ss/user/ntuser/misc.c
diff --git a/reactos/subsystems/win32/win32k/misc/copy.c b/reactos/win32ss/user/ntuser/misc/copy.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/copy.c
rename to reactos/win32ss/user/ntuser/misc/copy.c
diff --git a/reactos/subsystems/win32/win32k/misc/driver.c b/reactos/win32ss/user/ntuser/misc/driver.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/driver.c
rename to reactos/win32ss/user/ntuser/misc/driver.c
diff --git a/reactos/subsystems/win32/win32k/misc/file.c b/reactos/win32ss/user/ntuser/misc/file.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/file.c
rename to reactos/win32ss/user/ntuser/misc/file.c
diff --git a/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s b/reactos/win32ss/user/ntuser/misc/i386/atan2_asm.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s
rename to reactos/win32ss/user/ntuser/misc/i386/atan2_asm.s
diff --git a/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s b/reactos/win32ss/user/ntuser/misc/i386/ceil_asm.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s
rename to reactos/win32ss/user/ntuser/misc/i386/ceil_asm.s
diff --git a/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s b/reactos/win32ss/user/ntuser/misc/i386/cos_asm.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/i386/cos_asm.s
rename to reactos/win32ss/user/ntuser/misc/i386/cos_asm.s
diff --git a/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s b/reactos/win32ss/user/ntuser/misc/i386/floor_asm.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/i386/floor_asm.s
rename to reactos/win32ss/user/ntuser/misc/i386/floor_asm.s
diff --git a/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s b/reactos/win32ss/user/ntuser/misc/i386/sin_asm.s
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/i386/sin_asm.s
rename to reactos/win32ss/user/ntuser/misc/i386/sin_asm.s
diff --git a/reactos/subsystems/win32/win32k/misc/math.c b/reactos/win32ss/user/ntuser/misc/math.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/math.c
rename to reactos/win32ss/user/ntuser/misc/math.c
diff --git a/reactos/subsystems/win32/win32k/misc/registry.c b/reactos/win32ss/user/ntuser/misc/registry.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/registry.c
rename to reactos/win32ss/user/ntuser/misc/registry.c
diff --git a/reactos/subsystems/win32/win32k/misc/rtlstr.c b/reactos/win32ss/user/ntuser/misc/rtlstr.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/rtlstr.c
rename to reactos/win32ss/user/ntuser/misc/rtlstr.c
diff --git a/reactos/subsystems/win32/win32k/misc/usrheap.c b/reactos/win32ss/user/ntuser/misc/usrheap.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/misc/usrheap.c
rename to reactos/win32ss/user/ntuser/misc/usrheap.c
diff --git a/reactos/subsystems/win32/win32k/include/mmcopy.h b/reactos/win32ss/user/ntuser/mmcopy.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/mmcopy.h
rename to reactos/win32ss/user/ntuser/mmcopy.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/monitor.c b/reactos/win32ss/user/ntuser/monitor.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/monitor.c
rename to reactos/win32ss/user/ntuser/monitor.c
diff --git a/reactos/subsystems/win32/win32k/include/monitor.h b/reactos/win32ss/user/ntuser/monitor.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/monitor.h
rename to reactos/win32ss/user/ntuser/monitor.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/mouse.c b/reactos/win32ss/user/ntuser/mouse.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/mouse.c
rename to reactos/win32ss/user/ntuser/mouse.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/msgqueue.c b/reactos/win32ss/user/ntuser/msgqueue.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/msgqueue.c
rename to reactos/win32ss/user/ntuser/msgqueue.c
diff --git a/reactos/subsystems/win32/win32k/include/msgqueue.h b/reactos/win32ss/user/ntuser/msgqueue.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/msgqueue.h
rename to reactos/win32ss/user/ntuser/msgqueue.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/ntstubs.c b/reactos/win32ss/user/ntuser/ntstubs.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/ntstubs.c
rename to reactos/win32ss/user/ntuser/ntstubs.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/ntuser.c b/reactos/win32ss/user/ntuser/ntuser.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/ntuser.c
rename to reactos/win32ss/user/ntuser/ntuser.c
diff --git a/reactos/subsystems/win32/win32k/include/ntuser.h b/reactos/win32ss/user/ntuser/ntuser.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/ntuser.h
rename to reactos/win32ss/user/ntuser/ntuser.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/object.c b/reactos/win32ss/user/ntuser/object.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/object.c
rename to reactos/win32ss/user/ntuser/object.c
diff --git a/reactos/subsystems/win32/win32k/include/object.h b/reactos/win32ss/user/ntuser/object.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/object.h
rename to reactos/win32ss/user/ntuser/object.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/painting.c b/reactos/win32ss/user/ntuser/painting.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/painting.c
rename to reactos/win32ss/user/ntuser/painting.c
diff --git a/reactos/subsystems/win32/win32k/include/painting.h b/reactos/win32ss/user/ntuser/painting.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/painting.h
rename to reactos/win32ss/user/ntuser/painting.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/prop.c b/reactos/win32ss/user/ntuser/prop.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/prop.c
rename to reactos/win32ss/user/ntuser/prop.c
diff --git a/reactos/subsystems/win32/win32k/include/prop.h b/reactos/win32ss/user/ntuser/prop.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/prop.h
rename to reactos/win32ss/user/ntuser/prop.h
diff --git a/reactos/subsystems/win32/win32k/include/scroll.h b/reactos/win32ss/user/ntuser/scroll.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/scroll.h
rename to reactos/win32ss/user/ntuser/scroll.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/scrollbar.c b/reactos/win32ss/user/ntuser/scrollbar.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/scrollbar.c
rename to reactos/win32ss/user/ntuser/scrollbar.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/session.c b/reactos/win32ss/user/ntuser/session.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/session.c
rename to reactos/win32ss/user/ntuser/session.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/simplecall.c
rename to reactos/win32ss/user/ntuser/simplecall.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/sysparams.c
rename to reactos/win32ss/user/ntuser/sysparams.c
diff --git a/reactos/subsystems/win32/win32k/include/sysparams.h b/reactos/win32ss/user/ntuser/sysparams.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/sysparams.h
rename to reactos/win32ss/user/ntuser/sysparams.h
diff --git a/reactos/subsystems/win32/win32k/include/tags.h b/reactos/win32ss/user/ntuser/tags.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/tags.h
rename to reactos/win32ss/user/ntuser/tags.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/timer.c b/reactos/win32ss/user/ntuser/timer.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/timer.c
rename to reactos/win32ss/user/ntuser/timer.c
diff --git a/reactos/subsystems/win32/win32k/include/timer.h b/reactos/win32ss/user/ntuser/timer.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/timer.h
rename to reactos/win32ss/user/ntuser/timer.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/useratom.c b/reactos/win32ss/user/ntuser/useratom.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/useratom.c
rename to reactos/win32ss/user/ntuser/useratom.c
diff --git a/reactos/subsystems/win32/win32k/include/useratom.h b/reactos/win32ss/user/ntuser/useratom.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/useratom.h
rename to reactos/win32ss/user/ntuser/useratom.h
diff --git a/reactos/subsystems/win32/win32k/include/userfuncs.h b/reactos/win32ss/user/ntuser/userfuncs.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/userfuncs.h
rename to reactos/win32ss/user/ntuser/userfuncs.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/vis.c b/reactos/win32ss/user/ntuser/vis.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/vis.c
rename to reactos/win32ss/user/ntuser/vis.c
diff --git a/reactos/subsystems/win32/win32k/include/vis.h b/reactos/win32ss/user/ntuser/vis.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/vis.h
rename to reactos/win32ss/user/ntuser/vis.h
diff --git a/reactos/subsystems/win32/win32k/include/win32.h b/reactos/win32ss/user/ntuser/win32.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/win32.h
rename to reactos/win32ss/user/ntuser/win32.h
diff --git a/reactos/subsystems/win32/win32k/include/win32kdebug.h b/reactos/win32ss/user/ntuser/win32kdebug.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/win32kdebug.h
rename to reactos/win32ss/user/ntuser/win32kdebug.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/windc.c
rename to reactos/win32ss/user/ntuser/windc.c
diff --git a/reactos/subsystems/win32/win32k/ntuser/window.c b/reactos/win32ss/user/ntuser/window.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/window.c
rename to reactos/win32ss/user/ntuser/window.c
diff --git a/reactos/subsystems/win32/win32k/include/window.h b/reactos/win32ss/user/ntuser/window.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/window.h
rename to reactos/win32ss/user/ntuser/window.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/winpos.c b/reactos/win32ss/user/ntuser/winpos.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/winpos.c
rename to reactos/win32ss/user/ntuser/winpos.c
diff --git a/reactos/subsystems/win32/win32k/include/winpos.h b/reactos/win32ss/user/ntuser/winpos.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/winpos.h
rename to reactos/win32ss/user/ntuser/winpos.h
diff --git a/reactos/subsystems/win32/win32k/ntuser/winsta.c b/reactos/win32ss/user/ntuser/winsta.c
similarity index 100%
rename from reactos/subsystems/win32/win32k/ntuser/winsta.c
rename to reactos/win32ss/user/ntuser/winsta.c
diff --git a/reactos/subsystems/win32/win32k/include/winsta.h b/reactos/win32ss/user/ntuser/winsta.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/include/winsta.h
rename to reactos/win32ss/user/ntuser/winsta.h
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/win32ss/w32ksvc.db
similarity index 100%
rename from reactos/subsystems/win32/win32k/w32ksvc.db
rename to reactos/win32ss/w32ksvc.db
diff --git a/reactos/subsystems/win32/win32k/w32ksvc.h b/reactos/win32ss/w32ksvc.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/w32ksvc.h
rename to reactos/win32ss/w32ksvc.h
diff --git a/reactos/subsystems/win32/win32k/win32k.h b/reactos/win32ss/win32k.h
similarity index 100%
rename from reactos/subsystems/win32/win32k/win32k.h
rename to reactos/win32ss/win32k.h
diff --git a/reactos/subsystems/win32/win32k/win32k.rc b/reactos/win32ss/win32k.rc
similarity index 100%
rename from reactos/subsystems/win32/win32k/win32k.rc
rename to reactos/win32ss/win32k.rc
diff --git a/reactos/subsystems/win32/win32k/win32k.spec b/reactos/win32ss/win32k.spec
similarity index 100%
rename from reactos/subsystems/win32/win32k/win32k.spec
rename to reactos/win32ss/win32k.spec
diff --git a/reactos/win32ss/win32kp.h b/reactos/win32ss/win32kp.h
new file mode 100644
index 00000000000..c0ad5b44987
--- /dev/null
+++ b/reactos/win32ss/win32kp.h
@@ -0,0 +1,106 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Graphics Subsystem
+ * FILE:            win32ss/win32kp.h
+ * PURPOSE:         Internal Win32K Header
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#pragma once
+
+#if 0
+#ifndef _MSC_VER
+#define PLACE_IN_SECTION(s) __attribute__((section(s)))
+#define INIT_FUNCTION PLACE_IN_SECTION("INIT")
+#else
+#define INIT_FUNCTION
+#endif
+#else
+#define INIT_FUNCTION
+#endif
+
+/* Enable debugging features */
+#define GDI_DEBUG 0
+#define DBG_ENABLE_EVENT_LOGGING 0
+#define DBG_ENABLE_SERVICE_HOOKS 0
+
+/* Misc headers  */
+#include "user/ntuser/win32kdebug.h"
+#include "user/ntuser/mmcopy.h"
+#include "user/ntuser/tags.h"
+#include "gdi/ntgdi/rect.h"
+#include "gdi/ntgdi/misc.h"
+
+/* Internal NtGdi Headers */
+typedef struct _DC *PDC;
+typedef struct _PALETTE *PPALETTE;
+#include "gdi/ntgdi/gdiobj.h"
+#include "gdi/eng/surface.h"
+#include "gdi/eng/pdevobj.h"
+#include "gdi/eng/ldevobj.h"
+#include "gdi/eng/device.h"
+#include "gdi/eng/driverobj.h"
+#include "gdi/eng/engobjects.h"
+#include "gdi/eng/eng.h"
+#include "gdi/eng/engevent.h"
+#include "gdi/eng/inteng.h"
+#include "gdi/eng/xlateobj.h"
+#include "gdi/eng/floatobj.h"
+#include "gdi/eng/mouse.h"
+#include "gdi/ntgdi/xformobj.h"
+#include "gdi/ntgdi/brush.h"
+#include "gdi/ntgdi/color.h"
+#include "gdi/ntgdi/bitmaps.h"
+#include "gdi/ntgdi/palette.h"
+#include "gdi/ntgdi/region.h"
+#include "gdi/ntgdi/dc.h"
+#include "gdi/ntgdi/dib.h"
+#include "gdi/ntgdi/cliprgn.h"
+#include "gdi/ntgdi/intgdi.h"
+#include "gdi/ntgdi/paint.h"
+#include "gdi/ntgdi/text.h"
+#include "gdi/ntgdi/pen.h"
+#include "gdi/ntgdi/cliprgn.h"
+#include "gdi/ntgdi/coord.h"
+#include "gdi/ntgdi/gdifloat.h"
+#include "gdi/ntgdi/path.h"
+#include "gdi/dib/dib.h"
+#include "reactx/ntddraw/intddraw.h"
+
+/* Internal NtUser Headers */
+typedef struct _DESKTOP *PDESKTOP;
+#include "user/ntuser/win32.h"
+#include "user/ntuser/object.h"
+#include "user/ntuser/ntuser.h"
+#include "user/ntuser/cursoricon.h"
+#include "user/ntuser/accelerator.h"
+#include "user/ntuser/hook.h"
+#include "user/ntuser/clipboard.h"
+#include "user/ntuser/winsta.h"
+#include "user/ntuser/msgqueue.h"
+#include "user/ntuser/desktop.h"
+#include "user/ntuser/dce.h"
+#include "user/ntuser/focus.h"
+#include "user/ntuser/hotkey.h"
+#include "user/ntuser/input.h"
+#include "user/ntuser/menu.h"
+#include "user/ntuser/monitor.h"
+#include "user/ntuser/timer.h"
+#include "user/ntuser/caret.h"
+#include "user/ntuser/painting.h"
+#include "user/ntuser/class.h"
+#include "user/ntuser/window.h"
+#include "user/ntuser/sysparams.h"
+#include "user/ntuser/prop.h"
+#include "user/ntuser/guicheck.h"
+#include "user/ntuser/useratom.h"
+#include "user/ntuser/vis.h"
+#include "user/ntuser/userfuncs.h"
+#include "user/ntuser/scroll.h"
+#include "user/ntuser/csr.h"
+#include "user/ntuser/winpos.h"
+#include "user/ntuser/callback.h"
+
+#include "gdi/ntgdi/gdidebug.h"