diff --git a/reactos/subsys/win32k/Doxyfile b/reactos/subsystems/win32/win32k/Doxyfile
similarity index 100%
rename from reactos/subsys/win32k/Doxyfile
rename to reactos/subsystems/win32/win32k/Doxyfile
diff --git a/reactos/subsys/win32k/dib/dib.c b/reactos/subsystems/win32/win32k/dib/dib.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib.c
rename to reactos/subsystems/win32/win32k/dib/dib.c
diff --git a/reactos/subsys/win32k/dib/dib.h b/reactos/subsystems/win32/win32k/dib/dib.h
similarity index 100%
rename from reactos/subsys/win32k/dib/dib.h
rename to reactos/subsystems/win32/win32k/dib/dib.h
diff --git a/reactos/subsys/win32k/dib/dib16bpp.c b/reactos/subsystems/win32/win32k/dib/dib16bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib16bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib16bpp.c
diff --git a/reactos/subsys/win32k/dib/dib1bpp.c b/reactos/subsystems/win32/win32k/dib/dib1bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib1bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib1bpp.c
diff --git a/reactos/subsys/win32k/dib/dib24bpp.c b/reactos/subsystems/win32/win32k/dib/dib24bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib24bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib24bpp.c
diff --git a/reactos/subsys/win32k/dib/dib32bpp.c b/reactos/subsystems/win32/win32k/dib/dib32bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib32bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib32bpp.c
diff --git a/reactos/subsys/win32k/dib/dib4bpp.c b/reactos/subsystems/win32/win32k/dib/dib4bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib4bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib4bpp.c
diff --git a/reactos/subsys/win32k/dib/dib8bpp.c b/reactos/subsystems/win32/win32k/dib/dib8bpp.c
similarity index 100%
rename from reactos/subsys/win32k/dib/dib8bpp.c
rename to reactos/subsystems/win32/win32k/dib/dib8bpp.c
diff --git a/reactos/subsys/win32k/eng/bitblt.c b/reactos/subsystems/win32/win32k/eng/bitblt.c
similarity index 100%
rename from reactos/subsys/win32k/eng/bitblt.c
rename to reactos/subsystems/win32/win32k/eng/bitblt.c
diff --git a/reactos/subsys/win32k/eng/clip.c b/reactos/subsystems/win32/win32k/eng/clip.c
similarity index 100%
rename from reactos/subsys/win32k/eng/clip.c
rename to reactos/subsystems/win32/win32k/eng/clip.c
diff --git a/reactos/subsys/win32k/eng/copybits.c b/reactos/subsystems/win32/win32k/eng/copybits.c
similarity index 100%
rename from reactos/subsys/win32k/eng/copybits.c
rename to reactos/subsystems/win32/win32k/eng/copybits.c
diff --git a/reactos/subsys/win32k/eng/debug.c b/reactos/subsystems/win32/win32k/eng/debug.c
similarity index 100%
rename from reactos/subsys/win32k/eng/debug.c
rename to reactos/subsystems/win32/win32k/eng/debug.c
diff --git a/reactos/subsys/win32k/eng/device.c b/reactos/subsystems/win32/win32k/eng/device.c
similarity index 100%
rename from reactos/subsys/win32k/eng/device.c
rename to reactos/subsystems/win32/win32k/eng/device.c
diff --git a/reactos/subsys/win32k/eng/driverobj.c b/reactos/subsystems/win32/win32k/eng/driverobj.c
similarity index 100%
rename from reactos/subsys/win32k/eng/driverobj.c
rename to reactos/subsystems/win32/win32k/eng/driverobj.c
diff --git a/reactos/subsys/win32k/eng/engbrush.c b/reactos/subsystems/win32/win32k/eng/engbrush.c
similarity index 100%
rename from reactos/subsys/win32k/eng/engbrush.c
rename to reactos/subsystems/win32/win32k/eng/engbrush.c
diff --git a/reactos/subsys/win32k/eng/engmisc.c b/reactos/subsystems/win32/win32k/eng/engmisc.c
similarity index 100%
rename from reactos/subsys/win32k/eng/engmisc.c
rename to reactos/subsystems/win32/win32k/eng/engmisc.c
diff --git a/reactos/subsys/win32k/eng/engwindow.c b/reactos/subsystems/win32/win32k/eng/engwindow.c
similarity index 100%
rename from reactos/subsys/win32k/eng/engwindow.c
rename to reactos/subsystems/win32/win32k/eng/engwindow.c
diff --git a/reactos/subsys/win32k/eng/error.c b/reactos/subsystems/win32/win32k/eng/error.c
similarity index 100%
rename from reactos/subsys/win32k/eng/error.c
rename to reactos/subsystems/win32/win32k/eng/error.c
diff --git a/reactos/subsys/win32k/eng/event.c b/reactos/subsystems/win32/win32k/eng/event.c
similarity index 100%
rename from reactos/subsys/win32k/eng/event.c
rename to reactos/subsystems/win32/win32k/eng/event.c
diff --git a/reactos/subsys/win32k/eng/float.c b/reactos/subsystems/win32/win32k/eng/float.c
similarity index 100%
rename from reactos/subsys/win32k/eng/float.c
rename to reactos/subsystems/win32/win32k/eng/float.c
diff --git a/reactos/subsys/win32k/eng/gradient.c b/reactos/subsystems/win32/win32k/eng/gradient.c
similarity index 100%
rename from reactos/subsys/win32k/eng/gradient.c
rename to reactos/subsystems/win32/win32k/eng/gradient.c
diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsystems/win32/win32k/eng/lineto.c
similarity index 100%
rename from reactos/subsys/win32k/eng/lineto.c
rename to reactos/subsystems/win32/win32k/eng/lineto.c
diff --git a/reactos/subsys/win32k/eng/mem.c b/reactos/subsystems/win32/win32k/eng/mem.c
similarity index 100%
rename from reactos/subsys/win32k/eng/mem.c
rename to reactos/subsystems/win32/win32k/eng/mem.c
diff --git a/reactos/subsys/win32k/eng/misc.h b/reactos/subsystems/win32/win32k/eng/misc.h
similarity index 100%
rename from reactos/subsys/win32k/eng/misc.h
rename to reactos/subsystems/win32/win32k/eng/misc.h
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsystems/win32/win32k/eng/mouse.c
similarity index 100%
rename from reactos/subsys/win32k/eng/mouse.c
rename to reactos/subsystems/win32/win32k/eng/mouse.c
diff --git a/reactos/subsys/win32k/eng/objects.h b/reactos/subsystems/win32/win32k/eng/objects.h
similarity index 100%
rename from reactos/subsys/win32k/eng/objects.h
rename to reactos/subsystems/win32/win32k/eng/objects.h
diff --git a/reactos/subsys/win32k/eng/paint.c b/reactos/subsystems/win32/win32k/eng/paint.c
similarity index 100%
rename from reactos/subsys/win32k/eng/paint.c
rename to reactos/subsystems/win32/win32k/eng/paint.c
diff --git a/reactos/subsys/win32k/eng/palette.c b/reactos/subsystems/win32/win32k/eng/palette.c
similarity index 100%
rename from reactos/subsys/win32k/eng/palette.c
rename to reactos/subsystems/win32/win32k/eng/palette.c
diff --git a/reactos/subsys/win32k/eng/perfcnt.c b/reactos/subsystems/win32/win32k/eng/perfcnt.c
similarity index 100%
rename from reactos/subsys/win32k/eng/perfcnt.c
rename to reactos/subsystems/win32/win32k/eng/perfcnt.c
diff --git a/reactos/subsys/win32k/eng/semaphor.c b/reactos/subsystems/win32/win32k/eng/semaphor.c
similarity index 100%
rename from reactos/subsys/win32k/eng/semaphor.c
rename to reactos/subsystems/win32/win32k/eng/semaphor.c
diff --git a/reactos/subsys/win32k/eng/sort.c b/reactos/subsystems/win32/win32k/eng/sort.c
similarity index 100%
rename from reactos/subsys/win32k/eng/sort.c
rename to reactos/subsystems/win32/win32k/eng/sort.c
diff --git a/reactos/subsys/win32k/eng/surface.c b/reactos/subsystems/win32/win32k/eng/surface.c
similarity index 100%
rename from reactos/subsys/win32k/eng/surface.c
rename to reactos/subsystems/win32/win32k/eng/surface.c
diff --git a/reactos/subsys/win32k/eng/transblt.c b/reactos/subsystems/win32/win32k/eng/transblt.c
similarity index 100%
rename from reactos/subsys/win32k/eng/transblt.c
rename to reactos/subsystems/win32/win32k/eng/transblt.c
diff --git a/reactos/subsys/win32k/eng/xlate.c b/reactos/subsystems/win32/win32k/eng/xlate.c
similarity index 100%
rename from reactos/subsys/win32k/eng/xlate.c
rename to reactos/subsystems/win32/win32k/eng/xlate.c
diff --git a/reactos/subsys/win32k/include/accelerator.h b/reactos/subsystems/win32/win32k/include/accelerator.h
similarity index 100%
rename from reactos/subsys/win32k/include/accelerator.h
rename to reactos/subsystems/win32/win32k/include/accelerator.h
diff --git a/reactos/subsys/win32k/include/bitmaps.h b/reactos/subsystems/win32/win32k/include/bitmaps.h
similarity index 100%
rename from reactos/subsys/win32k/include/bitmaps.h
rename to reactos/subsystems/win32/win32k/include/bitmaps.h
diff --git a/reactos/subsys/win32k/include/brush.h b/reactos/subsystems/win32/win32k/include/brush.h
similarity index 100%
rename from reactos/subsys/win32k/include/brush.h
rename to reactos/subsystems/win32/win32k/include/brush.h
diff --git a/reactos/subsys/win32k/include/callback.h b/reactos/subsystems/win32/win32k/include/callback.h
similarity index 100%
rename from reactos/subsys/win32k/include/callback.h
rename to reactos/subsystems/win32/win32k/include/callback.h
diff --git a/reactos/subsys/win32k/include/caret.h b/reactos/subsystems/win32/win32k/include/caret.h
similarity index 100%
rename from reactos/subsys/win32k/include/caret.h
rename to reactos/subsystems/win32/win32k/include/caret.h
diff --git a/reactos/subsys/win32k/include/class.h b/reactos/subsystems/win32/win32k/include/class.h
similarity index 100%
rename from reactos/subsys/win32k/include/class.h
rename to reactos/subsystems/win32/win32k/include/class.h
diff --git a/reactos/subsys/win32k/include/cleanup.h b/reactos/subsystems/win32/win32k/include/cleanup.h
similarity index 100%
rename from reactos/subsys/win32k/include/cleanup.h
rename to reactos/subsystems/win32/win32k/include/cleanup.h
diff --git a/reactos/subsys/win32k/include/clipboard.h b/reactos/subsystems/win32/win32k/include/clipboard.h
similarity index 100%
rename from reactos/subsys/win32k/include/clipboard.h
rename to reactos/subsystems/win32/win32k/include/clipboard.h
diff --git a/reactos/subsys/win32k/include/color.h b/reactos/subsystems/win32/win32k/include/color.h
similarity index 100%
rename from reactos/subsys/win32k/include/color.h
rename to reactos/subsystems/win32/win32k/include/color.h
diff --git a/reactos/subsys/win32k/include/coord.h b/reactos/subsystems/win32/win32k/include/coord.h
similarity index 100%
rename from reactos/subsys/win32k/include/coord.h
rename to reactos/subsystems/win32/win32k/include/coord.h
diff --git a/reactos/subsys/win32k/include/csr.h b/reactos/subsystems/win32/win32k/include/csr.h
similarity index 100%
rename from reactos/subsys/win32k/include/csr.h
rename to reactos/subsystems/win32/win32k/include/csr.h
diff --git a/reactos/subsys/win32k/include/cursoricon.h b/reactos/subsystems/win32/win32k/include/cursoricon.h
similarity index 100%
rename from reactos/subsys/win32k/include/cursoricon.h
rename to reactos/subsystems/win32/win32k/include/cursoricon.h
diff --git a/reactos/subsys/win32k/include/dc.h b/reactos/subsystems/win32/win32k/include/dc.h
similarity index 100%
rename from reactos/subsys/win32k/include/dc.h
rename to reactos/subsystems/win32/win32k/include/dc.h
diff --git a/reactos/subsys/win32k/include/dce.h b/reactos/subsystems/win32/win32k/include/dce.h
similarity index 100%
rename from reactos/subsys/win32k/include/dce.h
rename to reactos/subsystems/win32/win32k/include/dce.h
diff --git a/reactos/subsys/win32k/include/desktop.h b/reactos/subsystems/win32/win32k/include/desktop.h
similarity index 100%
rename from reactos/subsys/win32k/include/desktop.h
rename to reactos/subsystems/win32/win32k/include/desktop.h
diff --git a/reactos/subsys/win32k/include/dib.h b/reactos/subsystems/win32/win32k/include/dib.h
similarity index 100%
rename from reactos/subsys/win32k/include/dib.h
rename to reactos/subsystems/win32/win32k/include/dib.h
diff --git a/reactos/subsys/win32k/include/driver.h b/reactos/subsystems/win32/win32k/include/driver.h
similarity index 100%
rename from reactos/subsys/win32k/include/driver.h
rename to reactos/subsystems/win32/win32k/include/driver.h
diff --git a/reactos/subsys/win32k/include/eng.h b/reactos/subsystems/win32/win32k/include/eng.h
similarity index 100%
rename from reactos/subsys/win32k/include/eng.h
rename to reactos/subsystems/win32/win32k/include/eng.h
diff --git a/reactos/subsys/win32k/include/error.h b/reactos/subsystems/win32/win32k/include/error.h
similarity index 100%
rename from reactos/subsys/win32k/include/error.h
rename to reactos/subsystems/win32/win32k/include/error.h
diff --git a/reactos/subsys/win32k/include/focus.h b/reactos/subsystems/win32/win32k/include/focus.h
similarity index 100%
rename from reactos/subsys/win32k/include/focus.h
rename to reactos/subsystems/win32/win32k/include/focus.h
diff --git a/reactos/subsys/win32k/include/gdifloat.h b/reactos/subsystems/win32/win32k/include/gdifloat.h
similarity index 100%
rename from reactos/subsys/win32k/include/gdifloat.h
rename to reactos/subsystems/win32/win32k/include/gdifloat.h
diff --git a/reactos/subsys/win32k/include/gdiobj.h b/reactos/subsystems/win32/win32k/include/gdiobj.h
similarity index 100%
rename from reactos/subsys/win32k/include/gdiobj.h
rename to reactos/subsystems/win32/win32k/include/gdiobj.h
diff --git a/reactos/subsys/win32k/include/guicheck.h b/reactos/subsystems/win32/win32k/include/guicheck.h
similarity index 100%
rename from reactos/subsys/win32k/include/guicheck.h
rename to reactos/subsystems/win32/win32k/include/guicheck.h
diff --git a/reactos/subsys/win32k/include/hook.h b/reactos/subsystems/win32/win32k/include/hook.h
similarity index 100%
rename from reactos/subsys/win32k/include/hook.h
rename to reactos/subsystems/win32/win32k/include/hook.h
diff --git a/reactos/subsys/win32k/include/hotkey.h b/reactos/subsystems/win32/win32k/include/hotkey.h
similarity index 100%
rename from reactos/subsys/win32k/include/hotkey.h
rename to reactos/subsystems/win32/win32k/include/hotkey.h
diff --git a/reactos/subsys/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h
similarity index 100%
rename from reactos/subsys/win32k/include/input.h
rename to reactos/subsystems/win32/win32k/include/input.h
diff --git a/reactos/subsys/win32k/include/intddraw.h b/reactos/subsystems/win32/win32k/include/intddraw.h
similarity index 100%
rename from reactos/subsys/win32k/include/intddraw.h
rename to reactos/subsystems/win32/win32k/include/intddraw.h
diff --git a/reactos/subsys/win32k/include/inteng.h b/reactos/subsystems/win32/win32k/include/inteng.h
similarity index 100%
rename from reactos/subsys/win32k/include/inteng.h
rename to reactos/subsystems/win32/win32k/include/inteng.h
diff --git a/reactos/subsys/win32k/include/intgdi.h b/reactos/subsystems/win32/win32k/include/intgdi.h
similarity index 100%
rename from reactos/subsys/win32k/include/intgdi.h
rename to reactos/subsystems/win32/win32k/include/intgdi.h
diff --git a/reactos/subsys/win32k/include/menu.h b/reactos/subsystems/win32/win32k/include/menu.h
similarity index 100%
rename from reactos/subsys/win32k/include/menu.h
rename to reactos/subsystems/win32/win32k/include/menu.h
diff --git a/reactos/subsys/win32k/include/misc.h b/reactos/subsystems/win32/win32k/include/misc.h
similarity index 100%
rename from reactos/subsys/win32k/include/misc.h
rename to reactos/subsystems/win32/win32k/include/misc.h
diff --git a/reactos/subsys/win32k/include/mmcopy.h b/reactos/subsystems/win32/win32k/include/mmcopy.h
similarity index 100%
rename from reactos/subsys/win32k/include/mmcopy.h
rename to reactos/subsystems/win32/win32k/include/mmcopy.h
diff --git a/reactos/subsys/win32k/include/monitor.h b/reactos/subsystems/win32/win32k/include/monitor.h
similarity index 100%
rename from reactos/subsys/win32k/include/monitor.h
rename to reactos/subsystems/win32/win32k/include/monitor.h
diff --git a/reactos/subsys/win32k/include/mouse.h b/reactos/subsystems/win32/win32k/include/mouse.h
similarity index 100%
rename from reactos/subsys/win32k/include/mouse.h
rename to reactos/subsystems/win32/win32k/include/mouse.h
diff --git a/reactos/subsys/win32k/include/msgqueue.h b/reactos/subsystems/win32/win32k/include/msgqueue.h
similarity index 100%
rename from reactos/subsys/win32k/include/msgqueue.h
rename to reactos/subsystems/win32/win32k/include/msgqueue.h
diff --git a/reactos/subsys/win32k/include/ntuser.h b/reactos/subsystems/win32/win32k/include/ntuser.h
similarity index 100%
rename from reactos/subsys/win32k/include/ntuser.h
rename to reactos/subsystems/win32/win32k/include/ntuser.h
diff --git a/reactos/subsys/win32k/include/object.h b/reactos/subsystems/win32/win32k/include/object.h
similarity index 100%
rename from reactos/subsys/win32k/include/object.h
rename to reactos/subsystems/win32/win32k/include/object.h
diff --git a/reactos/subsys/win32k/include/paint.h b/reactos/subsystems/win32/win32k/include/paint.h
similarity index 100%
rename from reactos/subsys/win32k/include/paint.h
rename to reactos/subsystems/win32/win32k/include/paint.h
diff --git a/reactos/subsys/win32k/include/painting.h b/reactos/subsystems/win32/win32k/include/painting.h
similarity index 100%
rename from reactos/subsys/win32k/include/painting.h
rename to reactos/subsystems/win32/win32k/include/painting.h
diff --git a/reactos/subsys/win32k/include/palette.h b/reactos/subsystems/win32/win32k/include/palette.h
similarity index 100%
rename from reactos/subsys/win32k/include/palette.h
rename to reactos/subsystems/win32/win32k/include/palette.h
diff --git a/reactos/subsys/win32k/include/path.h b/reactos/subsystems/win32/win32k/include/path.h
similarity index 100%
rename from reactos/subsys/win32k/include/path.h
rename to reactos/subsystems/win32/win32k/include/path.h
diff --git a/reactos/subsys/win32k/include/pen.h b/reactos/subsystems/win32/win32k/include/pen.h
similarity index 100%
rename from reactos/subsys/win32k/include/pen.h
rename to reactos/subsystems/win32/win32k/include/pen.h
diff --git a/reactos/subsys/win32k/include/prop.h b/reactos/subsystems/win32/win32k/include/prop.h
similarity index 100%
rename from reactos/subsys/win32k/include/prop.h
rename to reactos/subsystems/win32/win32k/include/prop.h
diff --git a/reactos/subsys/win32k/include/rect.h b/reactos/subsystems/win32/win32k/include/rect.h
similarity index 100%
rename from reactos/subsys/win32k/include/rect.h
rename to reactos/subsystems/win32/win32k/include/rect.h
diff --git a/reactos/subsys/win32k/include/region.h b/reactos/subsystems/win32/win32k/include/region.h
similarity index 100%
rename from reactos/subsys/win32k/include/region.h
rename to reactos/subsystems/win32/win32k/include/region.h
diff --git a/reactos/subsys/win32k/include/scroll.h b/reactos/subsystems/win32/win32k/include/scroll.h
similarity index 100%
rename from reactos/subsys/win32k/include/scroll.h
rename to reactos/subsystems/win32/win32k/include/scroll.h
diff --git a/reactos/subsys/win32k/include/ssec.h b/reactos/subsystems/win32/win32k/include/ssec.h
similarity index 100%
rename from reactos/subsys/win32k/include/ssec.h
rename to reactos/subsystems/win32/win32k/include/ssec.h
diff --git a/reactos/subsys/win32k/include/surface.h b/reactos/subsystems/win32/win32k/include/surface.h
similarity index 100%
rename from reactos/subsys/win32k/include/surface.h
rename to reactos/subsystems/win32/win32k/include/surface.h
diff --git a/reactos/subsys/win32k/include/tags.h b/reactos/subsystems/win32/win32k/include/tags.h
similarity index 100%
rename from reactos/subsys/win32k/include/tags.h
rename to reactos/subsystems/win32/win32k/include/tags.h
diff --git a/reactos/subsys/win32k/include/text.h b/reactos/subsystems/win32/win32k/include/text.h
similarity index 100%
rename from reactos/subsys/win32k/include/text.h
rename to reactos/subsystems/win32/win32k/include/text.h
diff --git a/reactos/subsys/win32k/include/timer.h b/reactos/subsystems/win32/win32k/include/timer.h
similarity index 100%
rename from reactos/subsys/win32k/include/timer.h
rename to reactos/subsystems/win32/win32k/include/timer.h
diff --git a/reactos/subsys/win32k/include/useratom.h b/reactos/subsystems/win32/win32k/include/useratom.h
similarity index 100%
rename from reactos/subsys/win32k/include/useratom.h
rename to reactos/subsystems/win32/win32k/include/useratom.h
diff --git a/reactos/subsys/win32k/include/userfuncs.h b/reactos/subsystems/win32/win32k/include/userfuncs.h
similarity index 100%
rename from reactos/subsys/win32k/include/userfuncs.h
rename to reactos/subsystems/win32/win32k/include/userfuncs.h
diff --git a/reactos/subsys/win32k/include/vis.h b/reactos/subsystems/win32/win32k/include/vis.h
similarity index 100%
rename from reactos/subsys/win32k/include/vis.h
rename to reactos/subsystems/win32/win32k/include/vis.h
diff --git a/reactos/subsys/win32k/include/win32.h b/reactos/subsystems/win32/win32k/include/win32.h
similarity index 100%
rename from reactos/subsys/win32k/include/win32.h
rename to reactos/subsystems/win32/win32k/include/win32.h
diff --git a/reactos/subsys/win32k/include/win32k.h b/reactos/subsystems/win32/win32k/include/win32k.h
similarity index 100%
rename from reactos/subsys/win32k/include/win32k.h
rename to reactos/subsystems/win32/win32k/include/win32k.h
diff --git a/reactos/subsys/win32k/include/window.h b/reactos/subsystems/win32/win32k/include/window.h
similarity index 100%
rename from reactos/subsys/win32k/include/window.h
rename to reactos/subsystems/win32/win32k/include/window.h
diff --git a/reactos/subsys/win32k/include/winpos.h b/reactos/subsystems/win32/win32k/include/winpos.h
similarity index 100%
rename from reactos/subsys/win32k/include/winpos.h
rename to reactos/subsystems/win32/win32k/include/winpos.h
diff --git a/reactos/subsys/win32k/include/winsta.h b/reactos/subsystems/win32/win32k/include/winsta.h
similarity index 100%
rename from reactos/subsys/win32k/include/winsta.h
rename to reactos/subsystems/win32/win32k/include/winsta.h
diff --git a/reactos/subsys/win32k/ldr/loader.c b/reactos/subsystems/win32/win32k/ldr/loader.c
similarity index 100%
rename from reactos/subsys/win32k/ldr/loader.c
rename to reactos/subsystems/win32/win32k/ldr/loader.c
diff --git a/reactos/subsys/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c
similarity index 100%
rename from reactos/subsys/win32k/main/dllmain.c
rename to reactos/subsystems/win32/win32k/main/dllmain.c
diff --git a/reactos/subsys/win32k/misc/copy.c b/reactos/subsystems/win32/win32k/misc/copy.c
similarity index 100%
rename from reactos/subsys/win32k/misc/copy.c
rename to reactos/subsystems/win32/win32k/misc/copy.c
diff --git a/reactos/subsys/win32k/misc/driver.c b/reactos/subsystems/win32/win32k/misc/driver.c
similarity index 100%
rename from reactos/subsys/win32k/misc/driver.c
rename to reactos/subsystems/win32/win32k/misc/driver.c
diff --git a/reactos/subsys/win32k/misc/err.c b/reactos/subsystems/win32/win32k/misc/err.c
similarity index 100%
rename from reactos/subsys/win32k/misc/err.c
rename to reactos/subsystems/win32/win32k/misc/err.c
diff --git a/reactos/subsys/win32k/misc/i386/atan2_asm.s b/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s
similarity index 100%
rename from reactos/subsys/win32k/misc/i386/atan2_asm.s
rename to reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s
diff --git a/reactos/subsys/win32k/misc/i386/ceil_asm.s b/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s
similarity index 100%
rename from reactos/subsys/win32k/misc/i386/ceil_asm.s
rename to reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s
diff --git a/reactos/subsys/win32k/misc/i386/cos_asm.s b/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s
similarity index 100%
rename from reactos/subsys/win32k/misc/i386/cos_asm.s
rename to reactos/subsystems/win32/win32k/misc/i386/cos_asm.s
diff --git a/reactos/subsys/win32k/misc/i386/floor_asm.s b/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s
similarity index 100%
rename from reactos/subsys/win32k/misc/i386/floor_asm.s
rename to reactos/subsystems/win32/win32k/misc/i386/floor_asm.s
diff --git a/reactos/subsys/win32k/misc/i386/sin_asm.s b/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s
similarity index 100%
rename from reactos/subsys/win32k/misc/i386/sin_asm.s
rename to reactos/subsystems/win32/win32k/misc/i386/sin_asm.s
diff --git a/reactos/subsys/win32k/misc/math.c b/reactos/subsystems/win32/win32k/misc/math.c
similarity index 100%
rename from reactos/subsys/win32k/misc/math.c
rename to reactos/subsystems/win32/win32k/misc/math.c
diff --git a/reactos/subsys/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
similarity index 100%
rename from reactos/subsys/win32k/ntddraw/ddraw.c
rename to reactos/subsystems/win32/win32k/ntddraw/ddraw.c
diff --git a/reactos/subsys/win32k/ntddraw/stubs.c b/reactos/subsystems/win32/win32k/ntddraw/stubs.c
similarity index 100%
rename from reactos/subsys/win32k/ntddraw/stubs.c
rename to reactos/subsystems/win32/win32k/ntddraw/stubs.c
diff --git a/reactos/subsys/win32k/ntuser/accelerator.c b/reactos/subsystems/win32/win32k/ntuser/accelerator.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/accelerator.c
rename to reactos/subsystems/win32/win32k/ntuser/accelerator.c
diff --git a/reactos/subsys/win32k/ntuser/callback.c b/reactos/subsystems/win32/win32k/ntuser/callback.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/callback.c
rename to reactos/subsystems/win32/win32k/ntuser/callback.c
diff --git a/reactos/subsys/win32k/ntuser/caret.c b/reactos/subsystems/win32/win32k/ntuser/caret.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/caret.c
rename to reactos/subsystems/win32/win32k/ntuser/caret.c
diff --git a/reactos/subsys/win32k/ntuser/class.c b/reactos/subsystems/win32/win32k/ntuser/class.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/class.c
rename to reactos/subsystems/win32/win32k/ntuser/class.c
diff --git a/reactos/subsys/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/clipboard.c
rename to reactos/subsystems/win32/win32k/ntuser/clipboard.c
diff --git a/reactos/subsys/win32k/ntuser/csr.c b/reactos/subsystems/win32/win32k/ntuser/csr.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/csr.c
rename to reactos/subsystems/win32/win32k/ntuser/csr.c
diff --git a/reactos/subsys/win32k/ntuser/cursoricon.c b/reactos/subsystems/win32/win32k/ntuser/cursoricon.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/cursoricon.c
rename to reactos/subsystems/win32/win32k/ntuser/cursoricon.c
diff --git a/reactos/subsys/win32k/ntuser/desktop.c b/reactos/subsystems/win32/win32k/ntuser/desktop.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/desktop.c
rename to reactos/subsystems/win32/win32k/ntuser/desktop.c
diff --git a/reactos/subsys/win32k/ntuser/focus.c b/reactos/subsystems/win32/win32k/ntuser/focus.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/focus.c
rename to reactos/subsystems/win32/win32k/ntuser/focus.c
diff --git a/reactos/subsys/win32k/ntuser/guicheck.c b/reactos/subsystems/win32/win32k/ntuser/guicheck.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/guicheck.c
rename to reactos/subsystems/win32/win32k/ntuser/guicheck.c
diff --git a/reactos/subsys/win32k/ntuser/hook.c b/reactos/subsystems/win32/win32k/ntuser/hook.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/hook.c
rename to reactos/subsystems/win32/win32k/ntuser/hook.c
diff --git a/reactos/subsys/win32k/ntuser/hotkey.c b/reactos/subsystems/win32/win32k/ntuser/hotkey.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/hotkey.c
rename to reactos/subsystems/win32/win32k/ntuser/hotkey.c
diff --git a/reactos/subsys/win32k/ntuser/input.c b/reactos/subsystems/win32/win32k/ntuser/input.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/input.c
rename to reactos/subsystems/win32/win32k/ntuser/input.c
diff --git a/reactos/subsys/win32k/ntuser/keyboard.c b/reactos/subsystems/win32/win32k/ntuser/keyboard.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/keyboard.c
rename to reactos/subsystems/win32/win32k/ntuser/keyboard.c
diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsystems/win32/win32k/ntuser/menu.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/menu.c
rename to reactos/subsystems/win32/win32k/ntuser/menu.c
diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsystems/win32/win32k/ntuser/message.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/message.c
rename to reactos/subsystems/win32/win32k/ntuser/message.c
diff --git a/reactos/subsys/win32k/ntuser/metric.c b/reactos/subsystems/win32/win32k/ntuser/metric.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/metric.c
rename to reactos/subsystems/win32/win32k/ntuser/metric.c
diff --git a/reactos/subsys/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/misc.c
rename to reactos/subsystems/win32/win32k/ntuser/misc.c
diff --git a/reactos/subsys/win32k/ntuser/monitor.c b/reactos/subsystems/win32/win32k/ntuser/monitor.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/monitor.c
rename to reactos/subsystems/win32/win32k/ntuser/monitor.c
diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsystems/win32/win32k/ntuser/msgqueue.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/msgqueue.c
rename to reactos/subsystems/win32/win32k/ntuser/msgqueue.c
diff --git a/reactos/subsys/win32k/ntuser/ntstubs.c b/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/ntstubs.c
rename to reactos/subsystems/win32/win32k/ntuser/ntstubs.c
diff --git a/reactos/subsys/win32k/ntuser/ntuser.c b/reactos/subsystems/win32/win32k/ntuser/ntuser.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/ntuser.c
rename to reactos/subsystems/win32/win32k/ntuser/ntuser.c
diff --git a/reactos/subsys/win32k/ntuser/object.c b/reactos/subsystems/win32/win32k/ntuser/object.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/object.c
rename to reactos/subsystems/win32/win32k/ntuser/object.c
diff --git a/reactos/subsys/win32k/ntuser/painting.c b/reactos/subsystems/win32/win32k/ntuser/painting.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/painting.c
rename to reactos/subsystems/win32/win32k/ntuser/painting.c
diff --git a/reactos/subsys/win32k/ntuser/prop.c b/reactos/subsystems/win32/win32k/ntuser/prop.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/prop.c
rename to reactos/subsystems/win32/win32k/ntuser/prop.c
diff --git a/reactos/subsys/win32k/ntuser/scrollbar.c b/reactos/subsystems/win32/win32k/ntuser/scrollbar.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/scrollbar.c
rename to reactos/subsystems/win32/win32k/ntuser/scrollbar.c
diff --git a/reactos/subsys/win32k/ntuser/session.c b/reactos/subsystems/win32/win32k/ntuser/session.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/session.c
rename to reactos/subsystems/win32/win32k/ntuser/session.c
diff --git a/reactos/subsys/win32k/ntuser/ssec.c b/reactos/subsystems/win32/win32k/ntuser/ssec.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/ssec.c
rename to reactos/subsystems/win32/win32k/ntuser/ssec.c
diff --git a/reactos/subsys/win32k/ntuser/timer.c b/reactos/subsystems/win32/win32k/ntuser/timer.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/timer.c
rename to reactos/subsystems/win32/win32k/ntuser/timer.c
diff --git a/reactos/subsys/win32k/ntuser/useratom.c b/reactos/subsystems/win32/win32k/ntuser/useratom.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/useratom.c
rename to reactos/subsystems/win32/win32k/ntuser/useratom.c
diff --git a/reactos/subsys/win32k/ntuser/vis.c b/reactos/subsystems/win32/win32k/ntuser/vis.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/vis.c
rename to reactos/subsystems/win32/win32k/ntuser/vis.c
diff --git a/reactos/subsys/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/windc.c
rename to reactos/subsystems/win32/win32k/ntuser/windc.c
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsystems/win32/win32k/ntuser/window.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/window.c
rename to reactos/subsystems/win32/win32k/ntuser/window.c
diff --git a/reactos/subsys/win32k/ntuser/winpos.c b/reactos/subsystems/win32/win32k/ntuser/winpos.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/winpos.c
rename to reactos/subsystems/win32/win32k/ntuser/winpos.c
diff --git a/reactos/subsys/win32k/ntuser/winsta.c b/reactos/subsystems/win32/win32k/ntuser/winsta.c
similarity index 100%
rename from reactos/subsys/win32k/ntuser/winsta.c
rename to reactos/subsystems/win32/win32k/ntuser/winsta.c
diff --git a/reactos/subsys/win32k/objects/bezier.c b/reactos/subsystems/win32/win32k/objects/bezier.c
similarity index 100%
rename from reactos/subsys/win32k/objects/bezier.c
rename to reactos/subsystems/win32/win32k/objects/bezier.c
diff --git a/reactos/subsys/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c
similarity index 100%
rename from reactos/subsys/win32k/objects/bitmaps.c
rename to reactos/subsystems/win32/win32k/objects/bitmaps.c
diff --git a/reactos/subsys/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c
similarity index 100%
rename from reactos/subsys/win32k/objects/brush.c
rename to reactos/subsystems/win32/win32k/objects/brush.c
diff --git a/reactos/subsys/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c
similarity index 100%
rename from reactos/subsys/win32k/objects/cliprgn.c
rename to reactos/subsystems/win32/win32k/objects/cliprgn.c
diff --git a/reactos/subsys/win32k/objects/color.c b/reactos/subsystems/win32/win32k/objects/color.c
similarity index 100%
rename from reactos/subsys/win32k/objects/color.c
rename to reactos/subsystems/win32/win32k/objects/color.c
diff --git a/reactos/subsys/win32k/objects/coord.c b/reactos/subsystems/win32/win32k/objects/coord.c
similarity index 100%
rename from reactos/subsys/win32k/objects/coord.c
rename to reactos/subsystems/win32/win32k/objects/coord.c
diff --git a/reactos/subsys/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c
similarity index 100%
rename from reactos/subsys/win32k/objects/dc.c
rename to reactos/subsystems/win32/win32k/objects/dc.c
diff --git a/reactos/subsys/win32k/objects/dibobj.c b/reactos/subsystems/win32/win32k/objects/dibobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/dibobj.c
rename to reactos/subsystems/win32/win32k/objects/dibobj.c
diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsystems/win32/win32k/objects/fillshap.c
similarity index 100%
rename from reactos/subsys/win32k/objects/fillshap.c
rename to reactos/subsystems/win32/win32k/objects/fillshap.c
diff --git a/reactos/subsys/win32k/objects/font.c b/reactos/subsystems/win32/win32k/objects/font.c
similarity index 100%
rename from reactos/subsys/win32k/objects/font.c
rename to reactos/subsystems/win32/win32k/objects/font.c
diff --git a/reactos/subsys/win32k/objects/gdiobj.c b/reactos/subsystems/win32/win32k/objects/gdiobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/gdiobj.c
rename to reactos/subsystems/win32/win32k/objects/gdiobj.c
diff --git a/reactos/subsys/win32k/objects/icm.c b/reactos/subsystems/win32/win32k/objects/icm.c
similarity index 100%
rename from reactos/subsys/win32k/objects/icm.c
rename to reactos/subsystems/win32/win32k/objects/icm.c
diff --git a/reactos/subsys/win32k/objects/line.c b/reactos/subsystems/win32/win32k/objects/line.c
similarity index 100%
rename from reactos/subsys/win32k/objects/line.c
rename to reactos/subsystems/win32/win32k/objects/line.c
diff --git a/reactos/subsys/win32k/objects/metafile.c b/reactos/subsystems/win32/win32k/objects/metafile.c
similarity index 100%
rename from reactos/subsys/win32k/objects/metafile.c
rename to reactos/subsystems/win32/win32k/objects/metafile.c
diff --git a/reactos/subsys/win32k/objects/paintobj.c b/reactos/subsystems/win32/win32k/objects/paintobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/paintobj.c
rename to reactos/subsystems/win32/win32k/objects/paintobj.c
diff --git a/reactos/subsys/win32k/objects/palobj.c b/reactos/subsystems/win32/win32k/objects/palobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/palobj.c
rename to reactos/subsystems/win32/win32k/objects/palobj.c
diff --git a/reactos/subsys/win32k/objects/path.c b/reactos/subsystems/win32/win32k/objects/path.c
similarity index 100%
rename from reactos/subsys/win32k/objects/path.c
rename to reactos/subsystems/win32/win32k/objects/path.c
diff --git a/reactos/subsys/win32k/objects/pen.c b/reactos/subsystems/win32/win32k/objects/pen.c
similarity index 100%
rename from reactos/subsys/win32k/objects/pen.c
rename to reactos/subsystems/win32/win32k/objects/pen.c
diff --git a/reactos/subsys/win32k/objects/polyfill.c b/reactos/subsystems/win32/win32k/objects/polyfill.c
similarity index 100%
rename from reactos/subsys/win32k/objects/polyfill.c
rename to reactos/subsystems/win32/win32k/objects/polyfill.c
diff --git a/reactos/subsys/win32k/objects/print.c b/reactos/subsystems/win32/win32k/objects/print.c
similarity index 100%
rename from reactos/subsys/win32k/objects/print.c
rename to reactos/subsystems/win32/win32k/objects/print.c
diff --git a/reactos/subsys/win32k/objects/rect.c b/reactos/subsystems/win32/win32k/objects/rect.c
similarity index 100%
rename from reactos/subsys/win32k/objects/rect.c
rename to reactos/subsystems/win32/win32k/objects/rect.c
diff --git a/reactos/subsys/win32k/objects/region.c b/reactos/subsystems/win32/win32k/objects/region.c
similarity index 100%
rename from reactos/subsys/win32k/objects/region.c
rename to reactos/subsystems/win32/win32k/objects/region.c
diff --git a/reactos/subsys/win32k/objects/stockobj.c b/reactos/subsystems/win32/win32k/objects/stockobj.c
similarity index 100%
rename from reactos/subsys/win32k/objects/stockobj.c
rename to reactos/subsystems/win32/win32k/objects/stockobj.c
diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
similarity index 100%
rename from reactos/subsys/win32k/objects/text.c
rename to reactos/subsystems/win32/win32k/objects/text.c
diff --git a/reactos/subsys/win32k/objects/wingl.c b/reactos/subsystems/win32/win32k/objects/wingl.c
similarity index 100%
rename from reactos/subsys/win32k/objects/wingl.c
rename to reactos/subsystems/win32/win32k/objects/wingl.c
diff --git a/reactos/subsys/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c
similarity index 100%
rename from reactos/subsys/win32k/stubs/stubs.c
rename to reactos/subsystems/win32/win32k/stubs/stubs.c
diff --git a/reactos/subsys/win32k/stubs/xpstubs.c b/reactos/subsystems/win32/win32k/stubs/xpstubs.c
similarity index 100%
rename from reactos/subsys/win32k/stubs/xpstubs.c
rename to reactos/subsystems/win32/win32k/stubs/xpstubs.c
diff --git a/reactos/subsys/win32k/tests/setup.c b/reactos/subsystems/win32/win32k/tests/setup.c
similarity index 100%
rename from reactos/subsys/win32k/tests/setup.c
rename to reactos/subsystems/win32/win32k/tests/setup.c
diff --git a/reactos/subsys/win32k/tests/stubs.xml b/reactos/subsystems/win32/win32k/tests/stubs.xml
similarity index 100%
rename from reactos/subsys/win32k/tests/stubs.xml
rename to reactos/subsystems/win32/win32k/tests/stubs.xml
diff --git a/reactos/subsys/win32k/tests/tests/eng-mem-1.c b/reactos/subsystems/win32/win32k/tests/tests/eng-mem-1.c
similarity index 100%
rename from reactos/subsys/win32k/tests/tests/eng-mem-1.c
rename to reactos/subsystems/win32/win32k/tests/tests/eng-mem-1.c
diff --git a/reactos/subsys/win32k/tests/win32k.xml b/reactos/subsystems/win32/win32k/tests/win32k.xml
similarity index 100%
rename from reactos/subsys/win32k/tests/win32k.xml
rename to reactos/subsystems/win32/win32k/tests/win32k.xml
diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsystems/win32/win32k/w32k.h
similarity index 100%
rename from reactos/subsys/win32k/w32k.h
rename to reactos/subsystems/win32/win32k/w32k.h
diff --git a/reactos/subsys/win32k/win32k.def b/reactos/subsystems/win32/win32k/win32k.def
similarity index 100%
rename from reactos/subsys/win32k/win32k.def
rename to reactos/subsystems/win32/win32k/win32k.def
diff --git a/reactos/subsys/win32k/win32k.rc b/reactos/subsystems/win32/win32k/win32k.rc
similarity index 100%
rename from reactos/subsys/win32k/win32k.rc
rename to reactos/subsystems/win32/win32k/win32k.rc
diff --git a/reactos/subsys/win32k/win32k.xml b/reactos/subsystems/win32/win32k/win32k.xml
similarity index 100%
rename from reactos/subsys/win32k/win32k.xml
rename to reactos/subsystems/win32/win32k/win32k.xml