diff --git a/reactos/drivers/CMakeLists.txt b/reactos/drivers/CMakeLists.txt
index 2465aad6c28..cba9e35982b 100644
--- a/reactos/drivers/CMakeLists.txt
+++ b/reactos/drivers/CMakeLists.txt
@@ -15,6 +15,5 @@ add_subdirectory(serial)
 add_subdirectory(setup)
 add_subdirectory(storage)
 add_subdirectory(usb)
-add_subdirectory(video)
 add_subdirectory(wdm)
 add_subdirectory(wmi)
diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index 3e54486264a..a086d5d4694 100644
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -1,3 +1,4 @@
 
+add_subdirectory(drivers)
 add_subdirectory(gdi/gdi32)
 add_subdirectory(user/user32)
diff --git a/reactos/drivers/video/CMakeLists.txt b/reactos/win32ss/drivers/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/CMakeLists.txt
rename to reactos/win32ss/drivers/CMakeLists.txt
diff --git a/reactos/drivers/video/displays/CMakeLists.txt b/reactos/win32ss/drivers/displays/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/displays/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/CMakeLists.txt
diff --git a/reactos/drivers/video/displays/framebuf/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt
diff --git a/reactos/drivers/video/displays/framebuf/dd.c b/reactos/win32ss/drivers/displays/framebuf/dd.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/dd.c
rename to reactos/win32ss/drivers/displays/framebuf/dd.c
diff --git a/reactos/drivers/video/displays/framebuf/ddenable.c b/reactos/win32ss/drivers/displays/framebuf/ddenable.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/ddenable.c
rename to reactos/win32ss/drivers/displays/framebuf/ddenable.c
diff --git a/reactos/drivers/video/displays/framebuf/enable.c b/reactos/win32ss/drivers/displays/framebuf/enable.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/enable.c
rename to reactos/win32ss/drivers/displays/framebuf/enable.c
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.h b/reactos/win32ss/drivers/displays/framebuf/framebuf.h
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/framebuf.h
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.h
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.rc b/reactos/win32ss/drivers/displays/framebuf/framebuf.rc
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/framebuf.rc
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.rc
diff --git a/reactos/drivers/video/displays/framebuf/framebuf.spec b/reactos/win32ss/drivers/displays/framebuf/framebuf.spec
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/framebuf.spec
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.spec
diff --git a/reactos/drivers/video/displays/framebuf/palette.c b/reactos/win32ss/drivers/displays/framebuf/palette.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/palette.c
rename to reactos/win32ss/drivers/displays/framebuf/palette.c
diff --git a/reactos/drivers/video/displays/framebuf/pointer.c b/reactos/win32ss/drivers/displays/framebuf/pointer.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/pointer.c
rename to reactos/win32ss/drivers/displays/framebuf/pointer.c
diff --git a/reactos/drivers/video/displays/framebuf/screen.c b/reactos/win32ss/drivers/displays/framebuf/screen.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/screen.c
rename to reactos/win32ss/drivers/displays/framebuf/screen.c
diff --git a/reactos/drivers/video/displays/framebuf/surface.c b/reactos/win32ss/drivers/displays/framebuf/surface.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf/surface.c
rename to reactos/win32ss/drivers/displays/framebuf/surface.c
diff --git a/reactos/drivers/video/displays/framebuf_new/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
diff --git a/reactos/drivers/video/displays/framebuf_new/debug.c b/reactos/win32ss/drivers/displays/framebuf_new/debug.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/debug.c
rename to reactos/win32ss/drivers/displays/framebuf_new/debug.c
diff --git a/reactos/drivers/video/displays/framebuf_new/debug.h b/reactos/win32ss/drivers/displays/framebuf_new/debug.h
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/debug.h
rename to reactos/win32ss/drivers/displays/framebuf_new/debug.h
diff --git a/reactos/drivers/video/displays/framebuf_new/driver.h b/reactos/win32ss/drivers/displays/framebuf_new/driver.h
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/driver.h
rename to reactos/win32ss/drivers/displays/framebuf_new/driver.h
diff --git a/reactos/drivers/video/displays/framebuf_new/enable.c b/reactos/win32ss/drivers/displays/framebuf_new/enable.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/enable.c
rename to reactos/win32ss/drivers/displays/framebuf_new/enable.c
diff --git a/reactos/drivers/video/displays/framebuf_new/framebuf_new.rc b/reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.rc
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/framebuf_new.rc
rename to reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.rc
diff --git a/reactos/drivers/video/displays/framebuf_new/framebuf_new.spec b/reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.spec
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/framebuf_new.spec
rename to reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.spec
diff --git a/reactos/drivers/video/displays/framebuf_new/palette.c b/reactos/win32ss/drivers/displays/framebuf_new/palette.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/palette.c
rename to reactos/win32ss/drivers/displays/framebuf_new/palette.c
diff --git a/reactos/drivers/video/displays/framebuf_new/pointer.c b/reactos/win32ss/drivers/displays/framebuf_new/pointer.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/pointer.c
rename to reactos/win32ss/drivers/displays/framebuf_new/pointer.c
diff --git a/reactos/drivers/video/displays/framebuf_new/screen.c b/reactos/win32ss/drivers/displays/framebuf_new/screen.c
similarity index 100%
rename from reactos/drivers/video/displays/framebuf_new/screen.c
rename to reactos/win32ss/drivers/displays/framebuf_new/screen.c
diff --git a/reactos/drivers/video/displays/framebufacc/dd.c b/reactos/win32ss/drivers/displays/framebufacc/dd.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/dd.c
rename to reactos/win32ss/drivers/displays/framebufacc/dd.c
diff --git a/reactos/drivers/video/displays/framebufacc/ddenable.c b/reactos/win32ss/drivers/displays/framebufacc/ddenable.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/ddenable.c
rename to reactos/win32ss/drivers/displays/framebufacc/ddenable.c
diff --git a/reactos/drivers/video/displays/framebufacc/enable.c b/reactos/win32ss/drivers/displays/framebufacc/enable.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/enable.c
rename to reactos/win32ss/drivers/displays/framebufacc/enable.c
diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.h b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.h
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/framebufacc.h
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.h
diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.rc b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.rc
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/framebufacc.rc
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.rc
diff --git a/reactos/drivers/video/displays/framebufacc/framebufacc.spec b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.spec
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/framebufacc.spec
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.spec
diff --git a/reactos/drivers/video/displays/framebufacc/palette.c b/reactos/win32ss/drivers/displays/framebufacc/palette.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/palette.c
rename to reactos/win32ss/drivers/displays/framebufacc/palette.c
diff --git a/reactos/drivers/video/displays/framebufacc/pointer.c b/reactos/win32ss/drivers/displays/framebufacc/pointer.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/pointer.c
rename to reactos/win32ss/drivers/displays/framebufacc/pointer.c
diff --git a/reactos/drivers/video/displays/framebufacc/screen.c b/reactos/win32ss/drivers/displays/framebufacc/screen.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/screen.c
rename to reactos/win32ss/drivers/displays/framebufacc/screen.c
diff --git a/reactos/drivers/video/displays/framebufacc/surface.c b/reactos/win32ss/drivers/displays/framebufacc/surface.c
similarity index 100%
rename from reactos/drivers/video/displays/framebufacc/surface.c
rename to reactos/win32ss/drivers/displays/framebufacc/surface.c
diff --git a/reactos/drivers/video/displays/vga/CMakeLists.txt b/reactos/win32ss/drivers/displays/vga/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/displays/vga/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/vga/CMakeLists.txt
diff --git a/reactos/drivers/video/displays/vga/main/enable.c b/reactos/win32ss/drivers/displays/vga/main/enable.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/main/enable.c
rename to reactos/win32ss/drivers/displays/vga/main/enable.c
diff --git a/reactos/drivers/video/displays/vga/objects/bitblt.c b/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/bitblt.c
rename to reactos/win32ss/drivers/displays/vga/objects/bitblt.c
diff --git a/reactos/drivers/video/displays/vga/objects/bitblt.h b/reactos/win32ss/drivers/displays/vga/objects/bitblt.h
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/bitblt.h
rename to reactos/win32ss/drivers/displays/vga/objects/bitblt.h
diff --git a/reactos/drivers/video/displays/vga/objects/brush.h b/reactos/win32ss/drivers/displays/vga/objects/brush.h
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/brush.h
rename to reactos/win32ss/drivers/displays/vga/objects/brush.h
diff --git a/reactos/drivers/video/displays/vga/objects/copybits.c b/reactos/win32ss/drivers/displays/vga/objects/copybits.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/copybits.c
rename to reactos/win32ss/drivers/displays/vga/objects/copybits.c
diff --git a/reactos/drivers/video/displays/vga/objects/lineto.c b/reactos/win32ss/drivers/displays/vga/objects/lineto.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/lineto.c
rename to reactos/win32ss/drivers/displays/vga/objects/lineto.c
diff --git a/reactos/drivers/video/displays/vga/objects/offscreen.c b/reactos/win32ss/drivers/displays/vga/objects/offscreen.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/offscreen.c
rename to reactos/win32ss/drivers/displays/vga/objects/offscreen.c
diff --git a/reactos/drivers/video/displays/vga/objects/paint.c b/reactos/win32ss/drivers/displays/vga/objects/paint.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/paint.c
rename to reactos/win32ss/drivers/displays/vga/objects/paint.c
diff --git a/reactos/drivers/video/displays/vga/objects/pointer.c b/reactos/win32ss/drivers/displays/vga/objects/pointer.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/pointer.c
rename to reactos/win32ss/drivers/displays/vga/objects/pointer.c
diff --git a/reactos/drivers/video/displays/vga/objects/screen.c b/reactos/win32ss/drivers/displays/vga/objects/screen.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/screen.c
rename to reactos/win32ss/drivers/displays/vga/objects/screen.c
diff --git a/reactos/drivers/video/displays/vga/objects/transblt.c b/reactos/win32ss/drivers/displays/vga/objects/transblt.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/objects/transblt.c
rename to reactos/win32ss/drivers/displays/vga/objects/transblt.c
diff --git a/reactos/drivers/video/displays/vga/vgaddi.h b/reactos/win32ss/drivers/displays/vga/vgaddi.h
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgaddi.h
rename to reactos/win32ss/drivers/displays/vga/vgaddi.h
diff --git a/reactos/drivers/video/displays/vga/vgaddi.rc b/reactos/win32ss/drivers/displays/vga/vgaddi.rc
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgaddi.rc
rename to reactos/win32ss/drivers/displays/vga/vgaddi.rc
diff --git a/reactos/drivers/video/displays/vga/vgaddi.spec b/reactos/win32ss/drivers/displays/vga/vgaddi.spec
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgaddi.spec
rename to reactos/win32ss/drivers/displays/vga/vgaddi.spec
diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c b/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
rename to reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c
diff --git a/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h b/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.h
similarity index 100%
rename from reactos/drivers/video/displays/vga/vgavideo/vgavideo.h
rename to reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.h
diff --git a/reactos/drivers/video/displays/vga_new/debug.c b/reactos/win32ss/drivers/displays/vga_new/debug.c
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/debug.c
rename to reactos/win32ss/drivers/displays/vga_new/debug.c
diff --git a/reactos/drivers/video/displays/vga_new/debug.h b/reactos/win32ss/drivers/displays/vga_new/debug.h
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/debug.h
rename to reactos/win32ss/drivers/displays/vga_new/debug.h
diff --git a/reactos/drivers/video/displays/vga_new/driver.h b/reactos/win32ss/drivers/displays/vga_new/driver.h
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/driver.h
rename to reactos/win32ss/drivers/displays/vga_new/driver.h
diff --git a/reactos/drivers/video/displays/vga_new/enable.c b/reactos/win32ss/drivers/displays/vga_new/enable.c
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/enable.c
rename to reactos/win32ss/drivers/displays/vga_new/enable.c
diff --git a/reactos/drivers/video/displays/vga_new/palette.c b/reactos/win32ss/drivers/displays/vga_new/palette.c
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/palette.c
rename to reactos/win32ss/drivers/displays/vga_new/palette.c
diff --git a/reactos/drivers/video/displays/vga_new/screen.c b/reactos/win32ss/drivers/displays/vga_new/screen.c
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/screen.c
rename to reactos/win32ss/drivers/displays/vga_new/screen.c
diff --git a/reactos/drivers/video/displays/vga_new/vga_new.rc b/reactos/win32ss/drivers/displays/vga_new/vga_new.rc
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/vga_new.rc
rename to reactos/win32ss/drivers/displays/vga_new/vga_new.rc
diff --git a/reactos/drivers/video/displays/vga_new/vga_new.spec b/reactos/win32ss/drivers/displays/vga_new/vga_new.spec
similarity index 100%
rename from reactos/drivers/video/displays/vga_new/vga_new.spec
rename to reactos/win32ss/drivers/displays/vga_new/vga_new.spec
diff --git a/reactos/drivers/video/font/CMakeLists.txt b/reactos/win32ss/drivers/font/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/font/CMakeLists.txt
rename to reactos/win32ss/drivers/font/CMakeLists.txt
diff --git a/reactos/drivers/video/font/bmfd/CMakeLists.txt b/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/font/bmfd/CMakeLists.txt
rename to reactos/win32ss/drivers/font/bmfd/CMakeLists.txt
diff --git a/reactos/drivers/video/font/bmfd/bmfd.h b/reactos/win32ss/drivers/font/bmfd/bmfd.h
similarity index 100%
rename from reactos/drivers/video/font/bmfd/bmfd.h
rename to reactos/win32ss/drivers/font/bmfd/bmfd.h
diff --git a/reactos/drivers/video/font/bmfd/enable.c b/reactos/win32ss/drivers/font/bmfd/enable.c
similarity index 100%
rename from reactos/drivers/video/font/bmfd/enable.c
rename to reactos/win32ss/drivers/font/bmfd/enable.c
diff --git a/reactos/drivers/video/font/bmfd/font.c b/reactos/win32ss/drivers/font/bmfd/font.c
similarity index 100%
rename from reactos/drivers/video/font/bmfd/font.c
rename to reactos/win32ss/drivers/font/bmfd/font.c
diff --git a/reactos/drivers/video/font/bmfd/glyph.c b/reactos/win32ss/drivers/font/bmfd/glyph.c
similarity index 100%
rename from reactos/drivers/video/font/bmfd/glyph.c
rename to reactos/win32ss/drivers/font/bmfd/glyph.c
diff --git a/reactos/drivers/video/font/ftfd/CMakeLists.txt b/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/font/ftfd/CMakeLists.txt
rename to reactos/win32ss/drivers/font/ftfd/CMakeLists.txt
diff --git a/reactos/drivers/video/font/ftfd/enable.c b/reactos/win32ss/drivers/font/ftfd/enable.c
similarity index 100%
rename from reactos/drivers/video/font/ftfd/enable.c
rename to reactos/win32ss/drivers/font/ftfd/enable.c
diff --git a/reactos/drivers/video/font/ftfd/font.c b/reactos/win32ss/drivers/font/ftfd/font.c
similarity index 100%
rename from reactos/drivers/video/font/ftfd/font.c
rename to reactos/win32ss/drivers/font/ftfd/font.c
diff --git a/reactos/drivers/video/font/ftfd/freetype.def b/reactos/win32ss/drivers/font/ftfd/freetype.def
similarity index 100%
rename from reactos/drivers/video/font/ftfd/freetype.def
rename to reactos/win32ss/drivers/font/ftfd/freetype.def
diff --git a/reactos/drivers/video/font/ftfd/freetype.rc b/reactos/win32ss/drivers/font/ftfd/freetype.rc
similarity index 100%
rename from reactos/drivers/video/font/ftfd/freetype.rc
rename to reactos/win32ss/drivers/font/ftfd/freetype.rc
diff --git a/reactos/drivers/video/font/ftfd/ftfd.h b/reactos/win32ss/drivers/font/ftfd/ftfd.h
similarity index 100%
rename from reactos/drivers/video/font/ftfd/ftfd.h
rename to reactos/win32ss/drivers/font/ftfd/ftfd.h
diff --git a/reactos/drivers/video/font/ftfd/ftfd.spec b/reactos/win32ss/drivers/font/ftfd/ftfd.spec
similarity index 100%
rename from reactos/drivers/video/font/ftfd/ftfd.spec
rename to reactos/win32ss/drivers/font/ftfd/ftfd.spec
diff --git a/reactos/drivers/video/font/ftfd/glyph.c b/reactos/win32ss/drivers/font/ftfd/glyph.c
similarity index 100%
rename from reactos/drivers/video/font/ftfd/glyph.c
rename to reactos/win32ss/drivers/font/ftfd/glyph.c
diff --git a/reactos/drivers/video/font/ftfd/rosglue.c b/reactos/win32ss/drivers/font/ftfd/rosglue.c
similarity index 100%
rename from reactos/drivers/video/font/ftfd/rosglue.c
rename to reactos/win32ss/drivers/font/ftfd/rosglue.c
diff --git a/reactos/drivers/video/font/ftfd/sprintf.c b/reactos/win32ss/drivers/font/ftfd/sprintf.c
similarity index 100%
rename from reactos/drivers/video/font/ftfd/sprintf.c
rename to reactos/win32ss/drivers/font/ftfd/sprintf.c
diff --git a/reactos/drivers/video/miniport/CMakeLists.txt b/reactos/win32ss/drivers/miniport/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/vbe/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/vbe/edid.c b/reactos/win32ss/drivers/miniport/vbe/edid.c
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/edid.c
rename to reactos/win32ss/drivers/miniport/vbe/edid.c
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.c b/reactos/win32ss/drivers/miniport/vbe/vbemp.c
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/vbemp.c
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.c
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.h b/reactos/win32ss/drivers/miniport/vbe/vbemp.h
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/vbemp.h
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.h
diff --git a/reactos/drivers/video/miniport/vbe/vbemp.rc b/reactos/win32ss/drivers/miniport/vbe/vbemp.rc
similarity index 100%
rename from reactos/drivers/video/miniport/vbe/vbemp.rc
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.rc
diff --git a/reactos/drivers/video/miniport/vga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/vga/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/vga/initvga.c b/reactos/win32ss/drivers/miniport/vga/initvga.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga/initvga.c
rename to reactos/win32ss/drivers/miniport/vga/initvga.c
diff --git a/reactos/drivers/video/miniport/vga/vgamp.c b/reactos/win32ss/drivers/miniport/vga/vgamp.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga/vgamp.c
rename to reactos/win32ss/drivers/miniport/vga/vgamp.c
diff --git a/reactos/drivers/video/miniport/vga/vgamp.h b/reactos/win32ss/drivers/miniport/vga/vgamp.h
similarity index 100%
rename from reactos/drivers/video/miniport/vga/vgamp.h
rename to reactos/win32ss/drivers/miniport/vga/vgamp.h
diff --git a/reactos/drivers/video/miniport/vga/vgamp.rc b/reactos/win32ss/drivers/miniport/vga/vgamp.rc
similarity index 100%
rename from reactos/drivers/video/miniport/vga/vgamp.rc
rename to reactos/win32ss/drivers/miniport/vga/vgamp.rc
diff --git a/reactos/drivers/video/miniport/vga/vgavideo.h b/reactos/win32ss/drivers/miniport/vga/vgavideo.h
similarity index 100%
rename from reactos/drivers/video/miniport/vga/vgavideo.h
rename to reactos/win32ss/drivers/miniport/vga/vgavideo.h
diff --git a/reactos/drivers/video/miniport/vga_new/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/vga_new/cmdcnst.h b/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/cmdcnst.h
rename to reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h
diff --git a/reactos/drivers/video/miniport/vga_new/modeset.c b/reactos/win32ss/drivers/miniport/vga_new/modeset.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/modeset.c
rename to reactos/win32ss/drivers/miniport/vga_new/modeset.c
diff --git a/reactos/drivers/video/miniport/vga_new/vbe.c b/reactos/win32ss/drivers/miniport/vga_new/vbe.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vbe.c
rename to reactos/win32ss/drivers/miniport/vga_new/vbe.c
diff --git a/reactos/drivers/video/miniport/vga_new/vbe.h b/reactos/win32ss/drivers/miniport/vga_new/vbe.h
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vbe.h
rename to reactos/win32ss/drivers/miniport/vga_new/vbe.h
diff --git a/reactos/drivers/video/miniport/vga_new/vbemodes.c b/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vbemodes.c
rename to reactos/win32ss/drivers/miniport/vga_new/vbemodes.c
diff --git a/reactos/drivers/video/miniport/vga_new/vga.c b/reactos/win32ss/drivers/miniport/vga_new/vga.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vga.c
rename to reactos/win32ss/drivers/miniport/vga_new/vga.c
diff --git a/reactos/drivers/video/miniport/vga_new/vga.h b/reactos/win32ss/drivers/miniport/vga_new/vga.h
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vga.h
rename to reactos/win32ss/drivers/miniport/vga_new/vga.h
diff --git a/reactos/drivers/video/miniport/vga_new/vga.rc b/reactos/win32ss/drivers/miniport/vga_new/vga.rc
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vga.rc
rename to reactos/win32ss/drivers/miniport/vga_new/vga.rc
diff --git a/reactos/drivers/video/miniport/vga_new/vgadata.c b/reactos/win32ss/drivers/miniport/vga_new/vgadata.c
similarity index 100%
rename from reactos/drivers/video/miniport/vga_new/vgadata.c
rename to reactos/win32ss/drivers/miniport/vga_new/vgadata.c
diff --git a/reactos/drivers/video/miniport/vmx_svga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/vmx_svga/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/vmx_svga/precomp.h b/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h
similarity index 100%
rename from reactos/drivers/video/miniport/vmx_svga/precomp.h
rename to reactos/win32ss/drivers/miniport/vmx_svga/precomp.h
diff --git a/reactos/drivers/video/miniport/vmx_svga/vmx_regs.h b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h
similarity index 100%
rename from reactos/drivers/video/miniport/vmx_svga/vmx_regs.h
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h
diff --git a/reactos/drivers/video/miniport/vmx_svga/vmx_svga.c b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c
similarity index 100%
rename from reactos/drivers/video/miniport/vmx_svga/vmx_svga.c
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c
diff --git a/reactos/drivers/video/miniport/vmx_svga/vmx_svga.rc b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.rc
similarity index 100%
rename from reactos/drivers/video/miniport/vmx_svga/vmx_svga.rc
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.rc
diff --git a/reactos/drivers/video/miniport/xboxvmp/CMakeLists.txt b/reactos/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/miniport/xboxvmp/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
similarity index 100%
rename from reactos/drivers/video/miniport/xboxvmp/xboxvmp.c
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.h
similarity index 100%
rename from reactos/drivers/video/miniport/xboxvmp/xboxvmp.h
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.h
diff --git a/reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.rc
similarity index 100%
rename from reactos/drivers/video/miniport/xboxvmp/xboxvmp.rc
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.rc
diff --git a/reactos/drivers/video/videoprt/CMakeLists.txt b/reactos/win32ss/drivers/videoprt/CMakeLists.txt
similarity index 100%
rename from reactos/drivers/video/videoprt/CMakeLists.txt
rename to reactos/win32ss/drivers/videoprt/CMakeLists.txt
diff --git a/reactos/drivers/video/videoprt/agp.c b/reactos/win32ss/drivers/videoprt/agp.c
similarity index 100%
rename from reactos/drivers/video/videoprt/agp.c
rename to reactos/win32ss/drivers/videoprt/agp.c
diff --git a/reactos/drivers/video/videoprt/child.c b/reactos/win32ss/drivers/videoprt/child.c
similarity index 100%
rename from reactos/drivers/video/videoprt/child.c
rename to reactos/win32ss/drivers/videoprt/child.c
diff --git a/reactos/drivers/video/videoprt/ddc.c b/reactos/win32ss/drivers/videoprt/ddc.c
similarity index 100%
rename from reactos/drivers/video/videoprt/ddc.c
rename to reactos/win32ss/drivers/videoprt/ddc.c
diff --git a/reactos/drivers/video/videoprt/dispatch.c b/reactos/win32ss/drivers/videoprt/dispatch.c
similarity index 100%
rename from reactos/drivers/video/videoprt/dispatch.c
rename to reactos/win32ss/drivers/videoprt/dispatch.c
diff --git a/reactos/drivers/video/videoprt/dma.c b/reactos/win32ss/drivers/videoprt/dma.c
similarity index 100%
rename from reactos/drivers/video/videoprt/dma.c
rename to reactos/win32ss/drivers/videoprt/dma.c
diff --git a/reactos/drivers/video/videoprt/event.c b/reactos/win32ss/drivers/videoprt/event.c
similarity index 100%
rename from reactos/drivers/video/videoprt/event.c
rename to reactos/win32ss/drivers/videoprt/event.c
diff --git a/reactos/drivers/video/videoprt/funclist.c b/reactos/win32ss/drivers/videoprt/funclist.c
similarity index 100%
rename from reactos/drivers/video/videoprt/funclist.c
rename to reactos/win32ss/drivers/videoprt/funclist.c
diff --git a/reactos/drivers/video/videoprt/int10.c b/reactos/win32ss/drivers/videoprt/int10.c
similarity index 100%
rename from reactos/drivers/video/videoprt/int10.c
rename to reactos/win32ss/drivers/videoprt/int10.c
diff --git a/reactos/drivers/video/videoprt/interrupt.c b/reactos/win32ss/drivers/videoprt/interrupt.c
similarity index 100%
rename from reactos/drivers/video/videoprt/interrupt.c
rename to reactos/win32ss/drivers/videoprt/interrupt.c
diff --git a/reactos/drivers/video/videoprt/resource.c b/reactos/win32ss/drivers/videoprt/resource.c
similarity index 100%
rename from reactos/drivers/video/videoprt/resource.c
rename to reactos/win32ss/drivers/videoprt/resource.c
diff --git a/reactos/drivers/video/videoprt/services.c b/reactos/win32ss/drivers/videoprt/services.c
similarity index 100%
rename from reactos/drivers/video/videoprt/services.c
rename to reactos/win32ss/drivers/videoprt/services.c
diff --git a/reactos/drivers/video/videoprt/spinlock.c b/reactos/win32ss/drivers/videoprt/spinlock.c
similarity index 100%
rename from reactos/drivers/video/videoprt/spinlock.c
rename to reactos/win32ss/drivers/videoprt/spinlock.c
diff --git a/reactos/drivers/video/videoprt/stubs.c b/reactos/win32ss/drivers/videoprt/stubs.c
similarity index 100%
rename from reactos/drivers/video/videoprt/stubs.c
rename to reactos/win32ss/drivers/videoprt/stubs.c
diff --git a/reactos/drivers/video/videoprt/timer.c b/reactos/win32ss/drivers/videoprt/timer.c
similarity index 100%
rename from reactos/drivers/video/videoprt/timer.c
rename to reactos/win32ss/drivers/videoprt/timer.c
diff --git a/reactos/drivers/video/videoprt/videoprt.c b/reactos/win32ss/drivers/videoprt/videoprt.c
similarity index 100%
rename from reactos/drivers/video/videoprt/videoprt.c
rename to reactos/win32ss/drivers/videoprt/videoprt.c
diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/win32ss/drivers/videoprt/videoprt.h
similarity index 100%
rename from reactos/drivers/video/videoprt/videoprt.h
rename to reactos/win32ss/drivers/videoprt/videoprt.h
diff --git a/reactos/drivers/video/videoprt/videoprt.rc b/reactos/win32ss/drivers/videoprt/videoprt.rc
similarity index 100%
rename from reactos/drivers/video/videoprt/videoprt.rc
rename to reactos/win32ss/drivers/videoprt/videoprt.rc
diff --git a/reactos/drivers/video/videoprt/videoprt.spec b/reactos/win32ss/drivers/videoprt/videoprt.spec
similarity index 100%
rename from reactos/drivers/video/videoprt/videoprt.spec
rename to reactos/win32ss/drivers/videoprt/videoprt.spec