diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index 67519d00124..a507c306a41 100644
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -234,6 +234,7 @@ else()
     add_subdirectory(modules)
     add_subdirectory(ntoskrnl)
     add_subdirectory(subsystems)
+    add_subdirectory(win32ss)
 
     file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
 
diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index c825b9ccc45..b1ce6204475 100644
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -39,7 +39,6 @@ add_subdirectory(dwmapi)
 add_subdirectory(faultrep)
 add_subdirectory(fmifs)
 add_subdirectory(fusion)
-add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(getuname)
 add_subdirectory(glu32)
@@ -200,7 +199,6 @@ add_subdirectory(untfs)
 add_subdirectory(updspapi)
 add_subdirectory(url)
 add_subdirectory(urlmon)
-add_subdirectory(user32)
 add_subdirectory(userenv)
 add_subdirectory(usp10)
 add_subdirectory(uxtheme)
diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
new file mode 100644
index 00000000000..3e54486264a
--- /dev/null
+++ b/reactos/win32ss/CMakeLists.txt
@@ -0,0 +1,3 @@
+
+add_subdirectory(gdi/gdi32)
+add_subdirectory(user/user32)
diff --git a/reactos/dll/win32/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/gdi32/CMakeLists.txt
rename to reactos/win32ss/gdi/gdi32/CMakeLists.txt
diff --git a/reactos/dll/win32/gdi32/gdi32.rc b/reactos/win32ss/gdi/gdi32/gdi32.rc
similarity index 100%
rename from reactos/dll/win32/gdi32/gdi32.rc
rename to reactos/win32ss/gdi/gdi32/gdi32.rc
diff --git a/reactos/dll/win32/gdi32/gdi32.spec b/reactos/win32ss/gdi/gdi32/gdi32.spec
similarity index 100%
rename from reactos/dll/win32/gdi32/gdi32.spec
rename to reactos/win32ss/gdi/gdi32/gdi32.spec
diff --git a/reactos/dll/win32/gdi32/good api.def b/reactos/win32ss/gdi/gdi32/good api.def
similarity index 100%
rename from reactos/dll/win32/gdi32/good api.def
rename to reactos/win32ss/gdi/gdi32/good api.def
diff --git a/reactos/dll/win32/gdi32/include/gdi32p.h b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
similarity index 100%
rename from reactos/dll/win32/gdi32/include/gdi32p.h
rename to reactos/win32ss/gdi/gdi32/include/gdi32p.h
diff --git a/reactos/dll/win32/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h
similarity index 100%
rename from reactos/dll/win32/gdi32/include/precomp.h
rename to reactos/win32ss/gdi/gdi32/include/precomp.h
diff --git a/reactos/dll/win32/gdi32/main/dllmain.c b/reactos/win32ss/gdi/gdi32/main/dllmain.c
similarity index 100%
rename from reactos/dll/win32/gdi32/main/dllmain.c
rename to reactos/win32ss/gdi/gdi32/main/dllmain.c
diff --git a/reactos/dll/win32/gdi32/misc/gdientry.c b/reactos/win32ss/gdi/gdi32/misc/gdientry.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/gdientry.c
rename to reactos/win32ss/gdi/gdi32/misc/gdientry.c
diff --git a/reactos/dll/win32/gdi32/misc/hacks.c b/reactos/win32ss/gdi/gdi32/misc/hacks.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/hacks.c
rename to reactos/win32ss/gdi/gdi32/misc/hacks.c
diff --git a/reactos/dll/win32/gdi32/misc/heap.c b/reactos/win32ss/gdi/gdi32/misc/heap.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/heap.c
rename to reactos/win32ss/gdi/gdi32/misc/heap.c
diff --git a/reactos/dll/win32/gdi32/misc/historic.c b/reactos/win32ss/gdi/gdi32/misc/historic.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/historic.c
rename to reactos/win32ss/gdi/gdi32/misc/historic.c
diff --git a/reactos/dll/win32/gdi32/misc/misc.c b/reactos/win32ss/gdi/gdi32/misc/misc.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/misc.c
rename to reactos/win32ss/gdi/gdi32/misc/misc.c
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/win32ss/gdi/gdi32/misc/stubs.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/stubs.c
rename to reactos/win32ss/gdi/gdi32/misc/stubs.c
diff --git a/reactos/dll/win32/gdi32/misc/stubsa.c b/reactos/win32ss/gdi/gdi32/misc/stubsa.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/stubsa.c
rename to reactos/win32ss/gdi/gdi32/misc/stubsa.c
diff --git a/reactos/dll/win32/gdi32/misc/stubsw.c b/reactos/win32ss/gdi/gdi32/misc/stubsw.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/stubsw.c
rename to reactos/win32ss/gdi/gdi32/misc/stubsw.c
diff --git a/reactos/dll/win32/gdi32/misc/wingl.c b/reactos/win32ss/gdi/gdi32/misc/wingl.c
similarity index 100%
rename from reactos/dll/win32/gdi32/misc/wingl.c
rename to reactos/win32ss/gdi/gdi32/misc/wingl.c
diff --git a/reactos/dll/win32/gdi32/objects/arc.c b/reactos/win32ss/gdi/gdi32/objects/arc.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/arc.c
rename to reactos/win32ss/gdi/gdi32/objects/arc.c
diff --git a/reactos/dll/win32/gdi32/objects/bitmap.c b/reactos/win32ss/gdi/gdi32/objects/bitmap.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/bitmap.c
rename to reactos/win32ss/gdi/gdi32/objects/bitmap.c
diff --git a/reactos/dll/win32/gdi32/objects/brush.c b/reactos/win32ss/gdi/gdi32/objects/brush.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/brush.c
rename to reactos/win32ss/gdi/gdi32/objects/brush.c
diff --git a/reactos/dll/win32/gdi32/objects/coord.c b/reactos/win32ss/gdi/gdi32/objects/coord.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/coord.c
rename to reactos/win32ss/gdi/gdi32/objects/coord.c
diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/win32ss/gdi/gdi32/objects/dc.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/dc.c
rename to reactos/win32ss/gdi/gdi32/objects/dc.c
diff --git a/reactos/dll/win32/gdi32/objects/efloat.c b/reactos/win32ss/gdi/gdi32/objects/efloat.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/efloat.c
rename to reactos/win32ss/gdi/gdi32/objects/efloat.c
diff --git a/reactos/dll/win32/gdi32/objects/eng.c b/reactos/win32ss/gdi/gdi32/objects/eng.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/eng.c
rename to reactos/win32ss/gdi/gdi32/objects/eng.c
diff --git a/reactos/dll/win32/gdi32/objects/enhmfile.c b/reactos/win32ss/gdi/gdi32/objects/enhmfile.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/enhmfile.c
rename to reactos/win32ss/gdi/gdi32/objects/enhmfile.c
diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/win32ss/gdi/gdi32/objects/font.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/font.c
rename to reactos/win32ss/gdi/gdi32/objects/font.c
diff --git a/reactos/dll/win32/gdi32/objects/icm.c b/reactos/win32ss/gdi/gdi32/objects/icm.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/icm.c
rename to reactos/win32ss/gdi/gdi32/objects/icm.c
diff --git a/reactos/dll/win32/gdi32/objects/linedda.c b/reactos/win32ss/gdi/gdi32/objects/linedda.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/linedda.c
rename to reactos/win32ss/gdi/gdi32/objects/linedda.c
diff --git a/reactos/dll/win32/gdi32/objects/metafile.c b/reactos/win32ss/gdi/gdi32/objects/metafile.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/metafile.c
rename to reactos/win32ss/gdi/gdi32/objects/metafile.c
diff --git a/reactos/dll/win32/gdi32/objects/painting.c b/reactos/win32ss/gdi/gdi32/objects/painting.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/painting.c
rename to reactos/win32ss/gdi/gdi32/objects/painting.c
diff --git a/reactos/dll/win32/gdi32/objects/palette.c b/reactos/win32ss/gdi/gdi32/objects/palette.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/palette.c
rename to reactos/win32ss/gdi/gdi32/objects/palette.c
diff --git a/reactos/dll/win32/gdi32/objects/path.c b/reactos/win32ss/gdi/gdi32/objects/path.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/path.c
rename to reactos/win32ss/gdi/gdi32/objects/path.c
diff --git a/reactos/dll/win32/gdi32/objects/pen.c b/reactos/win32ss/gdi/gdi32/objects/pen.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/pen.c
rename to reactos/win32ss/gdi/gdi32/objects/pen.c
diff --git a/reactos/dll/win32/gdi32/objects/printdrv.c b/reactos/win32ss/gdi/gdi32/objects/printdrv.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/printdrv.c
rename to reactos/win32ss/gdi/gdi32/objects/printdrv.c
diff --git a/reactos/dll/win32/gdi32/objects/region.c b/reactos/win32ss/gdi/gdi32/objects/region.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/region.c
rename to reactos/win32ss/gdi/gdi32/objects/region.c
diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/win32ss/gdi/gdi32/objects/text.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/text.c
rename to reactos/win32ss/gdi/gdi32/objects/text.c
diff --git a/reactos/dll/win32/gdi32/objects/utils.c b/reactos/win32ss/gdi/gdi32/objects/utils.c
similarity index 100%
rename from reactos/dll/win32/gdi32/objects/utils.c
rename to reactos/win32ss/gdi/gdi32/objects/utils.c
diff --git a/reactos/dll/win32/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/user32/CMakeLists.txt
rename to reactos/win32ss/user/user32/CMakeLists.txt
diff --git a/reactos/dll/win32/user32/controls/appswitch.c b/reactos/win32ss/user/user32/controls/appswitch.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/appswitch.c
rename to reactos/win32ss/user/user32/controls/appswitch.c
diff --git a/reactos/dll/win32/user32/controls/button.c b/reactos/win32ss/user/user32/controls/button.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/button.c
rename to reactos/win32ss/user/user32/controls/button.c
diff --git a/reactos/dll/win32/user32/controls/combo.c b/reactos/win32ss/user/user32/controls/combo.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/combo.c
rename to reactos/win32ss/user/user32/controls/combo.c
diff --git a/reactos/dll/win32/user32/controls/edit.c b/reactos/win32ss/user/user32/controls/edit.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/edit.c
rename to reactos/win32ss/user/user32/controls/edit.c
diff --git a/reactos/dll/win32/user32/controls/icontitle.c b/reactos/win32ss/user/user32/controls/icontitle.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/icontitle.c
rename to reactos/win32ss/user/user32/controls/icontitle.c
diff --git a/reactos/dll/win32/user32/controls/listbox.c b/reactos/win32ss/user/user32/controls/listbox.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/listbox.c
rename to reactos/win32ss/user/user32/controls/listbox.c
diff --git a/reactos/dll/win32/user32/controls/regcontrol.c b/reactos/win32ss/user/user32/controls/regcontrol.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/regcontrol.c
rename to reactos/win32ss/user/user32/controls/regcontrol.c
diff --git a/reactos/dll/win32/user32/controls/scrollbar.c b/reactos/win32ss/user/user32/controls/scrollbar.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/scrollbar.c
rename to reactos/win32ss/user/user32/controls/scrollbar.c
diff --git a/reactos/dll/win32/user32/controls/static.c b/reactos/win32ss/user/user32/controls/static.c
similarity index 100%
rename from reactos/dll/win32/user32/controls/static.c
rename to reactos/win32ss/user/user32/controls/static.c
diff --git a/reactos/dll/win32/user32/include/controls.h b/reactos/win32ss/user/user32/include/controls.h
similarity index 100%
rename from reactos/dll/win32/user32/include/controls.h
rename to reactos/win32ss/user/user32/include/controls.h
diff --git a/reactos/dll/win32/user32/include/dde_private.h b/reactos/win32ss/user/user32/include/dde_private.h
similarity index 100%
rename from reactos/dll/win32/user32/include/dde_private.h
rename to reactos/win32ss/user/user32/include/dde_private.h
diff --git a/reactos/dll/win32/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
similarity index 100%
rename from reactos/dll/win32/user32/include/ntwrapper.h
rename to reactos/win32ss/user/user32/include/ntwrapper.h
diff --git a/reactos/dll/win32/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
similarity index 100%
rename from reactos/dll/win32/user32/include/regcontrol.h
rename to reactos/win32ss/user/user32/include/regcontrol.h
diff --git a/reactos/dll/win32/user32/include/resource.h b/reactos/win32ss/user/user32/include/resource.h
similarity index 100%
rename from reactos/dll/win32/user32/include/resource.h
rename to reactos/win32ss/user/user32/include/resource.h
diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h
similarity index 100%
rename from reactos/dll/win32/user32/include/user32.h
rename to reactos/win32ss/user/user32/include/user32.h
diff --git a/reactos/dll/win32/user32/include/user32p.h b/reactos/win32ss/user/user32/include/user32p.h
similarity index 100%
rename from reactos/dll/win32/user32/include/user32p.h
rename to reactos/win32ss/user/user32/include/user32p.h
diff --git a/reactos/dll/win32/user32/include/user_x.h b/reactos/win32ss/user/user32/include/user_x.h
similarity index 100%
rename from reactos/dll/win32/user32/include/user_x.h
rename to reactos/win32ss/user/user32/include/user_x.h
diff --git a/reactos/dll/win32/user32/lang/bg-BG.rc b/reactos/win32ss/user/user32/lang/bg-BG.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/bg-BG.rc
rename to reactos/win32ss/user/user32/lang/bg-BG.rc
diff --git a/reactos/dll/win32/user32/lang/cs-CZ.rc b/reactos/win32ss/user/user32/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/cs-CZ.rc
rename to reactos/win32ss/user/user32/lang/cs-CZ.rc
diff --git a/reactos/dll/win32/user32/lang/da-DK.rc b/reactos/win32ss/user/user32/lang/da-DK.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/da-DK.rc
rename to reactos/win32ss/user/user32/lang/da-DK.rc
diff --git a/reactos/dll/win32/user32/lang/de-DE.rc b/reactos/win32ss/user/user32/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/de-DE.rc
rename to reactos/win32ss/user/user32/lang/de-DE.rc
diff --git a/reactos/dll/win32/user32/lang/el-GR.rc b/reactos/win32ss/user/user32/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/el-GR.rc
rename to reactos/win32ss/user/user32/lang/el-GR.rc
diff --git a/reactos/dll/win32/user32/lang/en-US.rc b/reactos/win32ss/user/user32/lang/en-US.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/en-US.rc
rename to reactos/win32ss/user/user32/lang/en-US.rc
diff --git a/reactos/dll/win32/user32/lang/es-ES.rc b/reactos/win32ss/user/user32/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/es-ES.rc
rename to reactos/win32ss/user/user32/lang/es-ES.rc
diff --git a/reactos/dll/win32/user32/lang/fr-FR.rc b/reactos/win32ss/user/user32/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/fr-FR.rc
rename to reactos/win32ss/user/user32/lang/fr-FR.rc
diff --git a/reactos/dll/win32/user32/lang/hu-HU.rc b/reactos/win32ss/user/user32/lang/hu-HU.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/hu-HU.rc
rename to reactos/win32ss/user/user32/lang/hu-HU.rc
diff --git a/reactos/dll/win32/user32/lang/id-ID.rc b/reactos/win32ss/user/user32/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/id-ID.rc
rename to reactos/win32ss/user/user32/lang/id-ID.rc
diff --git a/reactos/dll/win32/user32/lang/it-IT.rc b/reactos/win32ss/user/user32/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/it-IT.rc
rename to reactos/win32ss/user/user32/lang/it-IT.rc
diff --git a/reactos/dll/win32/user32/lang/ja-JP.rc b/reactos/win32ss/user/user32/lang/ja-JP.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/ja-JP.rc
rename to reactos/win32ss/user/user32/lang/ja-JP.rc
diff --git a/reactos/dll/win32/user32/lang/lt-LT.rc b/reactos/win32ss/user/user32/lang/lt-LT.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/lt-LT.rc
rename to reactos/win32ss/user/user32/lang/lt-LT.rc
diff --git a/reactos/dll/win32/user32/lang/nl-NL.rc b/reactos/win32ss/user/user32/lang/nl-NL.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/nl-NL.rc
rename to reactos/win32ss/user/user32/lang/nl-NL.rc
diff --git a/reactos/dll/win32/user32/lang/no-NO.rc b/reactos/win32ss/user/user32/lang/no-NO.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/no-NO.rc
rename to reactos/win32ss/user/user32/lang/no-NO.rc
diff --git a/reactos/dll/win32/user32/lang/pl-PL.rc b/reactos/win32ss/user/user32/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/pl-PL.rc
rename to reactos/win32ss/user/user32/lang/pl-PL.rc
diff --git a/reactos/dll/win32/user32/lang/ro-RO.rc b/reactos/win32ss/user/user32/lang/ro-RO.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/ro-RO.rc
rename to reactos/win32ss/user/user32/lang/ro-RO.rc
diff --git a/reactos/dll/win32/user32/lang/ru-RU.rc b/reactos/win32ss/user/user32/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/ru-RU.rc
rename to reactos/win32ss/user/user32/lang/ru-RU.rc
diff --git a/reactos/dll/win32/user32/lang/sk-SK.rc b/reactos/win32ss/user/user32/lang/sk-SK.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/sk-SK.rc
rename to reactos/win32ss/user/user32/lang/sk-SK.rc
diff --git a/reactos/dll/win32/user32/lang/sv-SE.rc b/reactos/win32ss/user/user32/lang/sv-SE.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/sv-SE.rc
rename to reactos/win32ss/user/user32/lang/sv-SE.rc
diff --git a/reactos/dll/win32/user32/lang/uk-UA.rc b/reactos/win32ss/user/user32/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/win32/user32/lang/uk-UA.rc
rename to reactos/win32ss/user/user32/lang/uk-UA.rc
diff --git a/reactos/dll/win32/user32/misc/dde.c b/reactos/win32ss/user/user32/misc/dde.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/dde.c
rename to reactos/win32ss/user/user32/misc/dde.c
diff --git a/reactos/dll/win32/user32/misc/ddeclient.c b/reactos/win32ss/user/user32/misc/ddeclient.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/ddeclient.c
rename to reactos/win32ss/user/user32/misc/ddeclient.c
diff --git a/reactos/dll/win32/user32/misc/ddeserver.c b/reactos/win32ss/user/user32/misc/ddeserver.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/ddeserver.c
rename to reactos/win32ss/user/user32/misc/ddeserver.c
diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/desktop.c
rename to reactos/win32ss/user/user32/misc/desktop.c
diff --git a/reactos/dll/win32/user32/misc/display.c b/reactos/win32ss/user/user32/misc/display.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/display.c
rename to reactos/win32ss/user/user32/misc/display.c
diff --git a/reactos/dll/win32/user32/misc/dllmain.c b/reactos/win32ss/user/user32/misc/dllmain.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/dllmain.c
rename to reactos/win32ss/user/user32/misc/dllmain.c
diff --git a/reactos/dll/win32/user32/misc/exit.c b/reactos/win32ss/user/user32/misc/exit.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/exit.c
rename to reactos/win32ss/user/user32/misc/exit.c
diff --git a/reactos/dll/win32/user32/misc/exticon.c b/reactos/win32ss/user/user32/misc/exticon.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/exticon.c
rename to reactos/win32ss/user/user32/misc/exticon.c
diff --git a/reactos/dll/win32/user32/misc/imm.c b/reactos/win32ss/user/user32/misc/imm.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/imm.c
rename to reactos/win32ss/user/user32/misc/imm.c
diff --git a/reactos/dll/win32/user32/misc/misc.c b/reactos/win32ss/user/user32/misc/misc.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/misc.c
rename to reactos/win32ss/user/user32/misc/misc.c
diff --git a/reactos/dll/win32/user32/misc/object.c b/reactos/win32ss/user/user32/misc/object.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/object.c
rename to reactos/win32ss/user/user32/misc/object.c
diff --git a/reactos/dll/win32/user32/misc/resources.c b/reactos/win32ss/user/user32/misc/resources.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/resources.c
rename to reactos/win32ss/user/user32/misc/resources.c
diff --git a/reactos/dll/win32/user32/misc/rtlstr.c b/reactos/win32ss/user/user32/misc/rtlstr.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/rtlstr.c
rename to reactos/win32ss/user/user32/misc/rtlstr.c
diff --git a/reactos/dll/win32/user32/misc/stubs.c b/reactos/win32ss/user/user32/misc/stubs.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/stubs.c
rename to reactos/win32ss/user/user32/misc/stubs.c
diff --git a/reactos/dll/win32/user32/misc/timer.c b/reactos/win32ss/user/user32/misc/timer.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/timer.c
rename to reactos/win32ss/user/user32/misc/timer.c
diff --git a/reactos/dll/win32/user32/misc/usrapihk.c b/reactos/win32ss/user/user32/misc/usrapihk.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/usrapihk.c
rename to reactos/win32ss/user/user32/misc/usrapihk.c
diff --git a/reactos/dll/win32/user32/misc/winhelp.c b/reactos/win32ss/user/user32/misc/winhelp.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/winhelp.c
rename to reactos/win32ss/user/user32/misc/winhelp.c
diff --git a/reactos/dll/win32/user32/misc/winsta.c b/reactos/win32ss/user/user32/misc/winsta.c
similarity index 100%
rename from reactos/dll/win32/user32/misc/winsta.c
rename to reactos/win32ss/user/user32/misc/winsta.c
diff --git a/reactos/dll/win32/user32/resources/obm_btncorners.bmp b/reactos/win32ss/user/user32/resources/obm_btncorners.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_btncorners.bmp
rename to reactos/win32ss/user/user32/resources/obm_btncorners.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_btsize.bmp b/reactos/win32ss/user/user32/resources/obm_btsize.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_btsize.bmp
rename to reactos/win32ss/user/user32/resources/obm_btsize.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_check.bmp b/reactos/win32ss/user/user32/resources/obm_check.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_check.bmp
rename to reactos/win32ss/user/user32/resources/obm_check.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_checkboxes.bmp b/reactos/win32ss/user/user32/resources/obm_checkboxes.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_checkboxes.bmp
rename to reactos/win32ss/user/user32/resources/obm_checkboxes.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_close.bmp b/reactos/win32ss/user/user32/resources/obm_close.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_close.bmp
rename to reactos/win32ss/user/user32/resources/obm_close.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_combo.bmp b/reactos/win32ss/user/user32/resources/obm_combo.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_combo.bmp
rename to reactos/win32ss/user/user32/resources/obm_combo.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_dnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_dnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_dnarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrowd.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_dnarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrowd.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_dnarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrowi.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_dnarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrowi.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_lfarrow.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_lfarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_lfarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrowd.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_lfarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrowd.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_lfarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrowi.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_lfarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrowi.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_mnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_mnarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_mnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_mnarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_close.bmp b/reactos/win32ss/user/user32/resources/obm_old_close.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_close.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_close.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_dnarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_dnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_dnarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_lfarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_lfarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_lfarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_reduce.bmp b/reactos/win32ss/user/user32/resources/obm_old_reduce.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_reduce.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_reduce.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_restore.bmp b/reactos/win32ss/user/user32/resources/obm_old_restore.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_restore.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_restore.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_rgarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_rgarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_rgarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_uparrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_uparrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_uparrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_uparrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_old_zoom.bmp b/reactos/win32ss/user/user32/resources/obm_old_zoom.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_old_zoom.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_zoom.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_reduce.bmp b/reactos/win32ss/user/user32/resources/obm_reduce.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_reduce.bmp
rename to reactos/win32ss/user/user32/resources/obm_reduce.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_reduced.bmp b/reactos/win32ss/user/user32/resources/obm_reduced.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_reduced.bmp
rename to reactos/win32ss/user/user32/resources/obm_reduced.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_restore.bmp b/reactos/win32ss/user/user32/resources/obm_restore.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_restore.bmp
rename to reactos/win32ss/user/user32/resources/obm_restore.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_restored.bmp b/reactos/win32ss/user/user32/resources/obm_restored.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_restored.bmp
rename to reactos/win32ss/user/user32/resources/obm_restored.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_rgarrow.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_rgarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_rgarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrowd.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_rgarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrowd.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_rgarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrowi.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_rgarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrowi.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_size.bmp b/reactos/win32ss/user/user32/resources/obm_size.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_size.bmp
rename to reactos/win32ss/user/user32/resources/obm_size.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_trtype.bmp b/reactos/win32ss/user/user32/resources/obm_trtype.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_trtype.bmp
rename to reactos/win32ss/user/user32/resources/obm_trtype.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_uparrow.bmp b/reactos/win32ss/user/user32/resources/obm_uparrow.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_uparrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrow.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_uparrowd.bmp b/reactos/win32ss/user/user32/resources/obm_uparrowd.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_uparrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrowd.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_uparrowi.bmp b/reactos/win32ss/user/user32/resources/obm_uparrowi.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_uparrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrowi.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_zoom.bmp b/reactos/win32ss/user/user32/resources/obm_zoom.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_zoom.bmp
rename to reactos/win32ss/user/user32/resources/obm_zoom.bmp
diff --git a/reactos/dll/win32/user32/resources/obm_zoomd.bmp b/reactos/win32ss/user/user32/resources/obm_zoomd.bmp
similarity index 100%
rename from reactos/dll/win32/user32/resources/obm_zoomd.bmp
rename to reactos/win32ss/user/user32/resources/obm_zoomd.bmp
diff --git a/reactos/dll/win32/user32/resources/ocr_appstarting.cur b/reactos/win32ss/user/user32/resources/ocr_appstarting.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_appstarting.cur
rename to reactos/win32ss/user/user32/resources/ocr_appstarting.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_cdautostart.cur b/reactos/win32ss/user/user32/resources/ocr_cdautostart.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_cdautostart.cur
rename to reactos/win32ss/user/user32/resources/ocr_cdautostart.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_cross.cur b/reactos/win32ss/user/user32/resources/ocr_cross.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_cross.cur
rename to reactos/win32ss/user/user32/resources/ocr_cross.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_dragobject.cur b/reactos/win32ss/user/user32/resources/ocr_dragobject.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_dragobject.cur
rename to reactos/win32ss/user/user32/resources/ocr_dragobject.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_hand.cur b/reactos/win32ss/user/user32/resources/ocr_hand.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_hand.cur
rename to reactos/win32ss/user/user32/resources/ocr_hand.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_help.cur b/reactos/win32ss/user/user32/resources/ocr_help.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_help.cur
rename to reactos/win32ss/user/user32/resources/ocr_help.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_ibeam.cur b/reactos/win32ss/user/user32/resources/ocr_ibeam.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_ibeam.cur
rename to reactos/win32ss/user/user32/resources/ocr_ibeam.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_icon.cur b/reactos/win32ss/user/user32/resources/ocr_icon.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_icon.cur
rename to reactos/win32ss/user/user32/resources/ocr_icon.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_no.cur b/reactos/win32ss/user/user32/resources/ocr_no.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_no.cur
rename to reactos/win32ss/user/user32/resources/ocr_no.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_normal.cur b/reactos/win32ss/user/user32/resources/ocr_normal.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_normal.cur
rename to reactos/win32ss/user/user32/resources/ocr_normal.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_pen.cur b/reactos/win32ss/user/user32/resources/ocr_pen.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_pen.cur
rename to reactos/win32ss/user/user32/resources/ocr_pen.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_size.cur b/reactos/win32ss/user/user32/resources/ocr_size.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_size.cur
rename to reactos/win32ss/user/user32/resources/ocr_size.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_sizeall.cur b/reactos/win32ss/user/user32/resources/ocr_sizeall.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_sizeall.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizeall.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_sizenesw.cur b/reactos/win32ss/user/user32/resources/ocr_sizenesw.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_sizenesw.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizenesw.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_sizens.cur b/reactos/win32ss/user/user32/resources/ocr_sizens.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_sizens.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizens.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_sizenwse.cur b/reactos/win32ss/user/user32/resources/ocr_sizenwse.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_sizenwse.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizenwse.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_sizewe.cur b/reactos/win32ss/user/user32/resources/ocr_sizewe.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_sizewe.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizewe.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_up.cur b/reactos/win32ss/user/user32/resources/ocr_up.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_up.cur
rename to reactos/win32ss/user/user32/resources/ocr_up.cur
diff --git a/reactos/dll/win32/user32/resources/ocr_wait.cur b/reactos/win32ss/user/user32/resources/ocr_wait.cur
similarity index 100%
rename from reactos/dll/win32/user32/resources/ocr_wait.cur
rename to reactos/win32ss/user/user32/resources/ocr_wait.cur
diff --git a/reactos/dll/win32/user32/resources/oic_bang.ico b/reactos/win32ss/user/user32/resources/oic_bang.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_bang.ico
rename to reactos/win32ss/user/user32/resources/oic_bang.ico
diff --git a/reactos/dll/win32/user32/resources/oic_hand.ico b/reactos/win32ss/user/user32/resources/oic_hand.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_hand.ico
rename to reactos/win32ss/user/user32/resources/oic_hand.ico
diff --git a/reactos/dll/win32/user32/resources/oic_note.ico b/reactos/win32ss/user/user32/resources/oic_note.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_note.ico
rename to reactos/win32ss/user/user32/resources/oic_note.ico
diff --git a/reactos/dll/win32/user32/resources/oic_ques.ico b/reactos/win32ss/user/user32/resources/oic_ques.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_ques.ico
rename to reactos/win32ss/user/user32/resources/oic_ques.ico
diff --git a/reactos/dll/win32/user32/resources/oic_reactos.ico b/reactos/win32ss/user/user32/resources/oic_reactos.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_reactos.ico
rename to reactos/win32ss/user/user32/resources/oic_reactos.ico
diff --git a/reactos/dll/win32/user32/resources/oic_sample.ico b/reactos/win32ss/user/user32/resources/oic_sample.ico
similarity index 100%
rename from reactos/dll/win32/user32/resources/oic_sample.ico
rename to reactos/win32ss/user/user32/resources/oic_sample.ico
diff --git a/reactos/dll/win32/user32/user32.rc b/reactos/win32ss/user/user32/user32.rc
similarity index 100%
rename from reactos/dll/win32/user32/user32.rc
rename to reactos/win32ss/user/user32/user32.rc
diff --git a/reactos/dll/win32/user32/user32.spec b/reactos/win32ss/user/user32/user32.spec
similarity index 100%
rename from reactos/dll/win32/user32/user32.spec
rename to reactos/win32ss/user/user32/user32.spec
diff --git a/reactos/dll/win32/user32/windows/accel.c b/reactos/win32ss/user/user32/windows/accel.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/accel.c
rename to reactos/win32ss/user/user32/windows/accel.c
diff --git a/reactos/dll/win32/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/caret.c
rename to reactos/win32ss/user/user32/windows/caret.c
diff --git a/reactos/dll/win32/user32/windows/class.c b/reactos/win32ss/user/user32/windows/class.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/class.c
rename to reactos/win32ss/user/user32/windows/class.c
diff --git a/reactos/dll/win32/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/clipboard.c
rename to reactos/win32ss/user/user32/windows/clipboard.c
diff --git a/reactos/dll/win32/user32/windows/cursoricon.c b/reactos/win32ss/user/user32/windows/cursoricon.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/cursoricon.c
rename to reactos/win32ss/user/user32/windows/cursoricon.c
diff --git a/reactos/dll/win32/user32/windows/dc.c b/reactos/win32ss/user/user32/windows/dc.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/dc.c
rename to reactos/win32ss/user/user32/windows/dc.c
diff --git a/reactos/dll/win32/user32/windows/defwnd.c b/reactos/win32ss/user/user32/windows/defwnd.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/defwnd.c
rename to reactos/win32ss/user/user32/windows/defwnd.c
diff --git a/reactos/dll/win32/user32/windows/dialog.c b/reactos/win32ss/user/user32/windows/dialog.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/dialog.c
rename to reactos/win32ss/user/user32/windows/dialog.c
diff --git a/reactos/dll/win32/user32/windows/draw.c b/reactos/win32ss/user/user32/windows/draw.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/draw.c
rename to reactos/win32ss/user/user32/windows/draw.c
diff --git a/reactos/dll/win32/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/font.c
rename to reactos/win32ss/user/user32/windows/font.c
diff --git a/reactos/dll/win32/user32/windows/hook.c b/reactos/win32ss/user/user32/windows/hook.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/hook.c
rename to reactos/win32ss/user/user32/windows/hook.c
diff --git a/reactos/dll/win32/user32/windows/input.c b/reactos/win32ss/user/user32/windows/input.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/input.c
rename to reactos/win32ss/user/user32/windows/input.c
diff --git a/reactos/dll/win32/user32/windows/mdi.c b/reactos/win32ss/user/user32/windows/mdi.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/mdi.c
rename to reactos/win32ss/user/user32/windows/mdi.c
diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/menu.c
rename to reactos/win32ss/user/user32/windows/menu.c
diff --git a/reactos/dll/win32/user32/windows/message.c b/reactos/win32ss/user/user32/windows/message.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/message.c
rename to reactos/win32ss/user/user32/windows/message.c
diff --git a/reactos/dll/win32/user32/windows/messagebox.c b/reactos/win32ss/user/user32/windows/messagebox.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/messagebox.c
rename to reactos/win32ss/user/user32/windows/messagebox.c
diff --git a/reactos/dll/win32/user32/windows/nonclient.c b/reactos/win32ss/user/user32/windows/nonclient.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/nonclient.c
rename to reactos/win32ss/user/user32/windows/nonclient.c
diff --git a/reactos/dll/win32/user32/windows/paint.c b/reactos/win32ss/user/user32/windows/paint.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/paint.c
rename to reactos/win32ss/user/user32/windows/paint.c
diff --git a/reactos/dll/win32/user32/windows/prop.c b/reactos/win32ss/user/user32/windows/prop.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/prop.c
rename to reactos/win32ss/user/user32/windows/prop.c
diff --git a/reactos/dll/win32/user32/windows/rect.c b/reactos/win32ss/user/user32/windows/rect.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/rect.c
rename to reactos/win32ss/user/user32/windows/rect.c
diff --git a/reactos/dll/win32/user32/windows/spy.c b/reactos/win32ss/user/user32/windows/spy.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/spy.c
rename to reactos/win32ss/user/user32/windows/spy.c
diff --git a/reactos/dll/win32/user32/windows/text.c b/reactos/win32ss/user/user32/windows/text.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/text.c
rename to reactos/win32ss/user/user32/windows/text.c
diff --git a/reactos/dll/win32/user32/windows/window.c b/reactos/win32ss/user/user32/windows/window.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/window.c
rename to reactos/win32ss/user/user32/windows/window.c
diff --git a/reactos/dll/win32/user32/windows/winpos.c b/reactos/win32ss/user/user32/windows/winpos.c
similarity index 100%
rename from reactos/dll/win32/user32/windows/winpos.c
rename to reactos/win32ss/user/user32/windows/winpos.c