reshuffling of dlls

svn path=/trunk/; revision=21035

diff --git a/reactos/lib/iphlpapi/Makefile.in b/reactos/dll/win32/iphlpapi/Makefile.in
similarity index 100%
rename from reactos/lib/iphlpapi/Makefile.in
rename to reactos/dll/win32/iphlpapi/Makefile.in

diff --git a/reactos/lib/iphlpapi/dhcp.h b/reactos/dll/win32/iphlpapi/dhcp.h
similarity index 100%
rename from reactos/lib/iphlpapi/dhcp.h
rename to reactos/dll/win32/iphlpapi/dhcp.h

diff --git a/reactos/lib/iphlpapi/dhcp_reactos.c b/reactos/dll/win32/iphlpapi/dhcp_reactos.c
similarity index 100%
rename from reactos/lib/iphlpapi/dhcp_reactos.c
rename to reactos/dll/win32/iphlpapi/dhcp_reactos.c

diff --git a/reactos/lib/iphlpapi/ifenum.h b/reactos/dll/win32/iphlpapi/ifenum.h
similarity index 100%
rename from reactos/lib/iphlpapi/ifenum.h
rename to reactos/dll/win32/iphlpapi/ifenum.h

diff --git a/reactos/lib/iphlpapi/ifenum_reactos.c b/reactos/dll/win32/iphlpapi/ifenum_reactos.c
similarity index 100%
rename from reactos/lib/iphlpapi/ifenum_reactos.c
rename to reactos/dll/win32/iphlpapi/ifenum_reactos.c

diff --git a/reactos/lib/iphlpapi/iphlpapi.rc b/reactos/dll/win32/iphlpapi/iphlpapi.rc
similarity index 100%
rename from reactos/lib/iphlpapi/iphlpapi.rc
rename to reactos/dll/win32/iphlpapi/iphlpapi.rc

diff --git a/reactos/lib/iphlpapi/iphlpapi.spec b/reactos/dll/win32/iphlpapi/iphlpapi.spec
similarity index 100%
rename from reactos/lib/iphlpapi/iphlpapi.spec
rename to reactos/dll/win32/iphlpapi/iphlpapi.spec

diff --git a/reactos/lib/iphlpapi/iphlpapi.xml b/reactos/dll/win32/iphlpapi/iphlpapi.xml
similarity index 100%
rename from reactos/lib/iphlpapi/iphlpapi.xml
rename to reactos/dll/win32/iphlpapi/iphlpapi.xml

diff --git a/reactos/lib/iphlpapi/iphlpapi_main.c b/reactos/dll/win32/iphlpapi/iphlpapi_main.c
similarity index 100%
rename from reactos/lib/iphlpapi/iphlpapi_main.c
rename to reactos/dll/win32/iphlpapi/iphlpapi_main.c

diff --git a/reactos/lib/iphlpapi/iphlpapi_private.h b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
similarity index 100%
rename from reactos/lib/iphlpapi/iphlpapi_private.h
rename to reactos/dll/win32/iphlpapi/iphlpapi_private.h

diff --git a/reactos/lib/iphlpapi/ipstats.h b/reactos/dll/win32/iphlpapi/ipstats.h
similarity index 100%
rename from reactos/lib/iphlpapi/ipstats.h
rename to reactos/dll/win32/iphlpapi/ipstats.h

diff --git a/reactos/lib/iphlpapi/ipstats_reactos.c b/reactos/dll/win32/iphlpapi/ipstats_reactos.c
similarity index 100%
rename from reactos/lib/iphlpapi/ipstats_reactos.c
rename to reactos/dll/win32/iphlpapi/ipstats_reactos.c

diff --git a/reactos/lib/iphlpapi/media.c b/reactos/dll/win32/iphlpapi/media.c
similarity index 100%
rename from reactos/lib/iphlpapi/media.c
rename to reactos/dll/win32/iphlpapi/media.c

diff --git a/reactos/lib/iphlpapi/merge-notes.txt b/reactos/dll/win32/iphlpapi/merge-notes.txt
similarity index 100%
rename from reactos/lib/iphlpapi/merge-notes.txt
rename to reactos/dll/win32/iphlpapi/merge-notes.txt

diff --git a/reactos/lib/iphlpapi/registry.c b/reactos/dll/win32/iphlpapi/registry.c
similarity index 100%
rename from reactos/lib/iphlpapi/registry.c
rename to reactos/dll/win32/iphlpapi/registry.c

diff --git a/reactos/lib/iphlpapi/resinfo.c b/reactos/dll/win32/iphlpapi/resinfo.c
similarity index 100%
rename from reactos/lib/iphlpapi/resinfo.c
rename to reactos/dll/win32/iphlpapi/resinfo.c

diff --git a/reactos/lib/iphlpapi/resinfo.h b/reactos/dll/win32/iphlpapi/resinfo.h
similarity index 100%
rename from reactos/lib/iphlpapi/resinfo.h
rename to reactos/dll/win32/iphlpapi/resinfo.h

diff --git a/reactos/lib/iphlpapi/resinfo_reactos.c b/reactos/dll/win32/iphlpapi/resinfo_reactos.c
similarity index 100%
rename from reactos/lib/iphlpapi/resinfo_reactos.c
rename to reactos/dll/win32/iphlpapi/resinfo_reactos.c

diff --git a/reactos/lib/iphlpapi/route.c b/reactos/dll/win32/iphlpapi/route.c
similarity index 100%
rename from reactos/lib/iphlpapi/route.c
rename to reactos/dll/win32/iphlpapi/route.c

diff --git a/reactos/lib/iphlpapi/route.h b/reactos/dll/win32/iphlpapi/route.h
similarity index 100%
rename from reactos/lib/iphlpapi/route.h
rename to reactos/dll/win32/iphlpapi/route.h

diff --git a/reactos/lib/iphlpapi/route_reactos.c b/reactos/dll/win32/iphlpapi/route_reactos.c
similarity index 100%
rename from reactos/lib/iphlpapi/route_reactos.c
rename to reactos/dll/win32/iphlpapi/route_reactos.c

diff --git a/reactos/lib/iprtprio/iprtprio.c b/reactos/dll/win32/iprtprio/iprtprio.c
similarity index 100%
rename from reactos/lib/iprtprio/iprtprio.c
rename to reactos/dll/win32/iprtprio/iprtprio.c

diff --git a/reactos/lib/iprtprio/iprtprio.def b/reactos/dll/win32/iprtprio/iprtprio.def
similarity index 100%
rename from reactos/lib/iprtprio/iprtprio.def
rename to reactos/dll/win32/iprtprio/iprtprio.def

diff --git a/reactos/lib/iprtprio/iprtprio.rc b/reactos/dll/win32/iprtprio/iprtprio.rc
similarity index 100%
rename from reactos/lib/iprtprio/iprtprio.rc
rename to reactos/dll/win32/iprtprio/iprtprio.rc

diff --git a/reactos/lib/kernel32/debug/break.c b/reactos/dll/win32/kernel32/debug/break.c
similarity index 100%
rename from reactos/lib/kernel32/debug/break.c
rename to reactos/dll/win32/kernel32/debug/break.c

diff --git a/reactos/lib/kernel32/debug/debugger.c b/reactos/dll/win32/kernel32/debug/debugger.c
similarity index 100%
rename from reactos/lib/kernel32/debug/debugger.c
rename to reactos/dll/win32/kernel32/debug/debugger.c

diff --git a/reactos/lib/kernel32/debug/output.c b/reactos/dll/win32/kernel32/debug/output.c
similarity index 100%
rename from reactos/lib/kernel32/debug/output.c
rename to reactos/dll/win32/kernel32/debug/output.c

diff --git a/reactos/lib/kernel32/except/except.c b/reactos/dll/win32/kernel32/except/except.c
similarity index 100%
rename from reactos/lib/kernel32/except/except.c
rename to reactos/dll/win32/kernel32/except/except.c

diff --git a/reactos/lib/kernel32/file/backup.c b/reactos/dll/win32/kernel32/file/backup.c
similarity index 100%
rename from reactos/lib/kernel32/file/backup.c
rename to reactos/dll/win32/kernel32/file/backup.c

diff --git a/reactos/lib/kernel32/file/bintype.c b/reactos/dll/win32/kernel32/file/bintype.c
similarity index 100%
rename from reactos/lib/kernel32/file/bintype.c
rename to reactos/dll/win32/kernel32/file/bintype.c

diff --git a/reactos/lib/kernel32/file/cnotify.c b/reactos/dll/win32/kernel32/file/cnotify.c
similarity index 100%
rename from reactos/lib/kernel32/file/cnotify.c
rename to reactos/dll/win32/kernel32/file/cnotify.c

diff --git a/reactos/lib/kernel32/file/copy.c b/reactos/dll/win32/kernel32/file/copy.c
similarity index 100%
rename from reactos/lib/kernel32/file/copy.c
rename to reactos/dll/win32/kernel32/file/copy.c

diff --git a/reactos/lib/kernel32/file/create.c b/reactos/dll/win32/kernel32/file/create.c
similarity index 100%
rename from reactos/lib/kernel32/file/create.c
rename to reactos/dll/win32/kernel32/file/create.c

diff --git a/reactos/lib/kernel32/file/curdir.c b/reactos/dll/win32/kernel32/file/curdir.c
similarity index 100%
rename from reactos/lib/kernel32/file/curdir.c
rename to reactos/dll/win32/kernel32/file/curdir.c

diff --git a/reactos/lib/kernel32/file/delete.c b/reactos/dll/win32/kernel32/file/delete.c
similarity index 100%
rename from reactos/lib/kernel32/file/delete.c
rename to reactos/dll/win32/kernel32/file/delete.c

diff --git a/reactos/lib/kernel32/file/deviceio.c b/reactos/dll/win32/kernel32/file/deviceio.c
similarity index 100%
rename from reactos/lib/kernel32/file/deviceio.c
rename to reactos/dll/win32/kernel32/file/deviceio.c

diff --git a/reactos/lib/kernel32/file/dir.c b/reactos/dll/win32/kernel32/file/dir.c
similarity index 100%
rename from reactos/lib/kernel32/file/dir.c
rename to reactos/dll/win32/kernel32/file/dir.c

diff --git a/reactos/lib/kernel32/file/dosdev.c b/reactos/dll/win32/kernel32/file/dosdev.c
similarity index 100%
rename from reactos/lib/kernel32/file/dosdev.c
rename to reactos/dll/win32/kernel32/file/dosdev.c

diff --git a/reactos/lib/kernel32/file/file.c b/reactos/dll/win32/kernel32/file/file.c
similarity index 100%
rename from reactos/lib/kernel32/file/file.c
rename to reactos/dll/win32/kernel32/file/file.c

diff --git a/reactos/lib/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c
similarity index 100%
rename from reactos/lib/kernel32/file/find.c
rename to reactos/dll/win32/kernel32/file/find.c

diff --git a/reactos/lib/kernel32/file/hardlink.c b/reactos/dll/win32/kernel32/file/hardlink.c
similarity index 100%
rename from reactos/lib/kernel32/file/hardlink.c
rename to reactos/dll/win32/kernel32/file/hardlink.c

diff --git a/reactos/lib/kernel32/file/iocompl.c b/reactos/dll/win32/kernel32/file/iocompl.c
similarity index 100%
rename from reactos/lib/kernel32/file/iocompl.c
rename to reactos/dll/win32/kernel32/file/iocompl.c

diff --git a/reactos/lib/kernel32/file/lfile.c b/reactos/dll/win32/kernel32/file/lfile.c
similarity index 100%
rename from reactos/lib/kernel32/file/lfile.c
rename to reactos/dll/win32/kernel32/file/lfile.c

diff --git a/reactos/lib/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c
similarity index 100%
rename from reactos/lib/kernel32/file/lock.c
rename to reactos/dll/win32/kernel32/file/lock.c

diff --git a/reactos/lib/kernel32/file/mailslot.c b/reactos/dll/win32/kernel32/file/mailslot.c
similarity index 100%
rename from reactos/lib/kernel32/file/mailslot.c
rename to reactos/dll/win32/kernel32/file/mailslot.c

diff --git a/reactos/lib/kernel32/file/move.c b/reactos/dll/win32/kernel32/file/move.c
similarity index 100%
rename from reactos/lib/kernel32/file/move.c
rename to reactos/dll/win32/kernel32/file/move.c

diff --git a/reactos/lib/kernel32/file/npipe.c b/reactos/dll/win32/kernel32/file/npipe.c
similarity index 100%
rename from reactos/lib/kernel32/file/npipe.c
rename to reactos/dll/win32/kernel32/file/npipe.c

diff --git a/reactos/lib/kernel32/file/pipe.c b/reactos/dll/win32/kernel32/file/pipe.c
similarity index 100%
rename from reactos/lib/kernel32/file/pipe.c
rename to reactos/dll/win32/kernel32/file/pipe.c

diff --git a/reactos/lib/kernel32/file/rw.c b/reactos/dll/win32/kernel32/file/rw.c
similarity index 100%
rename from reactos/lib/kernel32/file/rw.c
rename to reactos/dll/win32/kernel32/file/rw.c

diff --git a/reactos/lib/kernel32/file/tape.c b/reactos/dll/win32/kernel32/file/tape.c
similarity index 100%
rename from reactos/lib/kernel32/file/tape.c
rename to reactos/dll/win32/kernel32/file/tape.c

diff --git a/reactos/lib/kernel32/file/volume.c b/reactos/dll/win32/kernel32/file/volume.c
similarity index 100%
rename from reactos/lib/kernel32/file/volume.c
rename to reactos/dll/win32/kernel32/file/volume.c

diff --git a/reactos/lib/kernel32/include/debug.h b/reactos/dll/win32/kernel32/include/debug.h
similarity index 100%
rename from reactos/lib/kernel32/include/debug.h
rename to reactos/dll/win32/kernel32/include/debug.h

diff --git a/reactos/lib/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h
similarity index 100%
rename from reactos/lib/kernel32/include/kernel32.h
rename to reactos/dll/win32/kernel32/include/kernel32.h

diff --git a/reactos/lib/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h
similarity index 100%
rename from reactos/lib/kernel32/k32.h
rename to reactos/dll/win32/kernel32/k32.h

diff --git a/reactos/lib/kernel32/kernel32.def b/reactos/dll/win32/kernel32/kernel32.def
similarity index 100%
rename from reactos/lib/kernel32/kernel32.def
rename to reactos/dll/win32/kernel32/kernel32.def

diff --git a/reactos/lib/kernel32/kernel32.mc b/reactos/dll/win32/kernel32/kernel32.mc
similarity index 100%
rename from reactos/lib/kernel32/kernel32.mc
rename to reactos/dll/win32/kernel32/kernel32.mc

diff --git a/reactos/lib/kernel32/kernel32.rc b/reactos/dll/win32/kernel32/kernel32.rc
similarity index 100%
rename from reactos/lib/kernel32/kernel32.rc
rename to reactos/dll/win32/kernel32/kernel32.rc

diff --git a/reactos/lib/kernel32/kernel32.xml b/reactos/dll/win32/kernel32/kernel32.xml
similarity index 100%
rename from reactos/lib/kernel32/kernel32.xml
rename to reactos/dll/win32/kernel32/kernel32.xml

diff --git a/reactos/lib/kernel32/locale_rc.rc b/reactos/dll/win32/kernel32/locale_rc.rc
similarity index 100%
rename from reactos/lib/kernel32/locale_rc.rc
rename to reactos/dll/win32/kernel32/locale_rc.rc

diff --git a/reactos/lib/kernel32/mem/global.c b/reactos/dll/win32/kernel32/mem/global.c
similarity index 100%
rename from reactos/lib/kernel32/mem/global.c
rename to reactos/dll/win32/kernel32/mem/global.c

diff --git a/reactos/lib/kernel32/mem/heap.c b/reactos/dll/win32/kernel32/mem/heap.c
similarity index 100%
rename from reactos/lib/kernel32/mem/heap.c
rename to reactos/dll/win32/kernel32/mem/heap.c

diff --git a/reactos/lib/kernel32/mem/isbad.c b/reactos/dll/win32/kernel32/mem/isbad.c
similarity index 100%
rename from reactos/lib/kernel32/mem/isbad.c
rename to reactos/dll/win32/kernel32/mem/isbad.c

diff --git a/reactos/lib/kernel32/mem/local.c b/reactos/dll/win32/kernel32/mem/local.c
similarity index 100%
rename from reactos/lib/kernel32/mem/local.c
rename to reactos/dll/win32/kernel32/mem/local.c

diff --git a/reactos/lib/kernel32/mem/procmem.c b/reactos/dll/win32/kernel32/mem/procmem.c
similarity index 100%
rename from reactos/lib/kernel32/mem/procmem.c
rename to reactos/dll/win32/kernel32/mem/procmem.c

diff --git a/reactos/lib/kernel32/mem/resnotify.c b/reactos/dll/win32/kernel32/mem/resnotify.c
similarity index 100%
rename from reactos/lib/kernel32/mem/resnotify.c
rename to reactos/dll/win32/kernel32/mem/resnotify.c

diff --git a/reactos/lib/kernel32/mem/section.c b/reactos/dll/win32/kernel32/mem/section.c
similarity index 100%
rename from reactos/lib/kernel32/mem/section.c
rename to reactos/dll/win32/kernel32/mem/section.c

diff --git a/reactos/lib/kernel32/mem/virtual.c b/reactos/dll/win32/kernel32/mem/virtual.c
similarity index 100%
rename from reactos/lib/kernel32/mem/virtual.c
rename to reactos/dll/win32/kernel32/mem/virtual.c

diff --git a/reactos/lib/kernel32/misc/actctx.c b/reactos/dll/win32/kernel32/misc/actctx.c
similarity index 100%
rename from reactos/lib/kernel32/misc/actctx.c
rename to reactos/dll/win32/kernel32/misc/actctx.c

diff --git a/reactos/lib/kernel32/misc/atom.c b/reactos/dll/win32/kernel32/misc/atom.c
similarity index 100%
rename from reactos/lib/kernel32/misc/atom.c
rename to reactos/dll/win32/kernel32/misc/atom.c

diff --git a/reactos/lib/kernel32/misc/chartype.c b/reactos/dll/win32/kernel32/misc/chartype.c
similarity index 100%
rename from reactos/lib/kernel32/misc/chartype.c
rename to reactos/dll/win32/kernel32/misc/chartype.c

diff --git a/reactos/lib/kernel32/misc/comm.c b/reactos/dll/win32/kernel32/misc/comm.c
similarity index 100%
rename from reactos/lib/kernel32/misc/comm.c
rename to reactos/dll/win32/kernel32/misc/comm.c

diff --git a/reactos/lib/kernel32/misc/computername.c b/reactos/dll/win32/kernel32/misc/computername.c
similarity index 100%
rename from reactos/lib/kernel32/misc/computername.c
rename to reactos/dll/win32/kernel32/misc/computername.c

diff --git a/reactos/lib/kernel32/misc/console.c b/reactos/dll/win32/kernel32/misc/console.c
similarity index 100%
rename from reactos/lib/kernel32/misc/console.c
rename to reactos/dll/win32/kernel32/misc/console.c

diff --git a/reactos/lib/kernel32/misc/dllmain.c b/reactos/dll/win32/kernel32/misc/dllmain.c
similarity index 100%
rename from reactos/lib/kernel32/misc/dllmain.c
rename to reactos/dll/win32/kernel32/misc/dllmain.c

diff --git a/reactos/lib/kernel32/misc/env.c b/reactos/dll/win32/kernel32/misc/env.c
similarity index 100%
rename from reactos/lib/kernel32/misc/env.c
rename to reactos/dll/win32/kernel32/misc/env.c

diff --git a/reactos/lib/kernel32/misc/error.c b/reactos/dll/win32/kernel32/misc/error.c
similarity index 100%
rename from reactos/lib/kernel32/misc/error.c
rename to reactos/dll/win32/kernel32/misc/error.c

diff --git a/reactos/lib/kernel32/misc/errormsg.c b/reactos/dll/win32/kernel32/misc/errormsg.c
similarity index 100%
rename from reactos/lib/kernel32/misc/errormsg.c
rename to reactos/dll/win32/kernel32/misc/errormsg.c

diff --git a/reactos/lib/kernel32/misc/handle.c b/reactos/dll/win32/kernel32/misc/handle.c
similarity index 100%
rename from reactos/lib/kernel32/misc/handle.c
rename to reactos/dll/win32/kernel32/misc/handle.c

diff --git a/reactos/lib/kernel32/misc/lang.c b/reactos/dll/win32/kernel32/misc/lang.c
similarity index 100%
rename from reactos/lib/kernel32/misc/lang.c
rename to reactos/dll/win32/kernel32/misc/lang.c

diff --git a/reactos/lib/kernel32/misc/lcformat.c b/reactos/dll/win32/kernel32/misc/lcformat.c
similarity index 100%
rename from reactos/lib/kernel32/misc/lcformat.c
rename to reactos/dll/win32/kernel32/misc/lcformat.c

diff --git a/reactos/lib/kernel32/misc/ldr.c b/reactos/dll/win32/kernel32/misc/ldr.c
similarity index 100%
rename from reactos/lib/kernel32/misc/ldr.c
rename to reactos/dll/win32/kernel32/misc/ldr.c

diff --git a/reactos/lib/kernel32/misc/lzexpand_main.c b/reactos/dll/win32/kernel32/misc/lzexpand_main.c
similarity index 100%
rename from reactos/lib/kernel32/misc/lzexpand_main.c
rename to reactos/dll/win32/kernel32/misc/lzexpand_main.c

diff --git a/reactos/lib/kernel32/misc/muldiv.c b/reactos/dll/win32/kernel32/misc/muldiv.c
similarity index 100%
rename from reactos/lib/kernel32/misc/muldiv.c
rename to reactos/dll/win32/kernel32/misc/muldiv.c

diff --git a/reactos/lib/kernel32/misc/nls.c b/reactos/dll/win32/kernel32/misc/nls.c
similarity index 100%
rename from reactos/lib/kernel32/misc/nls.c
rename to reactos/dll/win32/kernel32/misc/nls.c

diff --git a/reactos/lib/kernel32/misc/perfcnt.c b/reactos/dll/win32/kernel32/misc/perfcnt.c
similarity index 100%
rename from reactos/lib/kernel32/misc/perfcnt.c
rename to reactos/dll/win32/kernel32/misc/perfcnt.c

diff --git a/reactos/lib/kernel32/misc/profile.c b/reactos/dll/win32/kernel32/misc/profile.c
similarity index 100%
rename from reactos/lib/kernel32/misc/profile.c
rename to reactos/dll/win32/kernel32/misc/profile.c

diff --git a/reactos/lib/kernel32/misc/recovery.c b/reactos/dll/win32/kernel32/misc/recovery.c
similarity index 100%
rename from reactos/lib/kernel32/misc/recovery.c
rename to reactos/dll/win32/kernel32/misc/recovery.c

diff --git a/reactos/lib/kernel32/misc/res.c b/reactos/dll/win32/kernel32/misc/res.c
similarity index 100%
rename from reactos/lib/kernel32/misc/res.c
rename to reactos/dll/win32/kernel32/misc/res.c

diff --git a/reactos/lib/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/misc/stubs.c
similarity index 100%
rename from reactos/lib/kernel32/misc/stubs.c
rename to reactos/dll/win32/kernel32/misc/stubs.c

diff --git a/reactos/lib/kernel32/misc/sysinfo.c b/reactos/dll/win32/kernel32/misc/sysinfo.c
similarity index 100%
rename from reactos/lib/kernel32/misc/sysinfo.c
rename to reactos/dll/win32/kernel32/misc/sysinfo.c

diff --git a/reactos/lib/kernel32/misc/time.c b/reactos/dll/win32/kernel32/misc/time.c
similarity index 100%
rename from reactos/lib/kernel32/misc/time.c
rename to reactos/dll/win32/kernel32/misc/time.c

diff --git a/reactos/lib/kernel32/misc/timerqueue.c b/reactos/dll/win32/kernel32/misc/timerqueue.c
similarity index 100%
rename from reactos/lib/kernel32/misc/timerqueue.c
rename to reactos/dll/win32/kernel32/misc/timerqueue.c

diff --git a/reactos/lib/kernel32/misc/toolhelp.c b/reactos/dll/win32/kernel32/misc/toolhelp.c
similarity index 100%
rename from reactos/lib/kernel32/misc/toolhelp.c
rename to reactos/dll/win32/kernel32/misc/toolhelp.c

diff --git a/reactos/lib/kernel32/misc/utils.c b/reactos/dll/win32/kernel32/misc/utils.c
similarity index 100%
rename from reactos/lib/kernel32/misc/utils.c
rename to reactos/dll/win32/kernel32/misc/utils.c

diff --git a/reactos/lib/kernel32/misc/version.c b/reactos/dll/win32/kernel32/misc/version.c
similarity index 100%
rename from reactos/lib/kernel32/misc/version.c
rename to reactos/dll/win32/kernel32/misc/version.c

diff --git a/reactos/lib/kernel32/nls/afk.nls b/reactos/dll/win32/kernel32/nls/afk.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/afk.nls
rename to reactos/dll/win32/kernel32/nls/afk.nls

diff --git a/reactos/lib/kernel32/nls/bel.nls b/reactos/dll/win32/kernel32/nls/bel.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/bel.nls
rename to reactos/dll/win32/kernel32/nls/bel.nls

diff --git a/reactos/lib/kernel32/nls/bgr.nls b/reactos/dll/win32/kernel32/nls/bgr.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/bgr.nls
rename to reactos/dll/win32/kernel32/nls/bgr.nls

diff --git a/reactos/lib/kernel32/nls/cat.nls b/reactos/dll/win32/kernel32/nls/cat.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/cat.nls
rename to reactos/dll/win32/kernel32/nls/cat.nls

diff --git a/reactos/lib/kernel32/nls/chs.nls b/reactos/dll/win32/kernel32/nls/chs.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/chs.nls
rename to reactos/dll/win32/kernel32/nls/chs.nls

diff --git a/reactos/lib/kernel32/nls/cht.nls b/reactos/dll/win32/kernel32/nls/cht.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/cht.nls
rename to reactos/dll/win32/kernel32/nls/cht.nls

diff --git a/reactos/lib/kernel32/nls/csy.nls b/reactos/dll/win32/kernel32/nls/csy.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/csy.nls
rename to reactos/dll/win32/kernel32/nls/csy.nls

diff --git a/reactos/lib/kernel32/nls/dan.nls b/reactos/dll/win32/kernel32/nls/dan.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/dan.nls
rename to reactos/dll/win32/kernel32/nls/dan.nls

diff --git a/reactos/lib/kernel32/nls/dea.nls b/reactos/dll/win32/kernel32/nls/dea.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/dea.nls
rename to reactos/dll/win32/kernel32/nls/dea.nls

diff --git a/reactos/lib/kernel32/nls/dec.nls b/reactos/dll/win32/kernel32/nls/dec.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/dec.nls
rename to reactos/dll/win32/kernel32/nls/dec.nls

diff --git a/reactos/lib/kernel32/nls/del.nls b/reactos/dll/win32/kernel32/nls/del.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/del.nls
rename to reactos/dll/win32/kernel32/nls/del.nls

diff --git a/reactos/lib/kernel32/nls/des.nls b/reactos/dll/win32/kernel32/nls/des.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/des.nls
rename to reactos/dll/win32/kernel32/nls/des.nls

diff --git a/reactos/lib/kernel32/nls/deu.nls b/reactos/dll/win32/kernel32/nls/deu.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/deu.nls
rename to reactos/dll/win32/kernel32/nls/deu.nls

diff --git a/reactos/lib/kernel32/nls/ell.nls b/reactos/dll/win32/kernel32/nls/ell.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ell.nls
rename to reactos/dll/win32/kernel32/nls/ell.nls

diff --git a/reactos/lib/kernel32/nls/ena.nls b/reactos/dll/win32/kernel32/nls/ena.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ena.nls
rename to reactos/dll/win32/kernel32/nls/ena.nls

diff --git a/reactos/lib/kernel32/nls/enb.nls b/reactos/dll/win32/kernel32/nls/enb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enb.nls
rename to reactos/dll/win32/kernel32/nls/enb.nls

diff --git a/reactos/lib/kernel32/nls/enc.nls b/reactos/dll/win32/kernel32/nls/enc.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enc.nls
rename to reactos/dll/win32/kernel32/nls/enc.nls

diff --git a/reactos/lib/kernel32/nls/eng.nls b/reactos/dll/win32/kernel32/nls/eng.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/eng.nls
rename to reactos/dll/win32/kernel32/nls/eng.nls

diff --git a/reactos/lib/kernel32/nls/eni.nls b/reactos/dll/win32/kernel32/nls/eni.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/eni.nls
rename to reactos/dll/win32/kernel32/nls/eni.nls

diff --git a/reactos/lib/kernel32/nls/enj.nls b/reactos/dll/win32/kernel32/nls/enj.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enj.nls
rename to reactos/dll/win32/kernel32/nls/enj.nls

diff --git a/reactos/lib/kernel32/nls/enl.nls b/reactos/dll/win32/kernel32/nls/enl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enl.nls
rename to reactos/dll/win32/kernel32/nls/enl.nls

diff --git a/reactos/lib/kernel32/nls/enp.nls b/reactos/dll/win32/kernel32/nls/enp.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enp.nls
rename to reactos/dll/win32/kernel32/nls/enp.nls

diff --git a/reactos/lib/kernel32/nls/ens.nls b/reactos/dll/win32/kernel32/nls/ens.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ens.nls
rename to reactos/dll/win32/kernel32/nls/ens.nls

diff --git a/reactos/lib/kernel32/nls/ent.nls b/reactos/dll/win32/kernel32/nls/ent.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ent.nls
rename to reactos/dll/win32/kernel32/nls/ent.nls

diff --git a/reactos/lib/kernel32/nls/enu.nls b/reactos/dll/win32/kernel32/nls/enu.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enu.nls
rename to reactos/dll/win32/kernel32/nls/enu.nls

diff --git a/reactos/lib/kernel32/nls/enw.nls b/reactos/dll/win32/kernel32/nls/enw.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enw.nls
rename to reactos/dll/win32/kernel32/nls/enw.nls

diff --git a/reactos/lib/kernel32/nls/enz.nls b/reactos/dll/win32/kernel32/nls/enz.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/enz.nls
rename to reactos/dll/win32/kernel32/nls/enz.nls

diff --git a/reactos/lib/kernel32/nls/esa.nls b/reactos/dll/win32/kernel32/nls/esa.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esa.nls
rename to reactos/dll/win32/kernel32/nls/esa.nls

diff --git a/reactos/lib/kernel32/nls/esb.nls b/reactos/dll/win32/kernel32/nls/esb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esb.nls
rename to reactos/dll/win32/kernel32/nls/esb.nls

diff --git a/reactos/lib/kernel32/nls/esd.nls b/reactos/dll/win32/kernel32/nls/esd.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esd.nls
rename to reactos/dll/win32/kernel32/nls/esd.nls

diff --git a/reactos/lib/kernel32/nls/ese.nls b/reactos/dll/win32/kernel32/nls/ese.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ese.nls
rename to reactos/dll/win32/kernel32/nls/ese.nls

diff --git a/reactos/lib/kernel32/nls/esf.nls b/reactos/dll/win32/kernel32/nls/esf.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esf.nls
rename to reactos/dll/win32/kernel32/nls/esf.nls

diff --git a/reactos/lib/kernel32/nls/esg.nls b/reactos/dll/win32/kernel32/nls/esg.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esg.nls
rename to reactos/dll/win32/kernel32/nls/esg.nls

diff --git a/reactos/lib/kernel32/nls/esh.nls b/reactos/dll/win32/kernel32/nls/esh.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esh.nls
rename to reactos/dll/win32/kernel32/nls/esh.nls

diff --git a/reactos/lib/kernel32/nls/esi.nls b/reactos/dll/win32/kernel32/nls/esi.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esi.nls
rename to reactos/dll/win32/kernel32/nls/esi.nls

diff --git a/reactos/lib/kernel32/nls/esl.nls b/reactos/dll/win32/kernel32/nls/esl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esl.nls
rename to reactos/dll/win32/kernel32/nls/esl.nls

diff --git a/reactos/lib/kernel32/nls/esm.nls b/reactos/dll/win32/kernel32/nls/esm.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esm.nls
rename to reactos/dll/win32/kernel32/nls/esm.nls

diff --git a/reactos/lib/kernel32/nls/esn.nls b/reactos/dll/win32/kernel32/nls/esn.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esn.nls
rename to reactos/dll/win32/kernel32/nls/esn.nls

diff --git a/reactos/lib/kernel32/nls/eso.nls b/reactos/dll/win32/kernel32/nls/eso.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/eso.nls
rename to reactos/dll/win32/kernel32/nls/eso.nls

diff --git a/reactos/lib/kernel32/nls/esp.nls b/reactos/dll/win32/kernel32/nls/esp.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esp.nls
rename to reactos/dll/win32/kernel32/nls/esp.nls

diff --git a/reactos/lib/kernel32/nls/esr.nls b/reactos/dll/win32/kernel32/nls/esr.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esr.nls
rename to reactos/dll/win32/kernel32/nls/esr.nls

diff --git a/reactos/lib/kernel32/nls/ess.nls b/reactos/dll/win32/kernel32/nls/ess.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ess.nls
rename to reactos/dll/win32/kernel32/nls/ess.nls

diff --git a/reactos/lib/kernel32/nls/esu.nls b/reactos/dll/win32/kernel32/nls/esu.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esu.nls
rename to reactos/dll/win32/kernel32/nls/esu.nls

diff --git a/reactos/lib/kernel32/nls/esv.nls b/reactos/dll/win32/kernel32/nls/esv.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esv.nls
rename to reactos/dll/win32/kernel32/nls/esv.nls

diff --git a/reactos/lib/kernel32/nls/esy.nls b/reactos/dll/win32/kernel32/nls/esy.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esy.nls
rename to reactos/dll/win32/kernel32/nls/esy.nls

diff --git a/reactos/lib/kernel32/nls/esz.nls b/reactos/dll/win32/kernel32/nls/esz.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/esz.nls
rename to reactos/dll/win32/kernel32/nls/esz.nls

diff --git a/reactos/lib/kernel32/nls/eti.nls b/reactos/dll/win32/kernel32/nls/eti.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/eti.nls
rename to reactos/dll/win32/kernel32/nls/eti.nls

diff --git a/reactos/lib/kernel32/nls/euq.nls b/reactos/dll/win32/kernel32/nls/euq.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/euq.nls
rename to reactos/dll/win32/kernel32/nls/euq.nls

diff --git a/reactos/lib/kernel32/nls/fin.nls b/reactos/dll/win32/kernel32/nls/fin.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/fin.nls
rename to reactos/dll/win32/kernel32/nls/fin.nls

diff --git a/reactos/lib/kernel32/nls/fos.nls b/reactos/dll/win32/kernel32/nls/fos.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/fos.nls
rename to reactos/dll/win32/kernel32/nls/fos.nls

diff --git a/reactos/lib/kernel32/nls/fra.nls b/reactos/dll/win32/kernel32/nls/fra.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/fra.nls
rename to reactos/dll/win32/kernel32/nls/fra.nls

diff --git a/reactos/lib/kernel32/nls/frb.nls b/reactos/dll/win32/kernel32/nls/frb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/frb.nls
rename to reactos/dll/win32/kernel32/nls/frb.nls

diff --git a/reactos/lib/kernel32/nls/frc.nls b/reactos/dll/win32/kernel32/nls/frc.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/frc.nls
rename to reactos/dll/win32/kernel32/nls/frc.nls

diff --git a/reactos/lib/kernel32/nls/frl.nls b/reactos/dll/win32/kernel32/nls/frl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/frl.nls
rename to reactos/dll/win32/kernel32/nls/frl.nls

diff --git a/reactos/lib/kernel32/nls/frm.nls b/reactos/dll/win32/kernel32/nls/frm.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/frm.nls
rename to reactos/dll/win32/kernel32/nls/frm.nls

diff --git a/reactos/lib/kernel32/nls/frs.nls b/reactos/dll/win32/kernel32/nls/frs.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/frs.nls
rename to reactos/dll/win32/kernel32/nls/frs.nls

diff --git a/reactos/lib/kernel32/nls/glc.nls b/reactos/dll/win32/kernel32/nls/glc.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/glc.nls
rename to reactos/dll/win32/kernel32/nls/glc.nls

diff --git a/reactos/lib/kernel32/nls/heb.nls b/reactos/dll/win32/kernel32/nls/heb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/heb.nls
rename to reactos/dll/win32/kernel32/nls/heb.nls

diff --git a/reactos/lib/kernel32/nls/hrv.nls b/reactos/dll/win32/kernel32/nls/hrv.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/hrv.nls
rename to reactos/dll/win32/kernel32/nls/hrv.nls

diff --git a/reactos/lib/kernel32/nls/hun.nls b/reactos/dll/win32/kernel32/nls/hun.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/hun.nls
rename to reactos/dll/win32/kernel32/nls/hun.nls

diff --git a/reactos/lib/kernel32/nls/ind.nls b/reactos/dll/win32/kernel32/nls/ind.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ind.nls
rename to reactos/dll/win32/kernel32/nls/ind.nls

diff --git a/reactos/lib/kernel32/nls/isl.nls b/reactos/dll/win32/kernel32/nls/isl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/isl.nls
rename to reactos/dll/win32/kernel32/nls/isl.nls

diff --git a/reactos/lib/kernel32/nls/ita.nls b/reactos/dll/win32/kernel32/nls/ita.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ita.nls
rename to reactos/dll/win32/kernel32/nls/ita.nls

diff --git a/reactos/lib/kernel32/nls/its.nls b/reactos/dll/win32/kernel32/nls/its.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/its.nls
rename to reactos/dll/win32/kernel32/nls/its.nls

diff --git a/reactos/lib/kernel32/nls/lvi.nls b/reactos/dll/win32/kernel32/nls/lvi.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/lvi.nls
rename to reactos/dll/win32/kernel32/nls/lvi.nls

diff --git a/reactos/lib/kernel32/nls/mki.nls b/reactos/dll/win32/kernel32/nls/mki.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/mki.nls
rename to reactos/dll/win32/kernel32/nls/mki.nls

diff --git a/reactos/lib/kernel32/nls/msb.nls b/reactos/dll/win32/kernel32/nls/msb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/msb.nls
rename to reactos/dll/win32/kernel32/nls/msb.nls

diff --git a/reactos/lib/kernel32/nls/msl.nls b/reactos/dll/win32/kernel32/nls/msl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/msl.nls
rename to reactos/dll/win32/kernel32/nls/msl.nls

diff --git a/reactos/lib/kernel32/nls/nlb.nls b/reactos/dll/win32/kernel32/nls/nlb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/nlb.nls
rename to reactos/dll/win32/kernel32/nls/nlb.nls

diff --git a/reactos/lib/kernel32/nls/nld.nls b/reactos/dll/win32/kernel32/nls/nld.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/nld.nls
rename to reactos/dll/win32/kernel32/nls/nld.nls

diff --git a/reactos/lib/kernel32/nls/non.nls b/reactos/dll/win32/kernel32/nls/non.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/non.nls
rename to reactos/dll/win32/kernel32/nls/non.nls

diff --git a/reactos/lib/kernel32/nls/nor.nls b/reactos/dll/win32/kernel32/nls/nor.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/nor.nls
rename to reactos/dll/win32/kernel32/nls/nor.nls

diff --git a/reactos/lib/kernel32/nls/plk.nls b/reactos/dll/win32/kernel32/nls/plk.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/plk.nls
rename to reactos/dll/win32/kernel32/nls/plk.nls

diff --git a/reactos/lib/kernel32/nls/ptb.nls b/reactos/dll/win32/kernel32/nls/ptb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ptb.nls
rename to reactos/dll/win32/kernel32/nls/ptb.nls

diff --git a/reactos/lib/kernel32/nls/ptg.nls b/reactos/dll/win32/kernel32/nls/ptg.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ptg.nls
rename to reactos/dll/win32/kernel32/nls/ptg.nls

diff --git a/reactos/lib/kernel32/nls/rom.nls b/reactos/dll/win32/kernel32/nls/rom.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/rom.nls
rename to reactos/dll/win32/kernel32/nls/rom.nls

diff --git a/reactos/lib/kernel32/nls/rus.nls b/reactos/dll/win32/kernel32/nls/rus.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/rus.nls
rename to reactos/dll/win32/kernel32/nls/rus.nls

diff --git a/reactos/lib/kernel32/nls/sky.nls b/reactos/dll/win32/kernel32/nls/sky.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/sky.nls
rename to reactos/dll/win32/kernel32/nls/sky.nls

diff --git a/reactos/lib/kernel32/nls/slv.nls b/reactos/dll/win32/kernel32/nls/slv.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/slv.nls
rename to reactos/dll/win32/kernel32/nls/slv.nls

diff --git a/reactos/lib/kernel32/nls/sqi.nls b/reactos/dll/win32/kernel32/nls/sqi.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/sqi.nls
rename to reactos/dll/win32/kernel32/nls/sqi.nls

diff --git a/reactos/lib/kernel32/nls/srb.nls b/reactos/dll/win32/kernel32/nls/srb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/srb.nls
rename to reactos/dll/win32/kernel32/nls/srb.nls

diff --git a/reactos/lib/kernel32/nls/srl.nls b/reactos/dll/win32/kernel32/nls/srl.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/srl.nls
rename to reactos/dll/win32/kernel32/nls/srl.nls

diff --git a/reactos/lib/kernel32/nls/sve.nls b/reactos/dll/win32/kernel32/nls/sve.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/sve.nls
rename to reactos/dll/win32/kernel32/nls/sve.nls

diff --git a/reactos/lib/kernel32/nls/svf.nls b/reactos/dll/win32/kernel32/nls/svf.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/svf.nls
rename to reactos/dll/win32/kernel32/nls/svf.nls

diff --git a/reactos/lib/kernel32/nls/swk.nls b/reactos/dll/win32/kernel32/nls/swk.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/swk.nls
rename to reactos/dll/win32/kernel32/nls/swk.nls

diff --git a/reactos/lib/kernel32/nls/tam.nls b/reactos/dll/win32/kernel32/nls/tam.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/tam.nls
rename to reactos/dll/win32/kernel32/nls/tam.nls

diff --git a/reactos/lib/kernel32/nls/tha.nls b/reactos/dll/win32/kernel32/nls/tha.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/tha.nls
rename to reactos/dll/win32/kernel32/nls/tha.nls

diff --git a/reactos/lib/kernel32/nls/trk.nls b/reactos/dll/win32/kernel32/nls/trk.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/trk.nls
rename to reactos/dll/win32/kernel32/nls/trk.nls

diff --git a/reactos/lib/kernel32/nls/ukr.nls b/reactos/dll/win32/kernel32/nls/ukr.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/ukr.nls
rename to reactos/dll/win32/kernel32/nls/ukr.nls

diff --git a/reactos/lib/kernel32/nls/uzb.nls b/reactos/dll/win32/kernel32/nls/uzb.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/uzb.nls
rename to reactos/dll/win32/kernel32/nls/uzb.nls

diff --git a/reactos/lib/kernel32/nls/zhi.nls b/reactos/dll/win32/kernel32/nls/zhi.nls
similarity index 100%
rename from reactos/lib/kernel32/nls/zhi.nls
rename to reactos/dll/win32/kernel32/nls/zhi.nls

diff --git a/reactos/lib/kernel32/process/cmdline.c b/reactos/dll/win32/kernel32/process/cmdline.c
similarity index 100%
rename from reactos/lib/kernel32/process/cmdline.c
rename to reactos/dll/win32/kernel32/process/cmdline.c

diff --git a/reactos/lib/kernel32/process/create.c b/reactos/dll/win32/kernel32/process/create.c
similarity index 100%
rename from reactos/lib/kernel32/process/create.c
rename to reactos/dll/win32/kernel32/process/create.c

diff --git a/reactos/lib/kernel32/process/job.c b/reactos/dll/win32/kernel32/process/job.c
similarity index 100%
rename from reactos/lib/kernel32/process/job.c
rename to reactos/dll/win32/kernel32/process/job.c

diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/dll/win32/kernel32/process/proc.c
similarity index 100%
rename from reactos/lib/kernel32/process/proc.c
rename to reactos/dll/win32/kernel32/process/proc.c

diff --git a/reactos/lib/kernel32/process/session.c b/reactos/dll/win32/kernel32/process/session.c
similarity index 100%
rename from reactos/lib/kernel32/process/session.c
rename to reactos/dll/win32/kernel32/process/session.c

diff --git a/reactos/lib/kernel32/string/lstring.c b/reactos/dll/win32/kernel32/string/lstring.c
similarity index 100%
rename from reactos/lib/kernel32/string/lstring.c
rename to reactos/dll/win32/kernel32/string/lstring.c

diff --git a/reactos/lib/kernel32/synch/critical.c b/reactos/dll/win32/kernel32/synch/critical.c
similarity index 100%
rename from reactos/lib/kernel32/synch/critical.c
rename to reactos/dll/win32/kernel32/synch/critical.c

diff --git a/reactos/lib/kernel32/synch/event.c b/reactos/dll/win32/kernel32/synch/event.c
similarity index 100%
rename from reactos/lib/kernel32/synch/event.c
rename to reactos/dll/win32/kernel32/synch/event.c

diff --git a/reactos/lib/kernel32/synch/mutex.c b/reactos/dll/win32/kernel32/synch/mutex.c
similarity index 100%
rename from reactos/lib/kernel32/synch/mutex.c
rename to reactos/dll/win32/kernel32/synch/mutex.c

diff --git a/reactos/lib/kernel32/synch/sem.c b/reactos/dll/win32/kernel32/synch/sem.c
similarity index 100%
rename from reactos/lib/kernel32/synch/sem.c
rename to reactos/dll/win32/kernel32/synch/sem.c

diff --git a/reactos/lib/kernel32/synch/timer.c b/reactos/dll/win32/kernel32/synch/timer.c
similarity index 100%
rename from reactos/lib/kernel32/synch/timer.c
rename to reactos/dll/win32/kernel32/synch/timer.c

diff --git a/reactos/lib/kernel32/synch/wait.c b/reactos/dll/win32/kernel32/synch/wait.c
similarity index 100%
rename from reactos/lib/kernel32/synch/wait.c
rename to reactos/dll/win32/kernel32/synch/wait.c

diff --git a/reactos/lib/kernel32/tests/CreateFile.c b/reactos/dll/win32/kernel32/tests/CreateFile.c
similarity index 100%
rename from reactos/lib/kernel32/tests/CreateFile.c
rename to reactos/dll/win32/kernel32/tests/CreateFile.c

diff --git a/reactos/lib/kernel32/tests/kernel32.xml b/reactos/dll/win32/kernel32/tests/kernel32.xml
similarity index 100%
rename from reactos/lib/kernel32/tests/kernel32.xml
rename to reactos/dll/win32/kernel32/tests/kernel32.xml

diff --git a/reactos/lib/kernel32/tests/setup.c b/reactos/dll/win32/kernel32/tests/setup.c
similarity index 100%
rename from reactos/lib/kernel32/tests/setup.c
rename to reactos/dll/win32/kernel32/tests/setup.c

diff --git a/reactos/lib/kernel32/tests/stubs.xml b/reactos/dll/win32/kernel32/tests/stubs.xml
similarity index 100%
rename from reactos/lib/kernel32/tests/stubs.xml
rename to reactos/dll/win32/kernel32/tests/stubs.xml

diff --git a/reactos/lib/kernel32/thread/fiber.c b/reactos/dll/win32/kernel32/thread/fiber.c
similarity index 100%
rename from reactos/lib/kernel32/thread/fiber.c
rename to reactos/dll/win32/kernel32/thread/fiber.c

diff --git a/reactos/lib/kernel32/thread/fls.c b/reactos/dll/win32/kernel32/thread/fls.c
similarity index 100%
rename from reactos/lib/kernel32/thread/fls.c
rename to reactos/dll/win32/kernel32/thread/fls.c

diff --git a/reactos/lib/kernel32/thread/i386/fiber.S b/reactos/dll/win32/kernel32/thread/i386/fiber.S
similarity index 100%
rename from reactos/lib/kernel32/thread/i386/fiber.S
rename to reactos/dll/win32/kernel32/thread/i386/fiber.S

diff --git a/reactos/lib/kernel32/thread/i386/thread.S b/reactos/dll/win32/kernel32/thread/i386/thread.S
similarity index 100%
rename from reactos/lib/kernel32/thread/i386/thread.S
rename to reactos/dll/win32/kernel32/thread/i386/thread.S

diff --git a/reactos/lib/kernel32/thread/thread.c b/reactos/dll/win32/kernel32/thread/thread.c
similarity index 100%
rename from reactos/lib/kernel32/thread/thread.c
rename to reactos/dll/win32/kernel32/thread/thread.c

diff --git a/reactos/lib/kernel32/thread/tls.c b/reactos/dll/win32/kernel32/thread/tls.c
similarity index 100%
rename from reactos/lib/kernel32/thread/tls.c
rename to reactos/dll/win32/kernel32/thread/tls.c

diff --git a/reactos/dll/mmdrv/auxil.c b/reactos/dll/win32/mmdrv/auxil.c
similarity index 100%
rename from reactos/dll/mmdrv/auxil.c
rename to reactos/dll/win32/mmdrv/auxil.c

diff --git a/reactos/dll/mmdrv/entry.c b/reactos/dll/win32/mmdrv/entry.c
similarity index 100%
rename from reactos/dll/mmdrv/entry.c
rename to reactos/dll/win32/mmdrv/entry.c

diff --git a/reactos/dll/mmdrv/midi.c b/reactos/dll/win32/mmdrv/midi.c
similarity index 100%
rename from reactos/dll/mmdrv/midi.c
rename to reactos/dll/win32/mmdrv/midi.c

diff --git a/reactos/dll/mmdrv/mmddk.h b/reactos/dll/win32/mmdrv/mmddk.h
similarity index 100%
rename from reactos/dll/mmdrv/mmddk.h
rename to reactos/dll/win32/mmdrv/mmddk.h

diff --git a/reactos/dll/mmdrv/mmdef.h b/reactos/dll/win32/mmdrv/mmdef.h
similarity index 100%
rename from reactos/dll/mmdrv/mmdef.h
rename to reactos/dll/win32/mmdrv/mmdef.h

diff --git a/reactos/dll/mmdrv/mmdrv.def b/reactos/dll/win32/mmdrv/mmdrv.def
similarity index 100%
rename from reactos/dll/mmdrv/mmdrv.def
rename to reactos/dll/win32/mmdrv/mmdrv.def

diff --git a/reactos/dll/mmdrv/mmdrv.h b/reactos/dll/win32/mmdrv/mmdrv.h
similarity index 100%
rename from reactos/dll/mmdrv/mmdrv.h
rename to reactos/dll/win32/mmdrv/mmdrv.h

diff --git a/reactos/dll/mmdrv/mmdrv.xml b/reactos/dll/win32/mmdrv/mmdrv.xml
similarity index 100%
rename from reactos/dll/mmdrv/mmdrv.xml
rename to reactos/dll/win32/mmdrv/mmdrv.xml

diff --git a/reactos/dll/mmdrv/utils.c b/reactos/dll/win32/mmdrv/utils.c
similarity index 100%
rename from reactos/dll/mmdrv/utils.c
rename to reactos/dll/win32/mmdrv/utils.c

diff --git a/reactos/dll/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c
similarity index 100%
rename from reactos/dll/mmdrv/wave.c
rename to reactos/dll/win32/mmdrv/wave.c

diff --git a/reactos/dll/mmdrv/wave.h b/reactos/dll/win32/mmdrv/wave.h
similarity index 100%
rename from reactos/dll/mmdrv/wave.h
rename to reactos/dll/win32/mmdrv/wave.h

diff --git a/reactos/dll/mpr/Makefile.in b/reactos/dll/win32/mpr/Makefile.in
similarity index 100%
rename from reactos/dll/mpr/Makefile.in
rename to reactos/dll/win32/mpr/Makefile.in

diff --git a/reactos/dll/mpr/auth.c b/reactos/dll/win32/mpr/auth.c
similarity index 100%
rename from reactos/dll/mpr/auth.c
rename to reactos/dll/win32/mpr/auth.c

diff --git a/reactos/dll/mpr/mpr.rc b/reactos/dll/win32/mpr/mpr.rc
similarity index 100%
rename from reactos/dll/mpr/mpr.rc
rename to reactos/dll/win32/mpr/mpr.rc

diff --git a/reactos/dll/mpr/mpr.spec b/reactos/dll/win32/mpr/mpr.spec
similarity index 100%
rename from reactos/dll/mpr/mpr.spec
rename to reactos/dll/win32/mpr/mpr.spec

diff --git a/reactos/dll/mpr/mpr.xml b/reactos/dll/win32/mpr/mpr.xml
similarity index 100%
rename from reactos/dll/mpr/mpr.xml
rename to reactos/dll/win32/mpr/mpr.xml

diff --git a/reactos/dll/mpr/mpr_Bg.rc b/reactos/dll/win32/mpr/mpr_Bg.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Bg.rc
rename to reactos/dll/win32/mpr/mpr_Bg.rc

diff --git a/reactos/dll/mpr/mpr_Cs.rc b/reactos/dll/win32/mpr/mpr_Cs.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Cs.rc
rename to reactos/dll/win32/mpr/mpr_Cs.rc

diff --git a/reactos/dll/mpr/mpr_De.rc b/reactos/dll/win32/mpr/mpr_De.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_De.rc
rename to reactos/dll/win32/mpr/mpr_De.rc

diff --git a/reactos/dll/mpr/mpr_En.rc b/reactos/dll/win32/mpr/mpr_En.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_En.rc
rename to reactos/dll/win32/mpr/mpr_En.rc

diff --git a/reactos/dll/mpr/mpr_Es.rc b/reactos/dll/win32/mpr/mpr_Es.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Es.rc
rename to reactos/dll/win32/mpr/mpr_Es.rc

diff --git a/reactos/dll/mpr/mpr_Fr.rc b/reactos/dll/win32/mpr/mpr_Fr.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Fr.rc
rename to reactos/dll/win32/mpr/mpr_Fr.rc

diff --git a/reactos/dll/mpr/mpr_Hu.rc b/reactos/dll/win32/mpr/mpr_Hu.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Hu.rc
rename to reactos/dll/win32/mpr/mpr_Hu.rc

diff --git a/reactos/dll/mpr/mpr_It.rc b/reactos/dll/win32/mpr/mpr_It.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_It.rc
rename to reactos/dll/win32/mpr/mpr_It.rc

diff --git a/reactos/dll/mpr/mpr_Ja.rc b/reactos/dll/win32/mpr/mpr_Ja.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Ja.rc
rename to reactos/dll/win32/mpr/mpr_Ja.rc

diff --git a/reactos/dll/mpr/mpr_Ko.rc b/reactos/dll/win32/mpr/mpr_Ko.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Ko.rc
rename to reactos/dll/win32/mpr/mpr_Ko.rc

diff --git a/reactos/dll/mpr/mpr_Nl.rc b/reactos/dll/win32/mpr/mpr_Nl.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Nl.rc
rename to reactos/dll/win32/mpr/mpr_Nl.rc

diff --git a/reactos/dll/mpr/mpr_No.rc b/reactos/dll/win32/mpr/mpr_No.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_No.rc
rename to reactos/dll/win32/mpr/mpr_No.rc

diff --git a/reactos/dll/mpr/mpr_Pt.rc b/reactos/dll/win32/mpr/mpr_Pt.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Pt.rc
rename to reactos/dll/win32/mpr/mpr_Pt.rc

diff --git a/reactos/dll/mpr/mpr_Ru.rc b/reactos/dll/win32/mpr/mpr_Ru.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Ru.rc
rename to reactos/dll/win32/mpr/mpr_Ru.rc

diff --git a/reactos/dll/mpr/mpr_Sv.rc b/reactos/dll/win32/mpr/mpr_Sv.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Sv.rc
rename to reactos/dll/win32/mpr/mpr_Sv.rc

diff --git a/reactos/dll/mpr/mpr_Uk.rc b/reactos/dll/win32/mpr/mpr_Uk.rc
similarity index 100%
rename from reactos/dll/mpr/mpr_Uk.rc
rename to reactos/dll/win32/mpr/mpr_Uk.rc

diff --git a/reactos/dll/mpr/mpr_main.c b/reactos/dll/win32/mpr/mpr_main.c
similarity index 100%
rename from reactos/dll/mpr/mpr_main.c
rename to reactos/dll/win32/mpr/mpr_main.c

diff --git a/reactos/dll/mpr/mprres.h b/reactos/dll/win32/mpr/mprres.h
similarity index 100%
rename from reactos/dll/mpr/mprres.h
rename to reactos/dll/win32/mpr/mprres.h

diff --git a/reactos/dll/mpr/multinet.c b/reactos/dll/win32/mpr/multinet.c
similarity index 100%
rename from reactos/dll/mpr/multinet.c
rename to reactos/dll/win32/mpr/multinet.c

diff --git a/reactos/dll/mpr/netspi.h b/reactos/dll/win32/mpr/netspi.h
similarity index 100%
rename from reactos/dll/mpr/netspi.h
rename to reactos/dll/win32/mpr/netspi.h

diff --git a/reactos/dll/mpr/nps.c b/reactos/dll/win32/mpr/nps.c
similarity index 100%
rename from reactos/dll/mpr/nps.c
rename to reactos/dll/win32/mpr/nps.c

diff --git a/reactos/dll/mpr/pwcache.c b/reactos/dll/win32/mpr/pwcache.c
similarity index 100%
rename from reactos/dll/mpr/pwcache.c
rename to reactos/dll/win32/mpr/pwcache.c

diff --git a/reactos/dll/mpr/version.rc b/reactos/dll/win32/mpr/version.rc
similarity index 100%
rename from reactos/dll/mpr/version.rc
rename to reactos/dll/win32/mpr/version.rc

diff --git a/reactos/dll/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c
similarity index 100%
rename from reactos/dll/mpr/wnet.c
rename to reactos/dll/win32/mpr/wnet.c

diff --git a/reactos/dll/mpr/wnetpriv.h b/reactos/dll/win32/mpr/wnetpriv.h
similarity index 100%
rename from reactos/dll/mpr/wnetpriv.h
rename to reactos/dll/win32/mpr/wnetpriv.h

diff --git a/reactos/dll/msacm/Makefile.in b/reactos/dll/win32/msacm/Makefile.in
similarity index 100%
rename from reactos/dll/msacm/Makefile.in
rename to reactos/dll/win32/msacm/Makefile.in

diff --git a/reactos/dll/msacm/driver.c b/reactos/dll/win32/msacm/driver.c
similarity index 100%
rename from reactos/dll/msacm/driver.c
rename to reactos/dll/win32/msacm/driver.c

diff --git a/reactos/dll/msacm/filter.c b/reactos/dll/win32/msacm/filter.c
similarity index 100%
rename from reactos/dll/msacm/filter.c
rename to reactos/dll/win32/msacm/filter.c

diff --git a/reactos/dll/msacm/format.c b/reactos/dll/win32/msacm/format.c
similarity index 100%
rename from reactos/dll/msacm/format.c
rename to reactos/dll/win32/msacm/format.c

diff --git a/reactos/dll/msacm/imaadp32/Makefile.in b/reactos/dll/win32/msacm/imaadp32/Makefile.in
similarity index 100%
rename from reactos/dll/msacm/imaadp32/Makefile.in
rename to reactos/dll/win32/msacm/imaadp32/Makefile.in

diff --git a/reactos/dll/msacm/imaadp32/imaadp32.acm.spec b/reactos/dll/win32/msacm/imaadp32/imaadp32.acm.spec
similarity index 100%
rename from reactos/dll/msacm/imaadp32/imaadp32.acm.spec
rename to reactos/dll/win32/msacm/imaadp32/imaadp32.acm.spec

diff --git a/reactos/dll/msacm/imaadp32/imaadp32.c b/reactos/dll/win32/msacm/imaadp32/imaadp32.c
similarity index 100%
rename from reactos/dll/msacm/imaadp32/imaadp32.c
rename to reactos/dll/win32/msacm/imaadp32/imaadp32.c

diff --git a/reactos/dll/msacm/internal.c b/reactos/dll/win32/msacm/internal.c
similarity index 100%
rename from reactos/dll/msacm/internal.c
rename to reactos/dll/win32/msacm/internal.c

diff --git a/reactos/dll/msacm/msacm.rc b/reactos/dll/win32/msacm/msacm.rc
similarity index 100%
rename from reactos/dll/msacm/msacm.rc
rename to reactos/dll/win32/msacm/msacm.rc

diff --git a/reactos/dll/msacm/msacm.spec b/reactos/dll/win32/msacm/msacm.spec
similarity index 100%
rename from reactos/dll/msacm/msacm.spec
rename to reactos/dll/win32/msacm/msacm.spec

diff --git a/reactos/dll/msacm/msacm.spec.def b/reactos/dll/win32/msacm/msacm.spec.def
similarity index 100%
rename from reactos/dll/msacm/msacm.spec.def
rename to reactos/dll/win32/msacm/msacm.spec.def

diff --git a/reactos/dll/msacm/msacm32.spec b/reactos/dll/win32/msacm/msacm32.spec
similarity index 100%
rename from reactos/dll/msacm/msacm32.spec
rename to reactos/dll/win32/msacm/msacm32.spec

diff --git a/reactos/dll/msacm/msacm32.xml b/reactos/dll/win32/msacm/msacm32.xml
similarity index 100%
rename from reactos/dll/msacm/msacm32.xml
rename to reactos/dll/win32/msacm/msacm32.xml

diff --git a/reactos/dll/msacm/msacm32_main.c b/reactos/dll/win32/msacm/msacm32_main.c
similarity index 100%
rename from reactos/dll/msacm/msacm32_main.c
rename to reactos/dll/win32/msacm/msacm32_main.c

diff --git a/reactos/dll/msacm/msacm_De.rc b/reactos/dll/win32/msacm/msacm_De.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_De.rc
rename to reactos/dll/win32/msacm/msacm_De.rc

diff --git a/reactos/dll/msacm/msacm_En.rc b/reactos/dll/win32/msacm/msacm_En.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_En.rc
rename to reactos/dll/win32/msacm/msacm_En.rc

diff --git a/reactos/dll/msacm/msacm_Es.rc b/reactos/dll/win32/msacm/msacm_Es.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Es.rc
rename to reactos/dll/win32/msacm/msacm_Es.rc

diff --git a/reactos/dll/msacm/msacm_Fr.rc b/reactos/dll/win32/msacm/msacm_Fr.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Fr.rc
rename to reactos/dll/win32/msacm/msacm_Fr.rc

diff --git a/reactos/dll/msacm/msacm_Hu.rc b/reactos/dll/win32/msacm/msacm_Hu.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Hu.rc
rename to reactos/dll/win32/msacm/msacm_Hu.rc

diff --git a/reactos/dll/msacm/msacm_It.rc b/reactos/dll/win32/msacm/msacm_It.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_It.rc
rename to reactos/dll/win32/msacm/msacm_It.rc

diff --git a/reactos/dll/msacm/msacm_Ja.rc b/reactos/dll/win32/msacm/msacm_Ja.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Ja.rc
rename to reactos/dll/win32/msacm/msacm_Ja.rc

diff --git a/reactos/dll/msacm/msacm_Nl.rc b/reactos/dll/win32/msacm/msacm_Nl.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Nl.rc
rename to reactos/dll/win32/msacm/msacm_Nl.rc

diff --git a/reactos/dll/msacm/msacm_Pt.rc b/reactos/dll/win32/msacm/msacm_Pt.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Pt.rc
rename to reactos/dll/win32/msacm/msacm_Pt.rc

diff --git a/reactos/dll/msacm/msacm_Ru.rc b/reactos/dll/win32/msacm/msacm_Ru.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Ru.rc
rename to reactos/dll/win32/msacm/msacm_Ru.rc

diff --git a/reactos/dll/msacm/msacm_Sv.rc b/reactos/dll/win32/msacm/msacm_Sv.rc
similarity index 100%
rename from reactos/dll/msacm/msacm_Sv.rc
rename to reactos/dll/win32/msacm/msacm_Sv.rc

diff --git a/reactos/dll/msacm/msacm_main.c b/reactos/dll/win32/msacm/msacm_main.c
similarity index 100%
rename from reactos/dll/msacm/msacm_main.c
rename to reactos/dll/win32/msacm/msacm_main.c

diff --git a/reactos/dll/msacm/msadp32/Makefile.in b/reactos/dll/win32/msacm/msadp32/Makefile.in
similarity index 100%
rename from reactos/dll/msacm/msadp32/Makefile.in
rename to reactos/dll/win32/msacm/msadp32/Makefile.in

diff --git a/reactos/dll/msacm/msadp32/msadp32.acm.spec b/reactos/dll/win32/msacm/msadp32/msadp32.acm.spec
similarity index 100%
rename from reactos/dll/msacm/msadp32/msadp32.acm.spec
rename to reactos/dll/win32/msacm/msadp32/msadp32.acm.spec

diff --git a/reactos/dll/msacm/msadp32/msadp32.c b/reactos/dll/win32/msacm/msadp32/msadp32.c
similarity index 100%
rename from reactos/dll/msacm/msadp32/msadp32.c
rename to reactos/dll/win32/msacm/msadp32/msadp32.c

diff --git a/reactos/dll/msacm/pcmconverter.c b/reactos/dll/win32/msacm/pcmconverter.c
similarity index 100%
rename from reactos/dll/msacm/pcmconverter.c
rename to reactos/dll/win32/msacm/pcmconverter.c

diff --git a/reactos/dll/msacm/stream.c b/reactos/dll/win32/msacm/stream.c
similarity index 100%
rename from reactos/dll/msacm/stream.c
rename to reactos/dll/win32/msacm/stream.c

diff --git a/reactos/dll/msacm/wineacm.h b/reactos/dll/win32/msacm/wineacm.h
similarity index 100%
rename from reactos/dll/msacm/wineacm.h
rename to reactos/dll/win32/msacm/wineacm.h

diff --git a/reactos/dll/msafd/include/debug.h b/reactos/dll/win32/msafd/include/debug.h
similarity index 100%
rename from reactos/dll/msafd/include/debug.h
rename to reactos/dll/win32/msafd/include/debug.h

diff --git a/reactos/dll/msafd/include/helpers.h b/reactos/dll/win32/msafd/include/helpers.h
similarity index 100%
rename from reactos/dll/msafd/include/helpers.h
rename to reactos/dll/win32/msafd/include/helpers.h

diff --git a/reactos/dll/msafd/misc/dllmain.c b/reactos/dll/win32/msafd/misc/dllmain.c
similarity index 100%
rename from reactos/dll/msafd/misc/dllmain.c
rename to reactos/dll/win32/msafd/misc/dllmain.c

diff --git a/reactos/dll/msafd/misc/event.c b/reactos/dll/win32/msafd/misc/event.c
similarity index 100%
rename from reactos/dll/msafd/misc/event.c
rename to reactos/dll/win32/msafd/misc/event.c

diff --git a/reactos/dll/msafd/misc/helpers.c b/reactos/dll/win32/msafd/misc/helpers.c
similarity index 100%
rename from reactos/dll/msafd/misc/helpers.c
rename to reactos/dll/win32/msafd/misc/helpers.c

diff --git a/reactos/dll/msafd/misc/sndrcv.c b/reactos/dll/win32/msafd/misc/sndrcv.c
similarity index 100%
rename from reactos/dll/msafd/misc/sndrcv.c
rename to reactos/dll/win32/msafd/misc/sndrcv.c

diff --git a/reactos/dll/msafd/misc/stubs.c b/reactos/dll/win32/msafd/misc/stubs.c
similarity index 100%
rename from reactos/dll/msafd/misc/stubs.c
rename to reactos/dll/win32/msafd/misc/stubs.c

diff --git a/reactos/dll/msafd/msafd.def b/reactos/dll/win32/msafd/msafd.def
similarity index 100%
rename from reactos/dll/msafd/msafd.def
rename to reactos/dll/win32/msafd/msafd.def

diff --git a/reactos/dll/msafd/msafd.h b/reactos/dll/win32/msafd/msafd.h
similarity index 100%
rename from reactos/dll/msafd/msafd.h
rename to reactos/dll/win32/msafd/msafd.h

diff --git a/reactos/dll/msafd/msafd.rc b/reactos/dll/win32/msafd/msafd.rc
similarity index 100%
rename from reactos/dll/msafd/msafd.rc
rename to reactos/dll/win32/msafd/msafd.rc

diff --git a/reactos/dll/msafd/msafd.xml b/reactos/dll/win32/msafd/msafd.xml
similarity index 100%
rename from reactos/dll/msafd/msafd.xml
rename to reactos/dll/win32/msafd/msafd.xml

diff --git a/reactos/dll/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c
similarity index 100%
rename from reactos/dll/msgina/msgina.c
rename to reactos/dll/win32/msgina/msgina.c

diff --git a/reactos/dll/msgina/msgina.def b/reactos/dll/win32/msgina/msgina.def
similarity index 100%
rename from reactos/dll/msgina/msgina.def
rename to reactos/dll/win32/msgina/msgina.def

diff --git a/reactos/dll/msgina/msgina.h b/reactos/dll/win32/msgina/msgina.h
similarity index 100%
rename from reactos/dll/msgina/msgina.h
rename to reactos/dll/win32/msgina/msgina.h

diff --git a/reactos/dll/msgina/msgina.rc b/reactos/dll/win32/msgina/msgina.rc
similarity index 100%
rename from reactos/dll/msgina/msgina.rc
rename to reactos/dll/win32/msgina/msgina.rc

diff --git a/reactos/dll/msgina/msgina.xml b/reactos/dll/win32/msgina/msgina.xml
similarity index 100%
rename from reactos/dll/msgina/msgina.xml
rename to reactos/dll/win32/msgina/msgina.xml

diff --git a/reactos/dll/msgina/resource.h b/reactos/dll/win32/msgina/resource.h
similarity index 100%
rename from reactos/dll/msgina/resource.h
rename to reactos/dll/win32/msgina/resource.h

diff --git a/reactos/dll/msgina/resources/ico_logoff.ico b/reactos/dll/win32/msgina/resources/ico_logoff.ico
similarity index 100%
rename from reactos/dll/msgina/resources/ico_logoff.ico
rename to reactos/dll/win32/msgina/resources/ico_logoff.ico

diff --git a/reactos/dll/msgina/stubs.c b/reactos/dll/win32/msgina/stubs.c
similarity index 100%
rename from reactos/dll/msgina/stubs.c
rename to reactos/dll/win32/msgina/stubs.c

diff --git a/reactos/dll/msi/Makefile.in b/reactos/dll/win32/msi/Makefile.in
similarity index 100%
rename from reactos/dll/msi/Makefile.in
rename to reactos/dll/win32/msi/Makefile.in

diff --git a/reactos/dll/msi/action.c b/reactos/dll/win32/msi/action.c
similarity index 100%
rename from reactos/dll/msi/action.c
rename to reactos/dll/win32/msi/action.c

diff --git a/reactos/dll/msi/action.h b/reactos/dll/win32/msi/action.h
similarity index 100%
rename from reactos/dll/msi/action.h
rename to reactos/dll/win32/msi/action.h

diff --git a/reactos/dll/msi/appsearch.c b/reactos/dll/win32/msi/appsearch.c
similarity index 100%
rename from reactos/dll/msi/appsearch.c
rename to reactos/dll/win32/msi/appsearch.c

diff --git a/reactos/dll/msi/classes.c b/reactos/dll/win32/msi/classes.c
similarity index 100%
rename from reactos/dll/msi/classes.c
rename to reactos/dll/win32/msi/classes.c

diff --git a/reactos/dll/msi/cond.tab.c b/reactos/dll/win32/msi/cond.tab.c
similarity index 100%
rename from reactos/dll/msi/cond.tab.c
rename to reactos/dll/win32/msi/cond.tab.c

diff --git a/reactos/dll/msi/cond.tab.h b/reactos/dll/win32/msi/cond.tab.h
similarity index 100%
rename from reactos/dll/msi/cond.tab.h
rename to reactos/dll/win32/msi/cond.tab.h

diff --git a/reactos/dll/msi/cond.y b/reactos/dll/win32/msi/cond.y
similarity index 100%
rename from reactos/dll/msi/cond.y
rename to reactos/dll/win32/msi/cond.y

diff --git a/reactos/dll/msi/create.c b/reactos/dll/win32/msi/create.c
similarity index 100%
rename from reactos/dll/msi/create.c
rename to reactos/dll/win32/msi/create.c

diff --git a/reactos/dll/msi/custom.c b/reactos/dll/win32/msi/custom.c
similarity index 100%
rename from reactos/dll/msi/custom.c
rename to reactos/dll/win32/msi/custom.c

diff --git a/reactos/dll/msi/database.c b/reactos/dll/win32/msi/database.c
similarity index 100%
rename from reactos/dll/msi/database.c
rename to reactos/dll/win32/msi/database.c

diff --git a/reactos/dll/msi/delete.c b/reactos/dll/win32/msi/delete.c
similarity index 100%
rename from reactos/dll/msi/delete.c
rename to reactos/dll/win32/msi/delete.c

diff --git a/reactos/dll/msi/dialog.c b/reactos/dll/win32/msi/dialog.c
similarity index 100%
rename from reactos/dll/msi/dialog.c
rename to reactos/dll/win32/msi/dialog.c

diff --git a/reactos/dll/msi/distinct.c b/reactos/dll/win32/msi/distinct.c
similarity index 100%
rename from reactos/dll/msi/distinct.c
rename to reactos/dll/win32/msi/distinct.c

diff --git a/reactos/dll/msi/events.c b/reactos/dll/win32/msi/events.c
similarity index 100%
rename from reactos/dll/msi/events.c
rename to reactos/dll/win32/msi/events.c

diff --git a/reactos/dll/msi/files.c b/reactos/dll/win32/msi/files.c
similarity index 100%
rename from reactos/dll/msi/files.c
rename to reactos/dll/win32/msi/files.c

diff --git a/reactos/dll/msi/format.c b/reactos/dll/win32/msi/format.c
similarity index 100%
rename from reactos/dll/msi/format.c
rename to reactos/dll/win32/msi/format.c

diff --git a/reactos/dll/msi/handle.c b/reactos/dll/win32/msi/handle.c
similarity index 100%
rename from reactos/dll/msi/handle.c
rename to reactos/dll/win32/msi/handle.c

diff --git a/reactos/dll/msi/helpers.c b/reactos/dll/win32/msi/helpers.c
similarity index 100%
rename from reactos/dll/msi/helpers.c
rename to reactos/dll/win32/msi/helpers.c

diff --git a/reactos/dll/msi/insert.c b/reactos/dll/win32/msi/insert.c
similarity index 100%
rename from reactos/dll/msi/insert.c
rename to reactos/dll/win32/msi/insert.c

diff --git a/reactos/dll/msi/install.c b/reactos/dll/win32/msi/install.c
similarity index 100%
rename from reactos/dll/msi/install.c
rename to reactos/dll/win32/msi/install.c

diff --git a/reactos/dll/msi/msi.c b/reactos/dll/win32/msi/msi.c
similarity index 100%
rename from reactos/dll/msi/msi.c
rename to reactos/dll/win32/msi/msi.c

diff --git a/reactos/dll/msi/msi.rc b/reactos/dll/win32/msi/msi.rc
similarity index 100%
rename from reactos/dll/msi/msi.rc
rename to reactos/dll/win32/msi/msi.rc

diff --git a/reactos/dll/msi/msi.spec b/reactos/dll/win32/msi/msi.spec
similarity index 100%
rename from reactos/dll/msi/msi.spec
rename to reactos/dll/win32/msi/msi.spec

diff --git a/reactos/dll/msi/msi.xml b/reactos/dll/win32/msi/msi.xml
similarity index 100%
rename from reactos/dll/msi/msi.xml
rename to reactos/dll/win32/msi/msi.xml

diff --git a/reactos/dll/msi/msi_Bg.rc b/reactos/dll/win32/msi/msi_Bg.rc
similarity index 100%
rename from reactos/dll/msi/msi_Bg.rc
rename to reactos/dll/win32/msi/msi_Bg.rc

diff --git a/reactos/dll/msi/msi_De.rc b/reactos/dll/win32/msi/msi_De.rc
similarity index 100%
rename from reactos/dll/msi/msi_De.rc
rename to reactos/dll/win32/msi/msi_De.rc

diff --git a/reactos/dll/msi/msi_En.rc b/reactos/dll/win32/msi/msi_En.rc
similarity index 100%
rename from reactos/dll/msi/msi_En.rc
rename to reactos/dll/win32/msi/msi_En.rc

diff --git a/reactos/dll/msi/msi_Es.rc b/reactos/dll/win32/msi/msi_Es.rc
similarity index 100%
rename from reactos/dll/msi/msi_Es.rc
rename to reactos/dll/win32/msi/msi_Es.rc

diff --git a/reactos/dll/msi/msi_Fi.rc b/reactos/dll/win32/msi/msi_Fi.rc
similarity index 100%
rename from reactos/dll/msi/msi_Fi.rc
rename to reactos/dll/win32/msi/msi_Fi.rc

diff --git a/reactos/dll/msi/msi_Fr.rc b/reactos/dll/win32/msi/msi_Fr.rc
similarity index 100%
rename from reactos/dll/msi/msi_Fr.rc
rename to reactos/dll/win32/msi/msi_Fr.rc

diff --git a/reactos/dll/msi/msi_Hu.rc b/reactos/dll/win32/msi/msi_Hu.rc
similarity index 100%
rename from reactos/dll/msi/msi_Hu.rc
rename to reactos/dll/win32/msi/msi_Hu.rc

diff --git a/reactos/dll/msi/msi_Ja.rc b/reactos/dll/win32/msi/msi_Ja.rc
similarity index 100%
rename from reactos/dll/msi/msi_Ja.rc
rename to reactos/dll/win32/msi/msi_Ja.rc

diff --git a/reactos/dll/msi/msi_Ko.rc b/reactos/dll/win32/msi/msi_Ko.rc
similarity index 100%
rename from reactos/dll/msi/msi_Ko.rc
rename to reactos/dll/win32/msi/msi_Ko.rc

diff --git a/reactos/dll/msi/msi_Nl.rc b/reactos/dll/win32/msi/msi_Nl.rc
similarity index 100%
rename from reactos/dll/msi/msi_Nl.rc
rename to reactos/dll/win32/msi/msi_Nl.rc

diff --git a/reactos/dll/msi/msi_No.rc b/reactos/dll/win32/msi/msi_No.rc
similarity index 100%
rename from reactos/dll/msi/msi_No.rc
rename to reactos/dll/win32/msi/msi_No.rc

diff --git a/reactos/dll/msi/msi_Pt.rc b/reactos/dll/win32/msi/msi_Pt.rc
similarity index 100%
rename from reactos/dll/msi/msi_Pt.rc
rename to reactos/dll/win32/msi/msi_Pt.rc

diff --git a/reactos/dll/msi/msi_Ru.rc b/reactos/dll/win32/msi/msi_Ru.rc
similarity index 100%
rename from reactos/dll/msi/msi_Ru.rc
rename to reactos/dll/win32/msi/msi_Ru.rc

diff --git a/reactos/dll/msi/msipriv.h b/reactos/dll/win32/msi/msipriv.h
similarity index 100%
rename from reactos/dll/msi/msipriv.h
rename to reactos/dll/win32/msi/msipriv.h

diff --git a/reactos/dll/msi/msiquery.c b/reactos/dll/win32/msi/msiquery.c
similarity index 100%
rename from reactos/dll/msi/msiquery.c
rename to reactos/dll/win32/msi/msiquery.c

diff --git a/reactos/dll/msi/order.c b/reactos/dll/win32/msi/order.c
similarity index 100%
rename from reactos/dll/msi/order.c
rename to reactos/dll/win32/msi/order.c

diff --git a/reactos/dll/msi/package.c b/reactos/dll/win32/msi/package.c
similarity index 100%
rename from reactos/dll/msi/package.c
rename to reactos/dll/win32/msi/package.c

diff --git a/reactos/dll/msi/preview.c b/reactos/dll/win32/msi/preview.c
similarity index 100%
rename from reactos/dll/msi/preview.c
rename to reactos/dll/win32/msi/preview.c

diff --git a/reactos/dll/msi/query.h b/reactos/dll/win32/msi/query.h
similarity index 100%
rename from reactos/dll/msi/query.h
rename to reactos/dll/win32/msi/query.h

diff --git a/reactos/dll/msi/record.c b/reactos/dll/win32/msi/record.c
similarity index 100%
rename from reactos/dll/msi/record.c
rename to reactos/dll/win32/msi/record.c

diff --git a/reactos/dll/msi/registry.c b/reactos/dll/win32/msi/registry.c
similarity index 100%
rename from reactos/dll/msi/registry.c
rename to reactos/dll/win32/msi/registry.c

diff --git a/reactos/dll/msi/regsvr.c b/reactos/dll/win32/msi/regsvr.c
similarity index 100%
rename from reactos/dll/msi/regsvr.c
rename to reactos/dll/win32/msi/regsvr.c

diff --git a/reactos/dll/msi/select.c b/reactos/dll/win32/msi/select.c
similarity index 100%
rename from reactos/dll/msi/select.c
rename to reactos/dll/win32/msi/select.c

diff --git a/reactos/dll/msi/source.c b/reactos/dll/win32/msi/source.c
similarity index 100%
rename from reactos/dll/msi/source.c
rename to reactos/dll/win32/msi/source.c

diff --git a/reactos/dll/msi/sql.tab.c b/reactos/dll/win32/msi/sql.tab.c
similarity index 100%
rename from reactos/dll/msi/sql.tab.c
rename to reactos/dll/win32/msi/sql.tab.c

diff --git a/reactos/dll/msi/sql.tab.h b/reactos/dll/win32/msi/sql.tab.h
similarity index 100%
rename from reactos/dll/msi/sql.tab.h
rename to reactos/dll/win32/msi/sql.tab.h

diff --git a/reactos/dll/msi/sql.y b/reactos/dll/win32/msi/sql.y
similarity index 100%
rename from reactos/dll/msi/sql.y
rename to reactos/dll/win32/msi/sql.y

diff --git a/reactos/dll/msi/string.c b/reactos/dll/win32/msi/string.c
similarity index 100%
rename from reactos/dll/msi/string.c
rename to reactos/dll/win32/msi/string.c

diff --git a/reactos/dll/msi/suminfo.c b/reactos/dll/win32/msi/suminfo.c
similarity index 100%
rename from reactos/dll/msi/suminfo.c
rename to reactos/dll/win32/msi/suminfo.c

diff --git a/reactos/dll/msi/table.c b/reactos/dll/win32/msi/table.c
similarity index 100%
rename from reactos/dll/msi/table.c
rename to reactos/dll/win32/msi/table.c

diff --git a/reactos/dll/msi/tokenize.c b/reactos/dll/win32/msi/tokenize.c
similarity index 100%
rename from reactos/dll/msi/tokenize.c
rename to reactos/dll/win32/msi/tokenize.c

diff --git a/reactos/dll/msi/update.c b/reactos/dll/win32/msi/update.c
similarity index 100%
rename from reactos/dll/msi/update.c
rename to reactos/dll/win32/msi/update.c

diff --git a/reactos/dll/msi/upgrade.c b/reactos/dll/win32/msi/upgrade.c
similarity index 100%
rename from reactos/dll/msi/upgrade.c
rename to reactos/dll/win32/msi/upgrade.c

diff --git a/reactos/dll/msi/version.rc b/reactos/dll/win32/msi/version.rc
similarity index 100%
rename from reactos/dll/msi/version.rc
rename to reactos/dll/win32/msi/version.rc

diff --git a/reactos/dll/msi/where.c b/reactos/dll/win32/msi/where.c
similarity index 100%
rename from reactos/dll/msi/where.c
rename to reactos/dll/win32/msi/where.c

diff --git a/reactos/dll/msimg32/Makefile.in b/reactos/dll/win32/msimg32/Makefile.in
similarity index 100%
rename from reactos/dll/msimg32/Makefile.in
rename to reactos/dll/win32/msimg32/Makefile.in

diff --git a/reactos/dll/msimg32/msimg32.spec b/reactos/dll/win32/msimg32/msimg32.spec
similarity index 100%
rename from reactos/dll/msimg32/msimg32.spec
rename to reactos/dll/win32/msimg32/msimg32.spec

diff --git a/reactos/dll/msimg32/msimg32.xml b/reactos/dll/win32/msimg32/msimg32.xml
similarity index 100%
rename from reactos/dll/msimg32/msimg32.xml
rename to reactos/dll/win32/msimg32/msimg32.xml

diff --git a/reactos/dll/msimg32/msimg32_main.c b/reactos/dll/win32/msimg32/msimg32_main.c
similarity index 100%
rename from reactos/dll/msimg32/msimg32_main.c
rename to reactos/dll/win32/msimg32/msimg32_main.c

diff --git a/reactos/dll/msvcrt/dllmain.c b/reactos/dll/win32/msvcrt/dllmain.c
similarity index 100%
rename from reactos/dll/msvcrt/dllmain.c
rename to reactos/dll/win32/msvcrt/dllmain.c

diff --git a/reactos/dll/msvcrt/msvcrt.def b/reactos/dll/win32/msvcrt/msvcrt.def
similarity index 100%
rename from reactos/dll/msvcrt/msvcrt.def
rename to reactos/dll/win32/msvcrt/msvcrt.def

diff --git a/reactos/dll/msvcrt/msvcrt.rc b/reactos/dll/win32/msvcrt/msvcrt.rc
similarity index 100%
rename from reactos/dll/msvcrt/msvcrt.rc
rename to reactos/dll/win32/msvcrt/msvcrt.rc

diff --git a/reactos/dll/msvcrt/msvcrt.xml b/reactos/dll/win32/msvcrt/msvcrt.xml
similarity index 100%
rename from reactos/dll/msvcrt/msvcrt.xml
rename to reactos/dll/win32/msvcrt/msvcrt.xml

diff --git a/reactos/dll/msvcrt/precomp.h b/reactos/dll/win32/msvcrt/precomp.h
similarity index 100%
rename from reactos/dll/msvcrt/precomp.h
rename to reactos/dll/win32/msvcrt/precomp.h

diff --git a/reactos/dll/msvcrt20/msvcrt20.c b/reactos/dll/win32/msvcrt20/msvcrt20.c
similarity index 100%
rename from reactos/dll/msvcrt20/msvcrt20.c
rename to reactos/dll/win32/msvcrt20/msvcrt20.c

diff --git a/reactos/dll/msvcrt20/msvcrt20.def b/reactos/dll/win32/msvcrt20/msvcrt20.def
similarity index 100%
rename from reactos/dll/msvcrt20/msvcrt20.def
rename to reactos/dll/win32/msvcrt20/msvcrt20.def

diff --git a/reactos/dll/msvcrt20/msvcrt20.rc b/reactos/dll/win32/msvcrt20/msvcrt20.rc
similarity index 100%
rename from reactos/dll/msvcrt20/msvcrt20.rc
rename to reactos/dll/win32/msvcrt20/msvcrt20.rc

diff --git a/reactos/dll/msvcrt20/msvcrt20.xml b/reactos/dll/win32/msvcrt20/msvcrt20.xml
similarity index 100%
rename from reactos/dll/msvcrt20/msvcrt20.xml
rename to reactos/dll/win32/msvcrt20/msvcrt20.xml

diff --git a/reactos/dll/msvideo/Makefile.in b/reactos/dll/win32/msvideo/Makefile.in
similarity index 100%
rename from reactos/dll/msvideo/Makefile.in
rename to reactos/dll/win32/msvideo/Makefile.in

diff --git a/reactos/dll/msvideo/drawdib.c b/reactos/dll/win32/msvideo/drawdib.c
similarity index 100%
rename from reactos/dll/msvideo/drawdib.c
rename to reactos/dll/win32/msvideo/drawdib.c

diff --git a/reactos/dll/msvideo/mciwnd.c b/reactos/dll/win32/msvideo/mciwnd.c
similarity index 100%
rename from reactos/dll/msvideo/mciwnd.c
rename to reactos/dll/win32/msvideo/mciwnd.c

diff --git a/reactos/dll/msvideo/msvfw32.rc b/reactos/dll/win32/msvideo/msvfw32.rc
similarity index 100%
rename from reactos/dll/msvideo/msvfw32.rc
rename to reactos/dll/win32/msvideo/msvfw32.rc

diff --git a/reactos/dll/msvideo/msvfw32.spec b/reactos/dll/win32/msvideo/msvfw32.spec
similarity index 100%
rename from reactos/dll/msvideo/msvfw32.spec
rename to reactos/dll/win32/msvideo/msvfw32.spec

diff --git a/reactos/dll/msvideo/msvfw32.xml b/reactos/dll/win32/msvideo/msvfw32.xml
similarity index 100%
rename from reactos/dll/msvideo/msvfw32.xml
rename to reactos/dll/win32/msvideo/msvfw32.xml

diff --git a/reactos/dll/msvideo/msvideo.spec b/reactos/dll/win32/msvideo/msvideo.spec
similarity index 100%
rename from reactos/dll/msvideo/msvideo.spec
rename to reactos/dll/win32/msvideo/msvideo.spec

diff --git a/reactos/dll/msvideo/msvideo16.c b/reactos/dll/win32/msvideo/msvideo16.c
similarity index 100%
rename from reactos/dll/msvideo/msvideo16.c
rename to reactos/dll/win32/msvideo/msvideo16.c

diff --git a/reactos/dll/msvideo/msvideo_main.c b/reactos/dll/win32/msvideo/msvideo_main.c
similarity index 100%
rename from reactos/dll/msvideo/msvideo_main.c
rename to reactos/dll/win32/msvideo/msvideo_main.c

diff --git a/reactos/dll/msvideo/msvideo_private.h b/reactos/dll/win32/msvideo/msvideo_private.h
similarity index 100%
rename from reactos/dll/msvideo/msvideo_private.h
rename to reactos/dll/win32/msvideo/msvideo_private.h

diff --git a/reactos/dll/msvideo/vfw16.h b/reactos/dll/win32/msvideo/vfw16.h
similarity index 100%
rename from reactos/dll/msvideo/vfw16.h
rename to reactos/dll/win32/msvideo/vfw16.h

diff --git a/reactos/dll/mswsock/extensions.c b/reactos/dll/win32/mswsock/extensions.c
similarity index 100%
rename from reactos/dll/mswsock/extensions.c
rename to reactos/dll/win32/mswsock/extensions.c

diff --git a/reactos/dll/mswsock/mswsock.def b/reactos/dll/win32/mswsock/mswsock.def
similarity index 100%
rename from reactos/dll/mswsock/mswsock.def
rename to reactos/dll/win32/mswsock/mswsock.def

diff --git a/reactos/dll/mswsock/mswsock.rc b/reactos/dll/win32/mswsock/mswsock.rc
similarity index 100%
rename from reactos/dll/mswsock/mswsock.rc
rename to reactos/dll/win32/mswsock/mswsock.rc

diff --git a/reactos/dll/mswsock/mswsock.xml b/reactos/dll/win32/mswsock/mswsock.xml
similarity index 100%
rename from reactos/dll/mswsock/mswsock.xml
rename to reactos/dll/win32/mswsock/mswsock.xml

diff --git a/reactos/dll/mswsock/stubs.c b/reactos/dll/win32/mswsock/stubs.c
similarity index 100%
rename from reactos/dll/mswsock/stubs.c
rename to reactos/dll/win32/mswsock/stubs.c

diff --git a/reactos/dll/netapi32/access.c b/reactos/dll/win32/netapi32/access.c
similarity index 100%
rename from reactos/dll/netapi32/access.c
rename to reactos/dll/win32/netapi32/access.c

diff --git a/reactos/dll/netapi32/apibuf.c b/reactos/dll/win32/netapi32/apibuf.c
similarity index 100%
rename from reactos/dll/netapi32/apibuf.c
rename to reactos/dll/win32/netapi32/apibuf.c

diff --git a/reactos/dll/netapi32/browsr.c b/reactos/dll/win32/netapi32/browsr.c
similarity index 100%
rename from reactos/dll/netapi32/browsr.c
rename to reactos/dll/win32/netapi32/browsr.c

diff --git a/reactos/dll/netapi32/ds.c b/reactos/dll/win32/netapi32/ds.c
similarity index 100%
rename from reactos/dll/netapi32/ds.c
rename to reactos/dll/win32/netapi32/ds.c

diff --git a/reactos/dll/netapi32/nbcmdqueue.c b/reactos/dll/win32/netapi32/nbcmdqueue.c
similarity index 100%
rename from reactos/dll/netapi32/nbcmdqueue.c
rename to reactos/dll/win32/netapi32/nbcmdqueue.c

diff --git a/reactos/dll/netapi32/nbcmdqueue.h b/reactos/dll/win32/netapi32/nbcmdqueue.h
similarity index 100%
rename from reactos/dll/netapi32/nbcmdqueue.h
rename to reactos/dll/win32/netapi32/nbcmdqueue.h

diff --git a/reactos/dll/netapi32/nbnamecache.c b/reactos/dll/win32/netapi32/nbnamecache.c
similarity index 100%
rename from reactos/dll/netapi32/nbnamecache.c
rename to reactos/dll/win32/netapi32/nbnamecache.c

diff --git a/reactos/dll/netapi32/nbnamecache.h b/reactos/dll/win32/netapi32/nbnamecache.h
similarity index 100%
rename from reactos/dll/netapi32/nbnamecache.h
rename to reactos/dll/win32/netapi32/nbnamecache.h

diff --git a/reactos/dll/netapi32/nbt.c b/reactos/dll/win32/netapi32/nbt.c
similarity index 100%
rename from reactos/dll/netapi32/nbt.c
rename to reactos/dll/win32/netapi32/nbt.c

diff --git a/reactos/dll/netapi32/netapi32.c b/reactos/dll/win32/netapi32/netapi32.c
similarity index 100%
rename from reactos/dll/netapi32/netapi32.c
rename to reactos/dll/win32/netapi32/netapi32.c

diff --git a/reactos/dll/netapi32/netapi32.spec b/reactos/dll/win32/netapi32/netapi32.spec
similarity index 100%
rename from reactos/dll/netapi32/netapi32.spec
rename to reactos/dll/win32/netapi32/netapi32.spec

diff --git a/reactos/dll/netapi32/netapi32.xml b/reactos/dll/win32/netapi32/netapi32.xml
similarity index 100%
rename from reactos/dll/netapi32/netapi32.xml
rename to reactos/dll/win32/netapi32/netapi32.xml

diff --git a/reactos/dll/netapi32/netapi32_misc.h b/reactos/dll/win32/netapi32/netapi32_misc.h
similarity index 100%
rename from reactos/dll/netapi32/netapi32_misc.h
rename to reactos/dll/win32/netapi32/netapi32_misc.h

diff --git a/reactos/dll/netapi32/netbios.c b/reactos/dll/win32/netapi32/netbios.c
similarity index 100%
rename from reactos/dll/netapi32/netbios.c
rename to reactos/dll/win32/netapi32/netbios.c

diff --git a/reactos/dll/netapi32/netbios.h b/reactos/dll/win32/netapi32/netbios.h
similarity index 100%
rename from reactos/dll/netapi32/netbios.h
rename to reactos/dll/win32/netapi32/netbios.h

diff --git a/reactos/dll/netapi32/wksta.c b/reactos/dll/win32/netapi32/wksta.c
similarity index 100%
rename from reactos/dll/netapi32/wksta.c
rename to reactos/dll/win32/netapi32/wksta.c

diff --git a/reactos/dll/oleaut32/Makefile.in b/reactos/dll/win32/oleaut32/Makefile.in
similarity index 100%
rename from reactos/dll/oleaut32/Makefile.in
rename to reactos/dll/win32/oleaut32/Makefile.in

diff --git a/reactos/dll/oleaut32/connpt.c b/reactos/dll/win32/oleaut32/connpt.c
similarity index 100%
rename from reactos/dll/oleaut32/connpt.c
rename to reactos/dll/win32/oleaut32/connpt.c

diff --git a/reactos/dll/oleaut32/connpt.h b/reactos/dll/win32/oleaut32/connpt.h
similarity index 100%
rename from reactos/dll/oleaut32/connpt.h
rename to reactos/dll/win32/oleaut32/connpt.h

diff --git a/reactos/dll/oleaut32/cursoricon.h b/reactos/dll/win32/oleaut32/cursoricon.h
similarity index 100%
rename from reactos/dll/oleaut32/cursoricon.h
rename to reactos/dll/win32/oleaut32/cursoricon.h

diff --git a/reactos/dll/oleaut32/dispatch.c b/reactos/dll/win32/oleaut32/dispatch.c
similarity index 100%
rename from reactos/dll/oleaut32/dispatch.c
rename to reactos/dll/win32/oleaut32/dispatch.c

diff --git a/reactos/dll/oleaut32/hash.c b/reactos/dll/win32/oleaut32/hash.c
similarity index 100%
rename from reactos/dll/oleaut32/hash.c
rename to reactos/dll/win32/oleaut32/hash.c

diff --git a/reactos/dll/oleaut32/oaidl_p.c b/reactos/dll/win32/oleaut32/oaidl_p.c
similarity index 100%
rename from reactos/dll/oleaut32/oaidl_p.c
rename to reactos/dll/win32/oleaut32/oaidl_p.c

diff --git a/reactos/dll/oleaut32/ole2disp.c b/reactos/dll/win32/oleaut32/ole2disp.c
similarity index 100%
rename from reactos/dll/oleaut32/ole2disp.c
rename to reactos/dll/win32/oleaut32/ole2disp.c

diff --git a/reactos/dll/oleaut32/ole2disp.h b/reactos/dll/win32/oleaut32/ole2disp.h
similarity index 100%
rename from reactos/dll/oleaut32/ole2disp.h
rename to reactos/dll/win32/oleaut32/ole2disp.h

diff --git a/reactos/dll/oleaut32/ole2disp.spec b/reactos/dll/win32/oleaut32/ole2disp.spec
similarity index 100%
rename from reactos/dll/oleaut32/ole2disp.spec
rename to reactos/dll/win32/oleaut32/ole2disp.spec

diff --git a/reactos/dll/oleaut32/oleaut.c b/reactos/dll/win32/oleaut32/oleaut.c
similarity index 100%
rename from reactos/dll/oleaut32/oleaut.c
rename to reactos/dll/win32/oleaut32/oleaut.c

diff --git a/reactos/dll/oleaut32/oleaut32.rc b/reactos/dll/win32/oleaut32/oleaut32.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32.rc
rename to reactos/dll/win32/oleaut32/oleaut32.rc

diff --git a/reactos/dll/oleaut32/oleaut32.spec b/reactos/dll/win32/oleaut32/oleaut32.spec
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32.spec
rename to reactos/dll/win32/oleaut32/oleaut32.spec

diff --git a/reactos/dll/oleaut32/oleaut32.xml b/reactos/dll/win32/oleaut32/oleaut32.xml
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32.xml
rename to reactos/dll/win32/oleaut32/oleaut32.xml

diff --git a/reactos/dll/oleaut32/oleaut32_Bg.rc b/reactos/dll/win32/oleaut32/oleaut32_Bg.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Bg.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Bg.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Cz.rc b/reactos/dll/win32/oleaut32/oleaut32_Cz.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Cz.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Cz.rc

diff --git a/reactos/dll/oleaut32/oleaut32_De.rc b/reactos/dll/win32/oleaut32/oleaut32_De.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_De.rc
rename to reactos/dll/win32/oleaut32/oleaut32_De.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Dk.rc b/reactos/dll/win32/oleaut32/oleaut32_Dk.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Dk.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Dk.rc

diff --git a/reactos/dll/oleaut32/oleaut32_En.rc b/reactos/dll/win32/oleaut32/oleaut32_En.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_En.rc
rename to reactos/dll/win32/oleaut32/oleaut32_En.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Es.rc b/reactos/dll/win32/oleaut32/oleaut32_Es.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Es.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Es.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Fr.rc b/reactos/dll/win32/oleaut32/oleaut32_Fr.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Fr.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Fr.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Hu.rc b/reactos/dll/win32/oleaut32/oleaut32_Hu.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Hu.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Hu.rc

diff --git a/reactos/dll/oleaut32/oleaut32_It.rc b/reactos/dll/win32/oleaut32/oleaut32_It.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_It.rc
rename to reactos/dll/win32/oleaut32/oleaut32_It.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Ja.rc b/reactos/dll/win32/oleaut32/oleaut32_Ja.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Ja.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Ja.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Ko.rc b/reactos/dll/win32/oleaut32/oleaut32_Ko.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Ko.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Ko.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Nl.rc b/reactos/dll/win32/oleaut32/oleaut32_Nl.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Nl.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Nl.rc

diff --git a/reactos/dll/oleaut32/oleaut32_No.rc b/reactos/dll/win32/oleaut32/oleaut32_No.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_No.rc
rename to reactos/dll/win32/oleaut32/oleaut32_No.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Pl.rc b/reactos/dll/win32/oleaut32/oleaut32_Pl.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Pl.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Pl.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Pt.rc b/reactos/dll/win32/oleaut32/oleaut32_Pt.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Pt.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Pt.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Ru.rc b/reactos/dll/win32/oleaut32/oleaut32_Ru.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Ru.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Ru.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Sv.rc b/reactos/dll/win32/oleaut32/oleaut32_Sv.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Sv.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Sv.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Th.rc b/reactos/dll/win32/oleaut32/oleaut32_Th.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Th.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Th.rc

diff --git a/reactos/dll/oleaut32/oleaut32_Uk.rc b/reactos/dll/win32/oleaut32/oleaut32_Uk.rc
similarity index 100%
rename from reactos/dll/oleaut32/oleaut32_Uk.rc
rename to reactos/dll/win32/oleaut32/oleaut32_Uk.rc

diff --git a/reactos/dll/oleaut32/olefont.c b/reactos/dll/win32/oleaut32/olefont.c
similarity index 100%
rename from reactos/dll/oleaut32/olefont.c
rename to reactos/dll/win32/oleaut32/olefont.c

diff --git a/reactos/dll/oleaut32/olepicture.c b/reactos/dll/win32/oleaut32/olepicture.c
similarity index 100%
rename from reactos/dll/oleaut32/olepicture.c
rename to reactos/dll/win32/oleaut32/olepicture.c

diff --git a/reactos/dll/oleaut32/recinfo.c b/reactos/dll/win32/oleaut32/recinfo.c
similarity index 100%
rename from reactos/dll/oleaut32/recinfo.c
rename to reactos/dll/win32/oleaut32/recinfo.c

diff --git a/reactos/dll/oleaut32/regsvr.c b/reactos/dll/win32/oleaut32/regsvr.c
similarity index 100%
rename from reactos/dll/oleaut32/regsvr.c
rename to reactos/dll/win32/oleaut32/regsvr.c

diff --git a/reactos/dll/oleaut32/resource.h b/reactos/dll/win32/oleaut32/resource.h
similarity index 100%
rename from reactos/dll/oleaut32/resource.h
rename to reactos/dll/win32/oleaut32/resource.h

diff --git a/reactos/dll/oleaut32/safearray.c b/reactos/dll/win32/oleaut32/safearray.c
similarity index 100%
rename from reactos/dll/oleaut32/safearray.c
rename to reactos/dll/win32/oleaut32/safearray.c

diff --git a/reactos/dll/oleaut32/stubs.c b/reactos/dll/win32/oleaut32/stubs.c
similarity index 100%
rename from reactos/dll/oleaut32/stubs.c
rename to reactos/dll/win32/oleaut32/stubs.c

diff --git a/reactos/dll/oleaut32/tmarshal.c b/reactos/dll/win32/oleaut32/tmarshal.c
similarity index 100%
rename from reactos/dll/oleaut32/tmarshal.c
rename to reactos/dll/win32/oleaut32/tmarshal.c

diff --git a/reactos/dll/oleaut32/typelib.c b/reactos/dll/win32/oleaut32/typelib.c
similarity index 100%
rename from reactos/dll/oleaut32/typelib.c
rename to reactos/dll/win32/oleaut32/typelib.c

diff --git a/reactos/dll/oleaut32/typelib.h b/reactos/dll/win32/oleaut32/typelib.h
similarity index 100%
rename from reactos/dll/oleaut32/typelib.h
rename to reactos/dll/win32/oleaut32/typelib.h

diff --git a/reactos/dll/oleaut32/typelib.spec b/reactos/dll/win32/oleaut32/typelib.spec
similarity index 100%
rename from reactos/dll/oleaut32/typelib.spec
rename to reactos/dll/win32/oleaut32/typelib.spec

diff --git a/reactos/dll/oleaut32/typelib16.c b/reactos/dll/win32/oleaut32/typelib16.c
similarity index 100%
rename from reactos/dll/oleaut32/typelib16.c
rename to reactos/dll/win32/oleaut32/typelib16.c

diff --git a/reactos/dll/oleaut32/typelib2.c b/reactos/dll/win32/oleaut32/typelib2.c
similarity index 100%
rename from reactos/dll/oleaut32/typelib2.c
rename to reactos/dll/win32/oleaut32/typelib2.c

diff --git a/reactos/dll/oleaut32/usrmarshal.c b/reactos/dll/win32/oleaut32/usrmarshal.c
similarity index 100%
rename from reactos/dll/oleaut32/usrmarshal.c
rename to reactos/dll/win32/oleaut32/usrmarshal.c

diff --git a/reactos/dll/oleaut32/varformat.c b/reactos/dll/win32/oleaut32/varformat.c
similarity index 100%
rename from reactos/dll/oleaut32/varformat.c
rename to reactos/dll/win32/oleaut32/varformat.c

diff --git a/reactos/dll/oleaut32/variant.c b/reactos/dll/win32/oleaut32/variant.c
similarity index 100%
rename from reactos/dll/oleaut32/variant.c
rename to reactos/dll/win32/oleaut32/variant.c

diff --git a/reactos/dll/oleaut32/variant.h b/reactos/dll/win32/oleaut32/variant.h
similarity index 100%
rename from reactos/dll/oleaut32/variant.h
rename to reactos/dll/win32/oleaut32/variant.h

diff --git a/reactos/dll/oleaut32/vartype.c b/reactos/dll/win32/oleaut32/vartype.c
similarity index 100%
rename from reactos/dll/oleaut32/vartype.c
rename to reactos/dll/win32/oleaut32/vartype.c

diff --git a/reactos/dll/oleaut32/version.rc b/reactos/dll/win32/oleaut32/version.rc
similarity index 100%
rename from reactos/dll/oleaut32/version.rc
rename to reactos/dll/win32/oleaut32/version.rc

diff --git a/reactos/dll/oledlg/Makefile.in b/reactos/dll/win32/oledlg/Makefile.in
similarity index 100%
rename from reactos/dll/oledlg/Makefile.in
rename to reactos/dll/win32/oledlg/Makefile.in

diff --git a/reactos/dll/oledlg/insobjdlg.c b/reactos/dll/win32/oledlg/insobjdlg.c
similarity index 100%
rename from reactos/dll/oledlg/insobjdlg.c
rename to reactos/dll/win32/oledlg/insobjdlg.c

diff --git a/reactos/dll/oledlg/oledlg.spec b/reactos/dll/win32/oledlg/oledlg.spec
similarity index 100%
rename from reactos/dll/oledlg/oledlg.spec
rename to reactos/dll/win32/oledlg/oledlg.spec

diff --git a/reactos/dll/oledlg/oledlg.xml b/reactos/dll/win32/oledlg/oledlg.xml
similarity index 100%
rename from reactos/dll/oledlg/oledlg.xml
rename to reactos/dll/win32/oledlg/oledlg.xml

diff --git a/reactos/dll/oledlg/oledlg_Cs.rc b/reactos/dll/win32/oledlg/oledlg_Cs.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Cs.rc
rename to reactos/dll/win32/oledlg/oledlg_Cs.rc

diff --git a/reactos/dll/oledlg/oledlg_De.rc b/reactos/dll/win32/oledlg/oledlg_De.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_De.rc
rename to reactos/dll/win32/oledlg/oledlg_De.rc

diff --git a/reactos/dll/oledlg/oledlg_En.rc b/reactos/dll/win32/oledlg/oledlg_En.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_En.rc
rename to reactos/dll/win32/oledlg/oledlg_En.rc

diff --git a/reactos/dll/oledlg/oledlg_Es.rc b/reactos/dll/win32/oledlg/oledlg_Es.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Es.rc
rename to reactos/dll/win32/oledlg/oledlg_Es.rc

diff --git a/reactos/dll/oledlg/oledlg_Fr.rc b/reactos/dll/win32/oledlg/oledlg_Fr.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Fr.rc
rename to reactos/dll/win32/oledlg/oledlg_Fr.rc

diff --git a/reactos/dll/oledlg/oledlg_Hu.rc b/reactos/dll/win32/oledlg/oledlg_Hu.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Hu.rc
rename to reactos/dll/win32/oledlg/oledlg_Hu.rc

diff --git a/reactos/dll/oledlg/oledlg_It.rc b/reactos/dll/win32/oledlg/oledlg_It.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_It.rc
rename to reactos/dll/win32/oledlg/oledlg_It.rc

diff --git a/reactos/dll/oledlg/oledlg_Ja.rc b/reactos/dll/win32/oledlg/oledlg_Ja.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Ja.rc
rename to reactos/dll/win32/oledlg/oledlg_Ja.rc

diff --git a/reactos/dll/oledlg/oledlg_Ko.rc b/reactos/dll/win32/oledlg/oledlg_Ko.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Ko.rc
rename to reactos/dll/win32/oledlg/oledlg_Ko.rc

diff --git a/reactos/dll/oledlg/oledlg_Nl.rc b/reactos/dll/win32/oledlg/oledlg_Nl.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Nl.rc
rename to reactos/dll/win32/oledlg/oledlg_Nl.rc

diff --git a/reactos/dll/oledlg/oledlg_No.rc b/reactos/dll/win32/oledlg/oledlg_No.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_No.rc
rename to reactos/dll/win32/oledlg/oledlg_No.rc

diff --git a/reactos/dll/oledlg/oledlg_Pt.rc b/reactos/dll/win32/oledlg/oledlg_Pt.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Pt.rc
rename to reactos/dll/win32/oledlg/oledlg_Pt.rc

diff --git a/reactos/dll/oledlg/oledlg_Ru.rc b/reactos/dll/win32/oledlg/oledlg_Ru.rc
similarity index 100%
rename from reactos/dll/oledlg/oledlg_Ru.rc
rename to reactos/dll/win32/oledlg/oledlg_Ru.rc

diff --git a/reactos/dll/oledlg/oledlg_main.c b/reactos/dll/win32/oledlg/oledlg_main.c
similarity index 100%
rename from reactos/dll/oledlg/oledlg_main.c
rename to reactos/dll/win32/oledlg/oledlg_main.c

diff --git a/reactos/dll/oledlg/resource.h b/reactos/dll/win32/oledlg/resource.h
similarity index 100%
rename from reactos/dll/oledlg/resource.h
rename to reactos/dll/win32/oledlg/resource.h

diff --git a/reactos/dll/oledlg/rsrc.rc b/reactos/dll/win32/oledlg/rsrc.rc
similarity index 100%
rename from reactos/dll/oledlg/rsrc.rc
rename to reactos/dll/win32/oledlg/rsrc.rc

diff --git a/reactos/dll/olepro32/README b/reactos/dll/win32/olepro32/README
similarity index 100%
rename from reactos/dll/olepro32/README
rename to reactos/dll/win32/olepro32/README

diff --git a/reactos/dll/olepro32/olepro32.rc b/reactos/dll/win32/olepro32/olepro32.rc
similarity index 100%
rename from reactos/dll/olepro32/olepro32.rc
rename to reactos/dll/win32/olepro32/olepro32.rc

diff --git a/reactos/dll/olepro32/olepro32.spec b/reactos/dll/win32/olepro32/olepro32.spec
similarity index 100%
rename from reactos/dll/olepro32/olepro32.spec
rename to reactos/dll/win32/olepro32/olepro32.spec

diff --git a/reactos/dll/olepro32/olepro32.xml b/reactos/dll/win32/olepro32/olepro32.xml
similarity index 100%
rename from reactos/dll/olepro32/olepro32.xml
rename to reactos/dll/win32/olepro32/olepro32.xml

diff --git a/reactos/dll/olepro32/olepro32stubs.c b/reactos/dll/win32/olepro32/olepro32stubs.c
similarity index 100%
rename from reactos/dll/olepro32/olepro32stubs.c
rename to reactos/dll/win32/olepro32/olepro32stubs.c

diff --git a/reactos/dll/opengl32/gl.c b/reactos/dll/win32/opengl32/gl.c
similarity index 100%
rename from reactos/dll/opengl32/gl.c
rename to reactos/dll/win32/opengl32/gl.c

diff --git a/reactos/dll/opengl32/glfuncs.h b/reactos/dll/win32/opengl32/glfuncs.h
similarity index 100%
rename from reactos/dll/opengl32/glfuncs.h
rename to reactos/dll/win32/opengl32/glfuncs.h

diff --git a/reactos/dll/opengl32/icdlist.h b/reactos/dll/win32/opengl32/icdlist.h
similarity index 100%
rename from reactos/dll/opengl32/icdlist.h
rename to reactos/dll/win32/opengl32/icdlist.h

diff --git a/reactos/dll/opengl32/icdtable.h b/reactos/dll/win32/opengl32/icdtable.h
similarity index 100%
rename from reactos/dll/opengl32/icdtable.h
rename to reactos/dll/win32/opengl32/icdtable.h

diff --git a/reactos/dll/opengl32/opengl32.c b/reactos/dll/win32/opengl32/opengl32.c
similarity index 100%
rename from reactos/dll/opengl32/opengl32.c
rename to reactos/dll/win32/opengl32/opengl32.c

diff --git a/reactos/dll/opengl32/opengl32.def b/reactos/dll/win32/opengl32/opengl32.def
similarity index 100%
rename from reactos/dll/opengl32/opengl32.def
rename to reactos/dll/win32/opengl32/opengl32.def

diff --git a/reactos/dll/opengl32/opengl32.dsp b/reactos/dll/win32/opengl32/opengl32.dsp
similarity index 100%
rename from reactos/dll/opengl32/opengl32.dsp
rename to reactos/dll/win32/opengl32/opengl32.dsp

diff --git a/reactos/dll/opengl32/opengl32.dsw b/reactos/dll/win32/opengl32/opengl32.dsw
similarity index 100%
rename from reactos/dll/opengl32/opengl32.dsw
rename to reactos/dll/win32/opengl32/opengl32.dsw

diff --git a/reactos/dll/opengl32/opengl32.h b/reactos/dll/win32/opengl32/opengl32.h
similarity index 100%
rename from reactos/dll/opengl32/opengl32.h
rename to reactos/dll/win32/opengl32/opengl32.h

diff --git a/reactos/dll/opengl32/opengl32.xml b/reactos/dll/win32/opengl32/opengl32.xml
similarity index 100%
rename from reactos/dll/opengl32/opengl32.xml
rename to reactos/dll/win32/opengl32/opengl32.xml

diff --git a/reactos/dll/opengl32/teb.h b/reactos/dll/win32/opengl32/teb.h
similarity index 100%
rename from reactos/dll/opengl32/teb.h
rename to reactos/dll/win32/opengl32/teb.h

diff --git a/reactos/dll/opengl32/wgl.c b/reactos/dll/win32/opengl32/wgl.c
similarity index 100%
rename from reactos/dll/opengl32/wgl.c
rename to reactos/dll/win32/opengl32/wgl.c

diff --git a/reactos/dll/psapi/internal.h b/reactos/dll/win32/psapi/internal.h
similarity index 100%
rename from reactos/dll/psapi/internal.h
rename to reactos/dll/win32/psapi/internal.h

diff --git a/reactos/dll/psapi/malloc.c b/reactos/dll/win32/psapi/malloc.c
similarity index 100%
rename from reactos/dll/psapi/malloc.c
rename to reactos/dll/win32/psapi/malloc.c

diff --git a/reactos/dll/psapi/precomp.h b/reactos/dll/win32/psapi/precomp.h
similarity index 100%
rename from reactos/dll/psapi/precomp.h
rename to reactos/dll/win32/psapi/precomp.h

diff --git a/reactos/dll/psapi/psapi.c b/reactos/dll/win32/psapi/psapi.c
similarity index 100%
rename from reactos/dll/psapi/psapi.c
rename to reactos/dll/win32/psapi/psapi.c

diff --git a/reactos/dll/psapi/psapi.def b/reactos/dll/win32/psapi/psapi.def
similarity index 100%
rename from reactos/dll/psapi/psapi.def
rename to reactos/dll/win32/psapi/psapi.def

diff --git a/reactos/dll/psapi/psapi.rc b/reactos/dll/win32/psapi/psapi.rc
similarity index 100%
rename from reactos/dll/psapi/psapi.rc
rename to reactos/dll/win32/psapi/psapi.rc

diff --git a/reactos/dll/psapi/psapi.xml b/reactos/dll/win32/psapi/psapi.xml
similarity index 100%
rename from reactos/dll/psapi/psapi.xml
rename to reactos/dll/win32/psapi/psapi.xml

diff --git a/reactos/dll/riched20/Makefile.in b/reactos/dll/win32/riched20/Makefile.in
similarity index 100%
rename from reactos/dll/riched20/Makefile.in
rename to reactos/dll/win32/riched20/Makefile.in

diff --git a/reactos/dll/riched20/caret.c b/reactos/dll/win32/riched20/caret.c
similarity index 100%
rename from reactos/dll/riched20/caret.c
rename to reactos/dll/win32/riched20/caret.c

diff --git a/reactos/dll/riched20/context.c b/reactos/dll/win32/riched20/context.c
similarity index 100%
rename from reactos/dll/riched20/context.c
rename to reactos/dll/win32/riched20/context.c

diff --git a/reactos/dll/riched20/editor.c b/reactos/dll/win32/riched20/editor.c
similarity index 100%
rename from reactos/dll/riched20/editor.c
rename to reactos/dll/win32/riched20/editor.c

diff --git a/reactos/dll/riched20/editor.h b/reactos/dll/win32/riched20/editor.h
similarity index 100%
rename from reactos/dll/riched20/editor.h
rename to reactos/dll/win32/riched20/editor.h

diff --git a/reactos/dll/riched20/editstr.h b/reactos/dll/win32/riched20/editstr.h
similarity index 100%
rename from reactos/dll/riched20/editstr.h
rename to reactos/dll/win32/riched20/editstr.h

diff --git a/reactos/dll/riched20/list.c b/reactos/dll/win32/riched20/list.c
similarity index 100%
rename from reactos/dll/riched20/list.c
rename to reactos/dll/win32/riched20/list.c

diff --git a/reactos/dll/riched20/paint.c b/reactos/dll/win32/riched20/paint.c
similarity index 100%
rename from reactos/dll/riched20/paint.c
rename to reactos/dll/win32/riched20/paint.c

diff --git a/reactos/dll/riched20/para.c b/reactos/dll/win32/riched20/para.c
similarity index 100%
rename from reactos/dll/riched20/para.c
rename to reactos/dll/win32/riched20/para.c

diff --git a/reactos/dll/riched20/reader.c b/reactos/dll/win32/riched20/reader.c
similarity index 100%
rename from reactos/dll/riched20/reader.c
rename to reactos/dll/win32/riched20/reader.c

diff --git a/reactos/dll/riched20/riched20.spec b/reactos/dll/win32/riched20/riched20.spec
similarity index 100%
rename from reactos/dll/riched20/riched20.spec
rename to reactos/dll/win32/riched20/riched20.spec

diff --git a/reactos/dll/riched20/riched20.xml b/reactos/dll/win32/riched20/riched20.xml
similarity index 100%
rename from reactos/dll/riched20/riched20.xml
rename to reactos/dll/win32/riched20/riched20.xml

diff --git a/reactos/dll/riched20/richole.c b/reactos/dll/win32/riched20/richole.c
similarity index 100%
rename from reactos/dll/riched20/richole.c
rename to reactos/dll/win32/riched20/richole.c

diff --git a/reactos/dll/riched20/row.c b/reactos/dll/win32/riched20/row.c
similarity index 100%
rename from reactos/dll/riched20/row.c
rename to reactos/dll/win32/riched20/row.c

diff --git a/reactos/dll/riched20/rtf.h b/reactos/dll/win32/riched20/rtf.h
similarity index 100%
rename from reactos/dll/riched20/rtf.h
rename to reactos/dll/win32/riched20/rtf.h

diff --git a/reactos/dll/riched20/run.c b/reactos/dll/win32/riched20/run.c
similarity index 100%
rename from reactos/dll/riched20/run.c
rename to reactos/dll/win32/riched20/run.c

diff --git a/reactos/dll/riched20/string.c b/reactos/dll/win32/riched20/string.c
similarity index 100%
rename from reactos/dll/riched20/string.c
rename to reactos/dll/win32/riched20/string.c

diff --git a/reactos/dll/riched20/style.c b/reactos/dll/win32/riched20/style.c
similarity index 100%
rename from reactos/dll/riched20/style.c
rename to reactos/dll/win32/riched20/style.c

diff --git a/reactos/dll/riched20/undo.c b/reactos/dll/win32/riched20/undo.c
similarity index 100%
rename from reactos/dll/riched20/undo.c
rename to reactos/dll/win32/riched20/undo.c

diff --git a/reactos/dll/riched20/wrap.c b/reactos/dll/win32/riched20/wrap.c
similarity index 100%
rename from reactos/dll/riched20/wrap.c
rename to reactos/dll/win32/riched20/wrap.c

diff --git a/reactos/dll/riched20/writer.c b/reactos/dll/win32/riched20/writer.c
similarity index 100%
rename from reactos/dll/riched20/writer.c
rename to reactos/dll/win32/riched20/writer.c

diff --git a/reactos/dll/richedit/riched32.spec b/reactos/dll/win32/richedit/riched32.spec
similarity index 100%
rename from reactos/dll/richedit/riched32.spec
rename to reactos/dll/win32/richedit/riched32.spec

diff --git a/reactos/dll/richedit/riched32.xml b/reactos/dll/win32/richedit/riched32.xml
similarity index 100%
rename from reactos/dll/richedit/riched32.xml
rename to reactos/dll/win32/richedit/riched32.xml

diff --git a/reactos/dll/richedit/richedit.c b/reactos/dll/win32/richedit/richedit.c
similarity index 100%
rename from reactos/dll/richedit/richedit.c
rename to reactos/dll/win32/richedit/richedit.c

diff --git a/reactos/dll/rpcrt4/cproxy.c b/reactos/dll/win32/rpcrt4/cproxy.c
similarity index 100%
rename from reactos/dll/rpcrt4/cproxy.c
rename to reactos/dll/win32/rpcrt4/cproxy.c

diff --git a/reactos/dll/rpcrt4/cpsf.c b/reactos/dll/win32/rpcrt4/cpsf.c
similarity index 100%
rename from reactos/dll/rpcrt4/cpsf.c
rename to reactos/dll/win32/rpcrt4/cpsf.c

diff --git a/reactos/dll/rpcrt4/cpsf.h b/reactos/dll/win32/rpcrt4/cpsf.h
similarity index 100%
rename from reactos/dll/rpcrt4/cpsf.h
rename to reactos/dll/win32/rpcrt4/cpsf.h

diff --git a/reactos/dll/rpcrt4/cstub.c b/reactos/dll/win32/rpcrt4/cstub.c
similarity index 100%
rename from reactos/dll/rpcrt4/cstub.c
rename to reactos/dll/win32/rpcrt4/cstub.c

diff --git a/reactos/dll/rpcrt4/ndr_marshall.c b/reactos/dll/win32/rpcrt4/ndr_marshall.c
similarity index 100%
rename from reactos/dll/rpcrt4/ndr_marshall.c
rename to reactos/dll/win32/rpcrt4/ndr_marshall.c

diff --git a/reactos/dll/rpcrt4/ndr_midl.c b/reactos/dll/win32/rpcrt4/ndr_midl.c
similarity index 100%
rename from reactos/dll/rpcrt4/ndr_midl.c
rename to reactos/dll/win32/rpcrt4/ndr_midl.c

diff --git a/reactos/dll/rpcrt4/ndr_misc.h b/reactos/dll/win32/rpcrt4/ndr_misc.h
similarity index 100%
rename from reactos/dll/rpcrt4/ndr_misc.h
rename to reactos/dll/win32/rpcrt4/ndr_misc.h

diff --git a/reactos/dll/rpcrt4/ndr_ole.c b/reactos/dll/win32/rpcrt4/ndr_ole.c
similarity index 100%
rename from reactos/dll/rpcrt4/ndr_ole.c
rename to reactos/dll/win32/rpcrt4/ndr_ole.c

diff --git a/reactos/dll/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c
similarity index 100%
rename from reactos/dll/rpcrt4/ndr_stubless.c
rename to reactos/dll/win32/rpcrt4/ndr_stubless.c

diff --git a/reactos/dll/rpcrt4/rpc_binding.c b/reactos/dll/win32/rpcrt4/rpc_binding.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_binding.c
rename to reactos/dll/win32/rpcrt4/rpc_binding.c

diff --git a/reactos/dll/rpcrt4/rpc_binding.h b/reactos/dll/win32/rpcrt4/rpc_binding.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_binding.h
rename to reactos/dll/win32/rpcrt4/rpc_binding.h

diff --git a/reactos/dll/rpcrt4/rpc_defs.h b/reactos/dll/win32/rpcrt4/rpc_defs.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_defs.h
rename to reactos/dll/win32/rpcrt4/rpc_defs.h

diff --git a/reactos/dll/rpcrt4/rpc_epmap.c b/reactos/dll/win32/rpcrt4/rpc_epmap.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_epmap.c
rename to reactos/dll/win32/rpcrt4/rpc_epmap.c

diff --git a/reactos/dll/rpcrt4/rpc_message.c b/reactos/dll/win32/rpcrt4/rpc_message.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_message.c
rename to reactos/dll/win32/rpcrt4/rpc_message.c

diff --git a/reactos/dll/rpcrt4/rpc_message.h b/reactos/dll/win32/rpcrt4/rpc_message.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_message.h
rename to reactos/dll/win32/rpcrt4/rpc_message.h

diff --git a/reactos/dll/rpcrt4/rpc_misc.h b/reactos/dll/win32/rpcrt4/rpc_misc.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_misc.h
rename to reactos/dll/win32/rpcrt4/rpc_misc.h

diff --git a/reactos/dll/rpcrt4/rpc_server.c b/reactos/dll/win32/rpcrt4/rpc_server.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_server.c
rename to reactos/dll/win32/rpcrt4/rpc_server.c

diff --git a/reactos/dll/rpcrt4/rpc_server.h b/reactos/dll/win32/rpcrt4/rpc_server.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpc_server.h
rename to reactos/dll/win32/rpcrt4/rpc_server.h

diff --git a/reactos/dll/rpcrt4/rpcrt4.rc b/reactos/dll/win32/rpcrt4/rpcrt4.rc
similarity index 100%
rename from reactos/dll/rpcrt4/rpcrt4.rc
rename to reactos/dll/win32/rpcrt4/rpcrt4.rc

diff --git a/reactos/dll/rpcrt4/rpcrt4.spec b/reactos/dll/win32/rpcrt4/rpcrt4.spec
similarity index 100%
rename from reactos/dll/rpcrt4/rpcrt4.spec
rename to reactos/dll/win32/rpcrt4/rpcrt4.spec

diff --git a/reactos/dll/rpcrt4/rpcrt4.xml b/reactos/dll/win32/rpcrt4/rpcrt4.xml
similarity index 100%
rename from reactos/dll/rpcrt4/rpcrt4.xml
rename to reactos/dll/win32/rpcrt4/rpcrt4.xml

diff --git a/reactos/dll/rpcrt4/rpcrt4_main.c b/reactos/dll/win32/rpcrt4/rpcrt4_main.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpcrt4_main.c
rename to reactos/dll/win32/rpcrt4/rpcrt4_main.c

diff --git a/reactos/dll/rpcrt4/rpcss_np_client.c b/reactos/dll/win32/rpcrt4/rpcss_np_client.c
similarity index 100%
rename from reactos/dll/rpcrt4/rpcss_np_client.c
rename to reactos/dll/win32/rpcrt4/rpcss_np_client.c

diff --git a/reactos/dll/rpcrt4/rpcss_np_client.h b/reactos/dll/win32/rpcrt4/rpcss_np_client.h
similarity index 100%
rename from reactos/dll/rpcrt4/rpcss_np_client.h
rename to reactos/dll/win32/rpcrt4/rpcss_np_client.h

diff --git a/reactos/dll/samlib/debug.h b/reactos/dll/win32/samlib/debug.h
similarity index 100%
rename from reactos/dll/samlib/debug.h
rename to reactos/dll/win32/samlib/debug.h

diff --git a/reactos/dll/samlib/dllmain.c b/reactos/dll/win32/samlib/dllmain.c
similarity index 100%
rename from reactos/dll/samlib/dllmain.c
rename to reactos/dll/win32/samlib/dllmain.c

diff --git a/reactos/dll/samlib/samlib.c b/reactos/dll/win32/samlib/samlib.c
similarity index 100%
rename from reactos/dll/samlib/samlib.c
rename to reactos/dll/win32/samlib/samlib.c

diff --git a/reactos/dll/samlib/samlib.def b/reactos/dll/win32/samlib/samlib.def
similarity index 100%
rename from reactos/dll/samlib/samlib.def
rename to reactos/dll/win32/samlib/samlib.def

diff --git a/reactos/dll/samlib/samlib.rc b/reactos/dll/win32/samlib/samlib.rc
similarity index 100%
rename from reactos/dll/samlib/samlib.rc
rename to reactos/dll/win32/samlib/samlib.rc

diff --git a/reactos/dll/samlib/samlib.xml b/reactos/dll/win32/samlib/samlib.xml
similarity index 100%
rename from reactos/dll/samlib/samlib.xml
rename to reactos/dll/win32/samlib/samlib.xml

diff --git a/reactos/dll/secur32/dllmain.c b/reactos/dll/win32/secur32/dllmain.c
similarity index 100%
rename from reactos/dll/secur32/dllmain.c
rename to reactos/dll/win32/secur32/dllmain.c

diff --git a/reactos/dll/secur32/lsa.c b/reactos/dll/win32/secur32/lsa.c
similarity index 100%
rename from reactos/dll/secur32/lsa.c
rename to reactos/dll/win32/secur32/lsa.c

diff --git a/reactos/dll/secur32/precomp.h b/reactos/dll/win32/secur32/precomp.h
similarity index 100%
rename from reactos/dll/secur32/precomp.h
rename to reactos/dll/win32/secur32/precomp.h

diff --git a/reactos/dll/secur32/secext.c b/reactos/dll/win32/secur32/secext.c
similarity index 100%
rename from reactos/dll/secur32/secext.c
rename to reactos/dll/win32/secur32/secext.c

diff --git a/reactos/dll/secur32/secur32.def b/reactos/dll/win32/secur32/secur32.def
similarity index 100%
rename from reactos/dll/secur32/secur32.def
rename to reactos/dll/win32/secur32/secur32.def

diff --git a/reactos/dll/secur32/secur32.rc b/reactos/dll/win32/secur32/secur32.rc
similarity index 100%
rename from reactos/dll/secur32/secur32.rc
rename to reactos/dll/win32/secur32/secur32.rc

diff --git a/reactos/dll/secur32/secur32.xml b/reactos/dll/win32/secur32/secur32.xml
similarity index 100%
rename from reactos/dll/secur32/secur32.xml
rename to reactos/dll/win32/secur32/secur32.xml

diff --git a/reactos/dll/secur32/sspi.c b/reactos/dll/win32/secur32/sspi.c
similarity index 100%
rename from reactos/dll/secur32/sspi.c
rename to reactos/dll/win32/secur32/sspi.c

diff --git a/reactos/dll/setupapi/Bg.rc b/reactos/dll/win32/setupapi/Bg.rc
similarity index 100%
rename from reactos/dll/setupapi/Bg.rc
rename to reactos/dll/win32/setupapi/Bg.rc

diff --git a/reactos/dll/setupapi/Cs.rc b/reactos/dll/win32/setupapi/Cs.rc
similarity index 100%
rename from reactos/dll/setupapi/Cs.rc
rename to reactos/dll/win32/setupapi/Cs.rc

diff --git a/reactos/dll/setupapi/Da.rc b/reactos/dll/win32/setupapi/Da.rc
similarity index 100%
rename from reactos/dll/setupapi/Da.rc
rename to reactos/dll/win32/setupapi/Da.rc

diff --git a/reactos/dll/setupapi/De.rc b/reactos/dll/win32/setupapi/De.rc
similarity index 100%
rename from reactos/dll/setupapi/De.rc
rename to reactos/dll/win32/setupapi/De.rc

diff --git a/reactos/dll/setupapi/En.rc b/reactos/dll/win32/setupapi/En.rc
similarity index 100%
rename from reactos/dll/setupapi/En.rc
rename to reactos/dll/win32/setupapi/En.rc

diff --git a/reactos/dll/setupapi/Es.rc b/reactos/dll/win32/setupapi/Es.rc
similarity index 100%
rename from reactos/dll/setupapi/Es.rc
rename to reactos/dll/win32/setupapi/Es.rc

diff --git a/reactos/dll/setupapi/Fi.rc b/reactos/dll/win32/setupapi/Fi.rc
similarity index 100%
rename from reactos/dll/setupapi/Fi.rc
rename to reactos/dll/win32/setupapi/Fi.rc

diff --git a/reactos/dll/setupapi/Fr.rc b/reactos/dll/win32/setupapi/Fr.rc
similarity index 100%
rename from reactos/dll/setupapi/Fr.rc
rename to reactos/dll/win32/setupapi/Fr.rc

diff --git a/reactos/dll/setupapi/Hu.rc b/reactos/dll/win32/setupapi/Hu.rc
similarity index 100%
rename from reactos/dll/setupapi/Hu.rc
rename to reactos/dll/win32/setupapi/Hu.rc

diff --git a/reactos/dll/setupapi/It.rc b/reactos/dll/win32/setupapi/It.rc
similarity index 100%
rename from reactos/dll/setupapi/It.rc
rename to reactos/dll/win32/setupapi/It.rc

diff --git a/reactos/dll/setupapi/Ja.rc b/reactos/dll/win32/setupapi/Ja.rc
similarity index 100%
rename from reactos/dll/setupapi/Ja.rc
rename to reactos/dll/win32/setupapi/Ja.rc

diff --git a/reactos/dll/setupapi/Ko.rc b/reactos/dll/win32/setupapi/Ko.rc
similarity index 100%
rename from reactos/dll/setupapi/Ko.rc
rename to reactos/dll/win32/setupapi/Ko.rc

diff --git a/reactos/dll/setupapi/Makefile.in b/reactos/dll/win32/setupapi/Makefile.in
similarity index 100%
rename from reactos/dll/setupapi/Makefile.in
rename to reactos/dll/win32/setupapi/Makefile.in

diff --git a/reactos/dll/setupapi/Nl.rc b/reactos/dll/win32/setupapi/Nl.rc
similarity index 100%
rename from reactos/dll/setupapi/Nl.rc
rename to reactos/dll/win32/setupapi/Nl.rc

diff --git a/reactos/dll/setupapi/No.rc b/reactos/dll/win32/setupapi/No.rc
similarity index 100%
rename from reactos/dll/setupapi/No.rc
rename to reactos/dll/win32/setupapi/No.rc

diff --git a/reactos/dll/setupapi/Pl.rc b/reactos/dll/win32/setupapi/Pl.rc
similarity index 100%
rename from reactos/dll/setupapi/Pl.rc
rename to reactos/dll/win32/setupapi/Pl.rc

diff --git a/reactos/dll/setupapi/Pt.rc b/reactos/dll/win32/setupapi/Pt.rc
similarity index 100%
rename from reactos/dll/setupapi/Pt.rc
rename to reactos/dll/win32/setupapi/Pt.rc

diff --git a/reactos/dll/setupapi/Ru.rc b/reactos/dll/win32/setupapi/Ru.rc
similarity index 100%
rename from reactos/dll/setupapi/Ru.rc
rename to reactos/dll/win32/setupapi/Ru.rc

diff --git a/reactos/dll/setupapi/Sv.rc b/reactos/dll/win32/setupapi/Sv.rc
similarity index 100%
rename from reactos/dll/setupapi/Sv.rc
rename to reactos/dll/win32/setupapi/Sv.rc

diff --git a/reactos/dll/setupapi/cfgmgr.c b/reactos/dll/win32/setupapi/cfgmgr.c
similarity index 100%
rename from reactos/dll/setupapi/cfgmgr.c
rename to reactos/dll/win32/setupapi/cfgmgr.c

diff --git a/reactos/dll/setupapi/devinst.c b/reactos/dll/win32/setupapi/devinst.c
similarity index 100%
rename from reactos/dll/setupapi/devinst.c
rename to reactos/dll/win32/setupapi/devinst.c

diff --git a/reactos/dll/setupapi/devinst16.c b/reactos/dll/win32/setupapi/devinst16.c
similarity index 100%
rename from reactos/dll/setupapi/devinst16.c
rename to reactos/dll/win32/setupapi/devinst16.c

diff --git a/reactos/dll/setupapi/dirid.c b/reactos/dll/win32/setupapi/dirid.c
similarity index 100%
rename from reactos/dll/setupapi/dirid.c
rename to reactos/dll/win32/setupapi/dirid.c

diff --git a/reactos/dll/setupapi/diskspace.c b/reactos/dll/win32/setupapi/diskspace.c
similarity index 100%
rename from reactos/dll/setupapi/diskspace.c
rename to reactos/dll/win32/setupapi/diskspace.c

diff --git a/reactos/dll/setupapi/infparse.c b/reactos/dll/win32/setupapi/infparse.c
similarity index 100%
rename from reactos/dll/setupapi/infparse.c
rename to reactos/dll/win32/setupapi/infparse.c

diff --git a/reactos/dll/setupapi/install.c b/reactos/dll/win32/setupapi/install.c
similarity index 100%
rename from reactos/dll/setupapi/install.c
rename to reactos/dll/win32/setupapi/install.c

diff --git a/reactos/dll/setupapi/misc.c b/reactos/dll/win32/setupapi/misc.c
similarity index 100%
rename from reactos/dll/setupapi/misc.c
rename to reactos/dll/win32/setupapi/misc.c

diff --git a/reactos/dll/setupapi/parser.c b/reactos/dll/win32/setupapi/parser.c
similarity index 100%
rename from reactos/dll/setupapi/parser.c
rename to reactos/dll/win32/setupapi/parser.c

diff --git a/reactos/dll/setupapi/queue.c b/reactos/dll/win32/setupapi/queue.c
similarity index 100%
rename from reactos/dll/setupapi/queue.c
rename to reactos/dll/win32/setupapi/queue.c

diff --git a/reactos/dll/setupapi/resource.h b/reactos/dll/win32/setupapi/resource.h
similarity index 100%
rename from reactos/dll/setupapi/resource.h
rename to reactos/dll/win32/setupapi/resource.h

diff --git a/reactos/dll/setupapi/rpc.c b/reactos/dll/win32/setupapi/rpc.c
similarity index 100%
rename from reactos/dll/setupapi/rpc.c
rename to reactos/dll/win32/setupapi/rpc.c

diff --git a/reactos/dll/setupapi/rpc_private.h b/reactos/dll/win32/setupapi/rpc_private.h
similarity index 100%
rename from reactos/dll/setupapi/rpc_private.h
rename to reactos/dll/win32/setupapi/rpc_private.h

diff --git a/reactos/dll/setupapi/setupapi.rc b/reactos/dll/win32/setupapi/setupapi.rc
similarity index 100%
rename from reactos/dll/setupapi/setupapi.rc
rename to reactos/dll/win32/setupapi/setupapi.rc

diff --git a/reactos/dll/setupapi/setupapi.spec b/reactos/dll/win32/setupapi/setupapi.spec
similarity index 100%
rename from reactos/dll/setupapi/setupapi.spec
rename to reactos/dll/win32/setupapi/setupapi.spec

diff --git a/reactos/dll/setupapi/setupapi.xml b/reactos/dll/win32/setupapi/setupapi.xml
similarity index 100%
rename from reactos/dll/setupapi/setupapi.xml
rename to reactos/dll/win32/setupapi/setupapi.xml

diff --git a/reactos/dll/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h
similarity index 100%
rename from reactos/dll/setupapi/setupapi_private.h
rename to reactos/dll/win32/setupapi/setupapi_private.h

diff --git a/reactos/dll/setupapi/setupcab.c b/reactos/dll/win32/setupapi/setupcab.c
similarity index 100%
rename from reactos/dll/setupapi/setupcab.c
rename to reactos/dll/win32/setupapi/setupcab.c

diff --git a/reactos/dll/setupapi/setupx.spec b/reactos/dll/win32/setupapi/setupx.spec
similarity index 100%
rename from reactos/dll/setupapi/setupx.spec
rename to reactos/dll/win32/setupapi/setupx.spec

diff --git a/reactos/dll/setupapi/setupx16.h b/reactos/dll/win32/setupapi/setupx16.h
similarity index 100%
rename from reactos/dll/setupapi/setupx16.h
rename to reactos/dll/win32/setupapi/setupx16.h

diff --git a/reactos/dll/setupapi/setupx_main.c b/reactos/dll/win32/setupapi/setupx_main.c
similarity index 100%
rename from reactos/dll/setupapi/setupx_main.c
rename to reactos/dll/win32/setupapi/setupx_main.c

diff --git a/reactos/dll/setupapi/stringtable.c b/reactos/dll/win32/setupapi/stringtable.c
similarity index 100%
rename from reactos/dll/setupapi/stringtable.c
rename to reactos/dll/win32/setupapi/stringtable.c

diff --git a/reactos/dll/setupapi/stubs.c b/reactos/dll/win32/setupapi/stubs.c
similarity index 100%
rename from reactos/dll/setupapi/stubs.c
rename to reactos/dll/win32/setupapi/stubs.c

diff --git a/reactos/dll/setupapi/virtcopy.c b/reactos/dll/win32/setupapi/virtcopy.c
similarity index 100%
rename from reactos/dll/setupapi/virtcopy.c
rename to reactos/dll/win32/setupapi/virtcopy.c

diff --git a/reactos/dll/shell32/Makefile.in b/reactos/dll/win32/shell32/Makefile.in
similarity index 100%
rename from reactos/dll/shell32/Makefile.in
rename to reactos/dll/win32/shell32/Makefile.in

diff --git a/reactos/dll/shell32/authors.c b/reactos/dll/win32/shell32/authors.c
similarity index 100%
rename from reactos/dll/shell32/authors.c
rename to reactos/dll/win32/shell32/authors.c

diff --git a/reactos/dll/shell32/autocomplete.c b/reactos/dll/win32/shell32/autocomplete.c
similarity index 100%
rename from reactos/dll/shell32/autocomplete.c
rename to reactos/dll/win32/shell32/autocomplete.c

diff --git a/reactos/dll/shell32/brsfolder.c b/reactos/dll/win32/shell32/brsfolder.c
similarity index 100%
rename from reactos/dll/shell32/brsfolder.c
rename to reactos/dll/win32/shell32/brsfolder.c

diff --git a/reactos/dll/shell32/changenotify.c b/reactos/dll/win32/shell32/changenotify.c
similarity index 100%
rename from reactos/dll/shell32/changenotify.c
rename to reactos/dll/win32/shell32/changenotify.c

diff --git a/reactos/dll/shell32/classes.c b/reactos/dll/win32/shell32/classes.c
similarity index 100%
rename from reactos/dll/shell32/classes.c
rename to reactos/dll/win32/shell32/classes.c

diff --git a/reactos/dll/shell32/clipboard.c b/reactos/dll/win32/shell32/clipboard.c
similarity index 100%
rename from reactos/dll/shell32/clipboard.c
rename to reactos/dll/win32/shell32/clipboard.c

diff --git a/reactos/dll/shell32/control.c b/reactos/dll/win32/shell32/control.c
similarity index 100%
rename from reactos/dll/shell32/control.c
rename to reactos/dll/win32/shell32/control.c

diff --git a/reactos/dll/shell32/cpanel.h b/reactos/dll/win32/shell32/cpanel.h
similarity index 100%
rename from reactos/dll/shell32/cpanel.h
rename to reactos/dll/win32/shell32/cpanel.h

diff --git a/reactos/dll/shell32/cpanelfolder.c b/reactos/dll/win32/shell32/cpanelfolder.c
similarity index 100%
rename from reactos/dll/shell32/cpanelfolder.c
rename to reactos/dll/win32/shell32/cpanelfolder.c

diff --git a/reactos/dll/shell32/dataobject.c b/reactos/dll/win32/shell32/dataobject.c
similarity index 100%
rename from reactos/dll/shell32/dataobject.c
rename to reactos/dll/win32/shell32/dataobject.c

diff --git a/reactos/dll/shell32/dde.c b/reactos/dll/win32/shell32/dde.c
similarity index 100%
rename from reactos/dll/shell32/dde.c
rename to reactos/dll/win32/shell32/dde.c

diff --git a/reactos/dll/shell32/debughlp.c b/reactos/dll/win32/shell32/debughlp.c
similarity index 100%
rename from reactos/dll/shell32/debughlp.c
rename to reactos/dll/win32/shell32/debughlp.c

diff --git a/reactos/dll/shell32/debughlp.h b/reactos/dll/win32/shell32/debughlp.h
similarity index 100%
rename from reactos/dll/shell32/debughlp.h
rename to reactos/dll/win32/shell32/debughlp.h

diff --git a/reactos/dll/shell32/dialogs.c b/reactos/dll/win32/shell32/dialogs.c
similarity index 100%
rename from reactos/dll/shell32/dialogs.c
rename to reactos/dll/win32/shell32/dialogs.c

diff --git a/reactos/dll/shell32/dragdrophelper.c b/reactos/dll/win32/shell32/dragdrophelper.c
similarity index 100%
rename from reactos/dll/shell32/dragdrophelper.c
rename to reactos/dll/win32/shell32/dragdrophelper.c

diff --git a/reactos/dll/shell32/enumidlist.c b/reactos/dll/win32/shell32/enumidlist.c
similarity index 100%
rename from reactos/dll/shell32/enumidlist.c
rename to reactos/dll/win32/shell32/enumidlist.c

diff --git a/reactos/dll/shell32/enumidlist.h b/reactos/dll/win32/shell32/enumidlist.h
similarity index 100%
rename from reactos/dll/shell32/enumidlist.h
rename to reactos/dll/win32/shell32/enumidlist.h

diff --git a/reactos/dll/shell32/folders.c b/reactos/dll/win32/shell32/folders.c
similarity index 100%
rename from reactos/dll/shell32/folders.c
rename to reactos/dll/win32/shell32/folders.c

diff --git a/reactos/dll/shell32/iconcache.c b/reactos/dll/win32/shell32/iconcache.c
similarity index 100%
rename from reactos/dll/shell32/iconcache.c
rename to reactos/dll/win32/shell32/iconcache.c

diff --git a/reactos/dll/shell32/pidl.c b/reactos/dll/win32/shell32/pidl.c
similarity index 100%
rename from reactos/dll/shell32/pidl.c
rename to reactos/dll/win32/shell32/pidl.c

diff --git a/reactos/dll/shell32/pidl.h b/reactos/dll/win32/shell32/pidl.h
similarity index 100%
rename from reactos/dll/shell32/pidl.h
rename to reactos/dll/win32/shell32/pidl.h

diff --git a/reactos/dll/shell32/regsvr.c b/reactos/dll/win32/shell32/regsvr.c
similarity index 100%
rename from reactos/dll/shell32/regsvr.c
rename to reactos/dll/win32/shell32/regsvr.c

diff --git a/reactos/dll/shell32/ros-systray.c b/reactos/dll/win32/shell32/ros-systray.c
similarity index 100%
rename from reactos/dll/shell32/ros-systray.c
rename to reactos/dll/win32/shell32/ros-systray.c

diff --git a/reactos/dll/shell32/shell.c b/reactos/dll/win32/shell32/shell.c
similarity index 100%
rename from reactos/dll/shell32/shell.c
rename to reactos/dll/win32/shell32/shell.c

diff --git a/reactos/dll/shell32/shell.spec b/reactos/dll/win32/shell32/shell.spec
similarity index 100%
rename from reactos/dll/shell32/shell.spec
rename to reactos/dll/win32/shell32/shell.spec

diff --git a/reactos/dll/shell32/shell32.spec b/reactos/dll/win32/shell32/shell32.spec
similarity index 100%
rename from reactos/dll/shell32/shell32.spec
rename to reactos/dll/win32/shell32/shell32.spec

diff --git a/reactos/dll/shell32/shell32.xml b/reactos/dll/win32/shell32/shell32.xml
similarity index 100%
rename from reactos/dll/shell32/shell32.xml
rename to reactos/dll/win32/shell32/shell32.xml

diff --git a/reactos/dll/shell32/shell32_Bg.rc b/reactos/dll/win32/shell32/shell32_Bg.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Bg.rc
rename to reactos/dll/win32/shell32/shell32_Bg.rc

diff --git a/reactos/dll/shell32/shell32_Ca.rc b/reactos/dll/win32/shell32/shell32_Ca.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Ca.rc
rename to reactos/dll/win32/shell32/shell32_Ca.rc

diff --git a/reactos/dll/shell32/shell32_Cn.rc b/reactos/dll/win32/shell32/shell32_Cn.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Cn.rc
rename to reactos/dll/win32/shell32/shell32_Cn.rc

diff --git a/reactos/dll/shell32/shell32_Cs.rc b/reactos/dll/win32/shell32/shell32_Cs.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Cs.rc
rename to reactos/dll/win32/shell32/shell32_Cs.rc

diff --git a/reactos/dll/shell32/shell32_Da.rc b/reactos/dll/win32/shell32/shell32_Da.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Da.rc
rename to reactos/dll/win32/shell32/shell32_Da.rc

diff --git a/reactos/dll/shell32/shell32_De.rc b/reactos/dll/win32/shell32/shell32_De.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_De.rc
rename to reactos/dll/win32/shell32/shell32_De.rc

diff --git a/reactos/dll/shell32/shell32_En.rc b/reactos/dll/win32/shell32/shell32_En.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_En.rc
rename to reactos/dll/win32/shell32/shell32_En.rc

diff --git a/reactos/dll/shell32/shell32_Eo.rc b/reactos/dll/win32/shell32/shell32_Eo.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Eo.rc
rename to reactos/dll/win32/shell32/shell32_Eo.rc

diff --git a/reactos/dll/shell32/shell32_Es.rc b/reactos/dll/win32/shell32/shell32_Es.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Es.rc
rename to reactos/dll/win32/shell32/shell32_Es.rc

diff --git a/reactos/dll/shell32/shell32_Fi.rc b/reactos/dll/win32/shell32/shell32_Fi.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Fi.rc
rename to reactos/dll/win32/shell32/shell32_Fi.rc

diff --git a/reactos/dll/shell32/shell32_Fr.rc b/reactos/dll/win32/shell32/shell32_Fr.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Fr.rc
rename to reactos/dll/win32/shell32/shell32_Fr.rc

diff --git a/reactos/dll/shell32/shell32_Hu.rc b/reactos/dll/win32/shell32/shell32_Hu.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Hu.rc
rename to reactos/dll/win32/shell32/shell32_Hu.rc

diff --git a/reactos/dll/shell32/shell32_It.rc b/reactos/dll/win32/shell32/shell32_It.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_It.rc
rename to reactos/dll/win32/shell32/shell32_It.rc

diff --git a/reactos/dll/shell32/shell32_Ja.rc b/reactos/dll/win32/shell32/shell32_Ja.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Ja.rc
rename to reactos/dll/win32/shell32/shell32_Ja.rc

diff --git a/reactos/dll/shell32/shell32_Ko.rc b/reactos/dll/win32/shell32/shell32_Ko.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Ko.rc
rename to reactos/dll/win32/shell32/shell32_Ko.rc

diff --git a/reactos/dll/shell32/shell32_Nl.rc b/reactos/dll/win32/shell32/shell32_Nl.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Nl.rc
rename to reactos/dll/win32/shell32/shell32_Nl.rc

diff --git a/reactos/dll/shell32/shell32_No.rc b/reactos/dll/win32/shell32/shell32_No.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_No.rc
rename to reactos/dll/win32/shell32/shell32_No.rc

diff --git a/reactos/dll/shell32/shell32_Pl.rc b/reactos/dll/win32/shell32/shell32_Pl.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Pl.rc
rename to reactos/dll/win32/shell32/shell32_Pl.rc

diff --git a/reactos/dll/shell32/shell32_Pt.rc b/reactos/dll/win32/shell32/shell32_Pt.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Pt.rc
rename to reactos/dll/win32/shell32/shell32_Pt.rc

diff --git a/reactos/dll/shell32/shell32_Ru.rc b/reactos/dll/win32/shell32/shell32_Ru.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Ru.rc
rename to reactos/dll/win32/shell32/shell32_Ru.rc

diff --git a/reactos/dll/shell32/shell32_Si.rc b/reactos/dll/win32/shell32/shell32_Si.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Si.rc
rename to reactos/dll/win32/shell32/shell32_Si.rc

diff --git a/reactos/dll/shell32/shell32_Sk.rc b/reactos/dll/win32/shell32/shell32_Sk.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Sk.rc
rename to reactos/dll/win32/shell32/shell32_Sk.rc

diff --git a/reactos/dll/shell32/shell32_Sv.rc b/reactos/dll/win32/shell32/shell32_Sv.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Sv.rc
rename to reactos/dll/win32/shell32/shell32_Sv.rc

diff --git a/reactos/dll/shell32/shell32_Uk.rc b/reactos/dll/win32/shell32/shell32_Uk.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Uk.rc
rename to reactos/dll/win32/shell32/shell32_Uk.rc

diff --git a/reactos/dll/shell32/shell32_Wa.rc b/reactos/dll/win32/shell32/shell32_Wa.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Wa.rc
rename to reactos/dll/win32/shell32/shell32_Wa.rc

diff --git a/reactos/dll/shell32/shell32_Zh.rc b/reactos/dll/win32/shell32/shell32_Zh.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_Zh.rc
rename to reactos/dll/win32/shell32/shell32_Zh.rc

diff --git a/reactos/dll/shell32/shell32_main.c b/reactos/dll/win32/shell32/shell32_main.c
similarity index 100%
rename from reactos/dll/shell32/shell32_main.c
rename to reactos/dll/win32/shell32/shell32_main.c

diff --git a/reactos/dll/shell32/shell32_main.h b/reactos/dll/win32/shell32/shell32_main.h
similarity index 100%
rename from reactos/dll/shell32/shell32_main.h
rename to reactos/dll/win32/shell32/shell32_main.h

diff --git a/reactos/dll/shell32/shell32_xx.rc b/reactos/dll/win32/shell32/shell32_xx.rc
similarity index 100%
rename from reactos/dll/shell32/shell32_xx.rc
rename to reactos/dll/win32/shell32/shell32_xx.rc

diff --git a/reactos/dll/shell32/shellfolder.h b/reactos/dll/win32/shell32/shellfolder.h
similarity index 100%
rename from reactos/dll/shell32/shellfolder.h
rename to reactos/dll/win32/shell32/shellfolder.h

diff --git a/reactos/dll/shell32/shelllink.c b/reactos/dll/win32/shell32/shelllink.c
similarity index 100%
rename from reactos/dll/shell32/shelllink.c
rename to reactos/dll/win32/shell32/shelllink.c

diff --git a/reactos/dll/shell32/shellole.c b/reactos/dll/win32/shell32/shellole.c
similarity index 100%
rename from reactos/dll/shell32/shellole.c
rename to reactos/dll/win32/shell32/shellole.c

diff --git a/reactos/dll/shell32/shellord.c b/reactos/dll/win32/shell32/shellord.c
similarity index 100%
rename from reactos/dll/shell32/shellord.c
rename to reactos/dll/win32/shell32/shellord.c

diff --git a/reactos/dll/shell32/shellpath.c b/reactos/dll/win32/shell32/shellpath.c
similarity index 100%
rename from reactos/dll/shell32/shellpath.c
rename to reactos/dll/win32/shell32/shellpath.c

diff --git a/reactos/dll/shell32/shellreg.c b/reactos/dll/win32/shell32/shellreg.c
similarity index 100%
rename from reactos/dll/shell32/shellreg.c
rename to reactos/dll/win32/shell32/shellreg.c

diff --git a/reactos/dll/shell32/shellstring.c b/reactos/dll/win32/shell32/shellstring.c
similarity index 100%
rename from reactos/dll/shell32/shellstring.c
rename to reactos/dll/win32/shell32/shellstring.c

diff --git a/reactos/dll/shell32/shfldr.h b/reactos/dll/win32/shell32/shfldr.h
similarity index 100%
rename from reactos/dll/shell32/shfldr.h
rename to reactos/dll/win32/shell32/shfldr.h

diff --git a/reactos/dll/shell32/shfldr_desktop.c b/reactos/dll/win32/shell32/shfldr_desktop.c
similarity index 100%
rename from reactos/dll/shell32/shfldr_desktop.c
rename to reactos/dll/win32/shell32/shfldr_desktop.c

diff --git a/reactos/dll/shell32/shfldr_fs.c b/reactos/dll/win32/shell32/shfldr_fs.c
similarity index 100%
rename from reactos/dll/shell32/shfldr_fs.c
rename to reactos/dll/win32/shell32/shfldr_fs.c

diff --git a/reactos/dll/shell32/shfldr_mycomp.c b/reactos/dll/win32/shell32/shfldr_mycomp.c
similarity index 100%
rename from reactos/dll/shell32/shfldr_mycomp.c
rename to reactos/dll/win32/shell32/shfldr_mycomp.c

diff --git a/reactos/dll/shell32/shfldr_unixfs.c b/reactos/dll/win32/shell32/shfldr_unixfs.c
similarity index 100%
rename from reactos/dll/shell32/shfldr_unixfs.c
rename to reactos/dll/win32/shell32/shfldr_unixfs.c

diff --git a/reactos/dll/shell32/shlexec.c b/reactos/dll/win32/shell32/shlexec.c
similarity index 100%
rename from reactos/dll/shell32/shlexec.c
rename to reactos/dll/win32/shell32/shlexec.c

diff --git a/reactos/dll/shell32/shlfileop.c b/reactos/dll/win32/shell32/shlfileop.c
similarity index 100%
rename from reactos/dll/shell32/shlfileop.c
rename to reactos/dll/win32/shell32/shlfileop.c

diff --git a/reactos/dll/shell32/shlfolder.c b/reactos/dll/win32/shell32/shlfolder.c
similarity index 100%
rename from reactos/dll/shell32/shlfolder.c
rename to reactos/dll/win32/shell32/shlfolder.c

diff --git a/reactos/dll/shell32/shlfsbind.c b/reactos/dll/win32/shell32/shlfsbind.c
similarity index 100%
rename from reactos/dll/shell32/shlfsbind.c
rename to reactos/dll/win32/shell32/shlfsbind.c

diff --git a/reactos/dll/shell32/shlmenu.c b/reactos/dll/win32/shell32/shlmenu.c
similarity index 100%
rename from reactos/dll/shell32/shlmenu.c
rename to reactos/dll/win32/shell32/shlmenu.c

diff --git a/reactos/dll/shell32/shlview.c b/reactos/dll/win32/shell32/shlview.c
similarity index 100%
rename from reactos/dll/shell32/shlview.c
rename to reactos/dll/win32/shell32/shlview.c

diff --git a/reactos/dll/shell32/shpolicy.c b/reactos/dll/win32/shell32/shpolicy.c
similarity index 100%
rename from reactos/dll/shell32/shpolicy.c
rename to reactos/dll/win32/shell32/shpolicy.c

diff --git a/reactos/dll/shell32/shres.rc b/reactos/dll/win32/shell32/shres.rc
similarity index 100%
rename from reactos/dll/shell32/shres.rc
rename to reactos/dll/win32/shell32/shres.rc

diff --git a/reactos/dll/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
similarity index 100%
rename from reactos/dll/shell32/shresdef.h
rename to reactos/dll/win32/shell32/shresdef.h

diff --git a/reactos/dll/shell32/shv_bg_cmenu.c b/reactos/dll/win32/shell32/shv_bg_cmenu.c
similarity index 100%
rename from reactos/dll/shell32/shv_bg_cmenu.c
rename to reactos/dll/win32/shell32/shv_bg_cmenu.c

diff --git a/reactos/dll/shell32/shv_item_cmenu.c b/reactos/dll/win32/shell32/shv_item_cmenu.c
similarity index 100%
rename from reactos/dll/shell32/shv_item_cmenu.c
rename to reactos/dll/win32/shell32/shv_item_cmenu.c

diff --git a/reactos/dll/shell32/systray.c b/reactos/dll/win32/shell32/systray.c
similarity index 100%
rename from reactos/dll/shell32/systray.c
rename to reactos/dll/win32/shell32/systray.c

diff --git a/reactos/dll/shell32/undocshell.h b/reactos/dll/win32/shell32/undocshell.h
similarity index 100%
rename from reactos/dll/shell32/undocshell.h
rename to reactos/dll/win32/shell32/undocshell.h

diff --git a/reactos/dll/shell32/version.h b/reactos/dll/win32/shell32/version.h
similarity index 100%
rename from reactos/dll/shell32/version.h
rename to reactos/dll/win32/shell32/version.h

diff --git a/reactos/dll/shell32/version.rc b/reactos/dll/win32/shell32/version.rc
similarity index 100%
rename from reactos/dll/shell32/version.rc
rename to reactos/dll/win32/shell32/version.rc

diff --git a/reactos/dll/shell32/version16.rc b/reactos/dll/win32/shell32/version16.rc
similarity index 100%
rename from reactos/dll/shell32/version16.rc
rename to reactos/dll/win32/shell32/version16.rc

diff --git a/reactos/dll/shlwapi/Makefile.in b/reactos/dll/win32/shlwapi/Makefile.in
similarity index 100%
rename from reactos/dll/shlwapi/Makefile.in
rename to reactos/dll/win32/shlwapi/Makefile.in

diff --git a/reactos/dll/shlwapi/assoc.c b/reactos/dll/win32/shlwapi/assoc.c
similarity index 100%
rename from reactos/dll/shlwapi/assoc.c
rename to reactos/dll/win32/shlwapi/assoc.c

diff --git a/reactos/dll/shlwapi/clist.c b/reactos/dll/win32/shlwapi/clist.c
similarity index 100%
rename from reactos/dll/shlwapi/clist.c
rename to reactos/dll/win32/shlwapi/clist.c

diff --git a/reactos/dll/shlwapi/istream.c b/reactos/dll/win32/shlwapi/istream.c
similarity index 100%
rename from reactos/dll/shlwapi/istream.c
rename to reactos/dll/win32/shlwapi/istream.c

diff --git a/reactos/dll/shlwapi/msgbox.c b/reactos/dll/win32/shlwapi/msgbox.c
similarity index 100%
rename from reactos/dll/shlwapi/msgbox.c
rename to reactos/dll/win32/shlwapi/msgbox.c

diff --git a/reactos/dll/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c
similarity index 100%
rename from reactos/dll/shlwapi/ordinal.c
rename to reactos/dll/win32/shlwapi/ordinal.c

diff --git a/reactos/dll/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c
similarity index 100%
rename from reactos/dll/shlwapi/path.c
rename to reactos/dll/win32/shlwapi/path.c

diff --git a/reactos/dll/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c
similarity index 100%
rename from reactos/dll/shlwapi/reg.c
rename to reactos/dll/win32/shlwapi/reg.c

diff --git a/reactos/dll/shlwapi/regstream.c b/reactos/dll/win32/shlwapi/regstream.c
similarity index 100%
rename from reactos/dll/shlwapi/regstream.c
rename to reactos/dll/win32/shlwapi/regstream.c

diff --git a/reactos/dll/shlwapi/resource.h b/reactos/dll/win32/shlwapi/resource.h
similarity index 100%
rename from reactos/dll/shlwapi/resource.h
rename to reactos/dll/win32/shlwapi/resource.h

diff --git a/reactos/dll/shlwapi/shlwapi.rc b/reactos/dll/win32/shlwapi/shlwapi.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi.rc
rename to reactos/dll/win32/shlwapi/shlwapi.rc

diff --git a/reactos/dll/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi.spec
rename to reactos/dll/win32/shlwapi/shlwapi.spec

diff --git a/reactos/dll/shlwapi/shlwapi.xml b/reactos/dll/win32/shlwapi/shlwapi.xml
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi.xml
rename to reactos/dll/win32/shlwapi/shlwapi.xml

diff --git a/reactos/dll/shlwapi/shlwapi_De.rc b/reactos/dll/win32/shlwapi/shlwapi_De.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_De.rc
rename to reactos/dll/win32/shlwapi/shlwapi_De.rc

diff --git a/reactos/dll/shlwapi/shlwapi_En.rc b/reactos/dll/win32/shlwapi/shlwapi_En.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_En.rc
rename to reactos/dll/win32/shlwapi/shlwapi_En.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Es.rc b/reactos/dll/win32/shlwapi/shlwapi_Es.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Es.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Es.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Fi.rc b/reactos/dll/win32/shlwapi/shlwapi_Fi.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Fi.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Fi.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Hu.rc b/reactos/dll/win32/shlwapi/shlwapi_Hu.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Hu.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Hu.rc

diff --git a/reactos/dll/shlwapi/shlwapi_It.rc b/reactos/dll/win32/shlwapi/shlwapi_It.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_It.rc
rename to reactos/dll/win32/shlwapi/shlwapi_It.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Ja.rc b/reactos/dll/win32/shlwapi/shlwapi_Ja.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Ja.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Ja.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Ko.rc b/reactos/dll/win32/shlwapi/shlwapi_Ko.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Ko.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Ko.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Nl.rc b/reactos/dll/win32/shlwapi/shlwapi_Nl.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Nl.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Nl.rc

diff --git a/reactos/dll/shlwapi/shlwapi_No.rc b/reactos/dll/win32/shlwapi/shlwapi_No.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_No.rc
rename to reactos/dll/win32/shlwapi/shlwapi_No.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Pl.rc b/reactos/dll/win32/shlwapi/shlwapi_Pl.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Pl.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Pl.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Pt.rc b/reactos/dll/win32/shlwapi/shlwapi_Pt.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Pt.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Pt.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Ru.rc b/reactos/dll/win32/shlwapi/shlwapi_Ru.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Ru.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Ru.rc

diff --git a/reactos/dll/shlwapi/shlwapi_Sv.rc b/reactos/dll/win32/shlwapi/shlwapi_Sv.rc
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_Sv.rc
rename to reactos/dll/win32/shlwapi/shlwapi_Sv.rc

diff --git a/reactos/dll/shlwapi/shlwapi_main.c b/reactos/dll/win32/shlwapi/shlwapi_main.c
similarity index 100%
rename from reactos/dll/shlwapi/shlwapi_main.c
rename to reactos/dll/win32/shlwapi/shlwapi_main.c

diff --git a/reactos/dll/shlwapi/stopwatch.c b/reactos/dll/win32/shlwapi/stopwatch.c
similarity index 100%
rename from reactos/dll/shlwapi/stopwatch.c
rename to reactos/dll/win32/shlwapi/stopwatch.c

diff --git a/reactos/dll/shlwapi/string.c b/reactos/dll/win32/shlwapi/string.c
similarity index 100%
rename from reactos/dll/shlwapi/string.c
rename to reactos/dll/win32/shlwapi/string.c

diff --git a/reactos/dll/shlwapi/thread.c b/reactos/dll/win32/shlwapi/thread.c
similarity index 100%
rename from reactos/dll/shlwapi/thread.c
rename to reactos/dll/win32/shlwapi/thread.c

diff --git a/reactos/dll/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c
similarity index 100%
rename from reactos/dll/shlwapi/url.c
rename to reactos/dll/win32/shlwapi/url.c

diff --git a/reactos/dll/shlwapi/version.rc b/reactos/dll/win32/shlwapi/version.rc
similarity index 100%
rename from reactos/dll/shlwapi/version.rc
rename to reactos/dll/win32/shlwapi/version.rc

diff --git a/reactos/dll/shlwapi/wsprintf.c b/reactos/dll/win32/shlwapi/wsprintf.c
similarity index 100%
rename from reactos/dll/shlwapi/wsprintf.c
rename to reactos/dll/win32/shlwapi/wsprintf.c

diff --git a/reactos/dll/snmpapi/debug.h b/reactos/dll/win32/snmpapi/debug.h
similarity index 100%
rename from reactos/dll/snmpapi/debug.h
rename to reactos/dll/win32/snmpapi/debug.h

diff --git a/reactos/dll/snmpapi/snmpapi.c b/reactos/dll/win32/snmpapi/snmpapi.c
similarity index 100%
rename from reactos/dll/snmpapi/snmpapi.c
rename to reactos/dll/win32/snmpapi/snmpapi.c

diff --git a/reactos/dll/snmpapi/snmpapi.def b/reactos/dll/win32/snmpapi/snmpapi.def
similarity index 100%
rename from reactos/dll/snmpapi/snmpapi.def
rename to reactos/dll/win32/snmpapi/snmpapi.def

diff --git a/reactos/dll/snmpapi/snmpapi.rc b/reactos/dll/win32/snmpapi/snmpapi.rc
similarity index 100%
rename from reactos/dll/snmpapi/snmpapi.rc
rename to reactos/dll/win32/snmpapi/snmpapi.rc

diff --git a/reactos/dll/snmpapi/snmpapi.xml b/reactos/dll/win32/snmpapi/snmpapi.xml
similarity index 100%
rename from reactos/dll/snmpapi/snmpapi.xml
rename to reactos/dll/win32/snmpapi/snmpapi.xml

diff --git a/reactos/dll/syssetup/COPYING b/reactos/dll/win32/syssetup/COPYING
similarity index 100%
rename from reactos/dll/syssetup/COPYING
rename to reactos/dll/win32/syssetup/COPYING

diff --git a/reactos/dll/syssetup/classinst.c b/reactos/dll/win32/syssetup/classinst.c
similarity index 100%
rename from reactos/dll/syssetup/classinst.c
rename to reactos/dll/win32/syssetup/classinst.c

diff --git a/reactos/dll/syssetup/dllmain.c b/reactos/dll/win32/syssetup/dllmain.c
similarity index 100%
rename from reactos/dll/syssetup/dllmain.c
rename to reactos/dll/win32/syssetup/dllmain.c

diff --git a/reactos/dll/syssetup/globals.h b/reactos/dll/win32/syssetup/globals.h
similarity index 100%
rename from reactos/dll/syssetup/globals.h
rename to reactos/dll/win32/syssetup/globals.h

diff --git a/reactos/dll/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
similarity index 100%
rename from reactos/dll/syssetup/install.c
rename to reactos/dll/win32/syssetup/install.c

diff --git a/reactos/dll/syssetup/logfile.c b/reactos/dll/win32/syssetup/logfile.c
similarity index 100%
rename from reactos/dll/syssetup/logfile.c
rename to reactos/dll/win32/syssetup/logfile.c

diff --git a/reactos/dll/syssetup/resource.h b/reactos/dll/win32/syssetup/resource.h
similarity index 100%
rename from reactos/dll/syssetup/resource.h
rename to reactos/dll/win32/syssetup/resource.h

diff --git a/reactos/dll/syssetup/resources/header.bmp b/reactos/dll/win32/syssetup/resources/header.bmp
similarity index 100%
rename from reactos/dll/syssetup/resources/header.bmp
rename to reactos/dll/win32/syssetup/resources/header.bmp

diff --git a/reactos/dll/syssetup/resources/watermark.bmp b/reactos/dll/win32/syssetup/resources/watermark.bmp
similarity index 100%
rename from reactos/dll/syssetup/resources/watermark.bmp
rename to reactos/dll/win32/syssetup/resources/watermark.bmp

diff --git a/reactos/dll/syssetup/syssetup.def b/reactos/dll/win32/syssetup/syssetup.def
similarity index 100%
rename from reactos/dll/syssetup/syssetup.def
rename to reactos/dll/win32/syssetup/syssetup.def

diff --git a/reactos/dll/syssetup/syssetup.rc b/reactos/dll/win32/syssetup/syssetup.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup.rc
rename to reactos/dll/win32/syssetup/syssetup.rc

diff --git a/reactos/dll/syssetup/syssetup.xml b/reactos/dll/win32/syssetup/syssetup.xml
similarity index 100%
rename from reactos/dll/syssetup/syssetup.xml
rename to reactos/dll/win32/syssetup/syssetup.xml

diff --git a/reactos/dll/syssetup/syssetup_Cz.rc b/reactos/dll/win32/syssetup/syssetup_Cz.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Cz.rc
rename to reactos/dll/win32/syssetup/syssetup_Cz.rc

diff --git a/reactos/dll/syssetup/syssetup_De.rc b/reactos/dll/win32/syssetup/syssetup_De.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_De.rc
rename to reactos/dll/win32/syssetup/syssetup_De.rc

diff --git a/reactos/dll/syssetup/syssetup_En.rc b/reactos/dll/win32/syssetup/syssetup_En.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_En.rc
rename to reactos/dll/win32/syssetup/syssetup_En.rc

diff --git a/reactos/dll/syssetup/syssetup_Es.rc b/reactos/dll/win32/syssetup/syssetup_Es.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Es.rc
rename to reactos/dll/win32/syssetup/syssetup_Es.rc

diff --git a/reactos/dll/syssetup/syssetup_Fr.rc b/reactos/dll/win32/syssetup/syssetup_Fr.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Fr.rc
rename to reactos/dll/win32/syssetup/syssetup_Fr.rc

diff --git a/reactos/dll/syssetup/syssetup_Hu.rc b/reactos/dll/win32/syssetup/syssetup_Hu.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Hu.rc
rename to reactos/dll/win32/syssetup/syssetup_Hu.rc

diff --git a/reactos/dll/syssetup/syssetup_Ja.rc b/reactos/dll/win32/syssetup/syssetup_Ja.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Ja.rc
rename to reactos/dll/win32/syssetup/syssetup_Ja.rc

diff --git a/reactos/dll/syssetup/syssetup_Nl.rc b/reactos/dll/win32/syssetup/syssetup_Nl.rc
similarity index 100%
rename from reactos/dll/syssetup/syssetup_Nl.rc
rename to reactos/dll/win32/syssetup/syssetup_Nl.rc

diff --git a/reactos/dll/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
similarity index 100%
rename from reactos/dll/syssetup/wizard.c
rename to reactos/dll/win32/syssetup/wizard.c

diff --git a/reactos/dll/twain/Makefile.in b/reactos/dll/win32/twain/Makefile.in
similarity index 100%
rename from reactos/dll/twain/Makefile.in
rename to reactos/dll/win32/twain/Makefile.in

diff --git a/reactos/dll/twain/README b/reactos/dll/win32/twain/README
similarity index 100%
rename from reactos/dll/twain/README
rename to reactos/dll/win32/twain/README

diff --git a/reactos/dll/twain/TWAIN b/reactos/dll/win32/twain/TWAIN
similarity index 100%
rename from reactos/dll/twain/TWAIN
rename to reactos/dll/win32/twain/TWAIN

diff --git a/reactos/dll/twain/capability.c b/reactos/dll/win32/twain/capability.c
similarity index 100%
rename from reactos/dll/twain/capability.c
rename to reactos/dll/win32/twain/capability.c

diff --git a/reactos/dll/twain/ds_audio.c b/reactos/dll/win32/twain/ds_audio.c
similarity index 100%
rename from reactos/dll/twain/ds_audio.c
rename to reactos/dll/win32/twain/ds_audio.c

diff --git a/reactos/dll/twain/ds_ctrl.c b/reactos/dll/win32/twain/ds_ctrl.c
similarity index 100%
rename from reactos/dll/twain/ds_ctrl.c
rename to reactos/dll/win32/twain/ds_ctrl.c

diff --git a/reactos/dll/twain/ds_image.c b/reactos/dll/win32/twain/ds_image.c
similarity index 100%
rename from reactos/dll/twain/ds_image.c
rename to reactos/dll/win32/twain/ds_image.c

diff --git a/reactos/dll/twain/dsm_ctrl.c b/reactos/dll/win32/twain/dsm_ctrl.c
similarity index 100%
rename from reactos/dll/twain/dsm_ctrl.c
rename to reactos/dll/win32/twain/dsm_ctrl.c

diff --git a/reactos/dll/twain/twain.h b/reactos/dll/win32/twain/twain.h
similarity index 100%
rename from reactos/dll/twain/twain.h
rename to reactos/dll/win32/twain/twain.h

diff --git a/reactos/dll/twain/twain32_main.c b/reactos/dll/win32/twain/twain32_main.c
similarity index 100%
rename from reactos/dll/twain/twain32_main.c
rename to reactos/dll/win32/twain/twain32_main.c

diff --git a/reactos/dll/twain/twain_32.def b/reactos/dll/win32/twain/twain_32.def
similarity index 100%
rename from reactos/dll/twain/twain_32.def
rename to reactos/dll/win32/twain/twain_32.def

diff --git a/reactos/dll/twain/twain_32.rc b/reactos/dll/win32/twain/twain_32.rc
similarity index 100%
rename from reactos/dll/twain/twain_32.rc
rename to reactos/dll/win32/twain/twain_32.rc

diff --git a/reactos/dll/twain/twain_32.xml b/reactos/dll/win32/twain/twain_32.xml
similarity index 100%
rename from reactos/dll/twain/twain_32.xml
rename to reactos/dll/win32/twain/twain_32.xml

diff --git a/reactos/dll/twain/twain_i.h b/reactos/dll/win32/twain/twain_i.h
similarity index 100%
rename from reactos/dll/twain/twain_i.h
rename to reactos/dll/win32/twain/twain_i.h

diff --git a/reactos/dll/urlmon/binding.c b/reactos/dll/win32/urlmon/binding.c
similarity index 100%
rename from reactos/dll/urlmon/binding.c
rename to reactos/dll/win32/urlmon/binding.c

diff --git a/reactos/dll/urlmon/file.c b/reactos/dll/win32/urlmon/file.c
similarity index 100%
rename from reactos/dll/urlmon/file.c
rename to reactos/dll/win32/urlmon/file.c

diff --git a/reactos/dll/urlmon/format.c b/reactos/dll/win32/urlmon/format.c
similarity index 100%
rename from reactos/dll/urlmon/format.c
rename to reactos/dll/win32/urlmon/format.c

diff --git a/reactos/dll/urlmon/ftp.c b/reactos/dll/win32/urlmon/ftp.c
similarity index 100%
rename from reactos/dll/urlmon/ftp.c
rename to reactos/dll/win32/urlmon/ftp.c

diff --git a/reactos/dll/urlmon/http.c b/reactos/dll/win32/urlmon/http.c
similarity index 100%
rename from reactos/dll/urlmon/http.c
rename to reactos/dll/win32/urlmon/http.c

diff --git a/reactos/dll/urlmon/internet.c b/reactos/dll/win32/urlmon/internet.c
similarity index 100%
rename from reactos/dll/urlmon/internet.c
rename to reactos/dll/win32/urlmon/internet.c

diff --git a/reactos/dll/urlmon/regsvr.c b/reactos/dll/win32/urlmon/regsvr.c
similarity index 100%
rename from reactos/dll/urlmon/regsvr.c
rename to reactos/dll/win32/urlmon/regsvr.c

diff --git a/reactos/dll/urlmon/rsrc.rc b/reactos/dll/win32/urlmon/rsrc.rc
similarity index 100%
rename from reactos/dll/urlmon/rsrc.rc
rename to reactos/dll/win32/urlmon/rsrc.rc

diff --git a/reactos/dll/urlmon/sec_mgr.c b/reactos/dll/win32/urlmon/sec_mgr.c
similarity index 100%
rename from reactos/dll/urlmon/sec_mgr.c
rename to reactos/dll/win32/urlmon/sec_mgr.c

diff --git a/reactos/dll/urlmon/session.c b/reactos/dll/win32/urlmon/session.c
similarity index 100%
rename from reactos/dll/urlmon/session.c
rename to reactos/dll/win32/urlmon/session.c

diff --git a/reactos/dll/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c
similarity index 100%
rename from reactos/dll/urlmon/umon.c
rename to reactos/dll/win32/urlmon/umon.c

diff --git a/reactos/dll/urlmon/umstream.c b/reactos/dll/win32/urlmon/umstream.c
similarity index 100%
rename from reactos/dll/urlmon/umstream.c
rename to reactos/dll/win32/urlmon/umstream.c

diff --git a/reactos/dll/urlmon/urlmon.inf b/reactos/dll/win32/urlmon/urlmon.inf
similarity index 100%
rename from reactos/dll/urlmon/urlmon.inf
rename to reactos/dll/win32/urlmon/urlmon.inf

diff --git a/reactos/dll/urlmon/urlmon.spec b/reactos/dll/win32/urlmon/urlmon.spec
similarity index 100%
rename from reactos/dll/urlmon/urlmon.spec
rename to reactos/dll/win32/urlmon/urlmon.spec

diff --git a/reactos/dll/urlmon/urlmon.xml b/reactos/dll/win32/urlmon/urlmon.xml
similarity index 100%
rename from reactos/dll/urlmon/urlmon.xml
rename to reactos/dll/win32/urlmon/urlmon.xml

diff --git a/reactos/dll/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c
similarity index 100%
rename from reactos/dll/urlmon/urlmon_main.c
rename to reactos/dll/win32/urlmon/urlmon_main.c

diff --git a/reactos/dll/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h
similarity index 100%
rename from reactos/dll/urlmon/urlmon_main.h
rename to reactos/dll/win32/urlmon/urlmon_main.h

diff --git a/reactos/dll/urlmon/version.rc b/reactos/dll/win32/urlmon/version.rc
similarity index 100%
rename from reactos/dll/urlmon/version.rc
rename to reactos/dll/win32/urlmon/version.rc

diff --git a/reactos/dll/user32/Da.rc b/reactos/dll/win32/user32/Da.rc
similarity index 100%
rename from reactos/dll/user32/Da.rc
rename to reactos/dll/win32/user32/Da.rc

diff --git a/reactos/dll/user32/De.rc b/reactos/dll/win32/user32/De.rc
similarity index 100%
rename from reactos/dll/user32/De.rc
rename to reactos/dll/win32/user32/De.rc

diff --git a/reactos/dll/user32/En.rc b/reactos/dll/win32/user32/En.rc
similarity index 100%
rename from reactos/dll/user32/En.rc
rename to reactos/dll/win32/user32/En.rc

diff --git a/reactos/dll/user32/Es.rc b/reactos/dll/win32/user32/Es.rc
similarity index 100%
rename from reactos/dll/user32/Es.rc
rename to reactos/dll/win32/user32/Es.rc

diff --git a/reactos/dll/user32/Fr.rc b/reactos/dll/win32/user32/Fr.rc
similarity index 100%
rename from reactos/dll/user32/Fr.rc
rename to reactos/dll/win32/user32/Fr.rc

diff --git a/reactos/dll/user32/Hu.rc b/reactos/dll/win32/user32/Hu.rc
similarity index 100%
rename from reactos/dll/user32/Hu.rc
rename to reactos/dll/win32/user32/Hu.rc

diff --git a/reactos/dll/user32/Ja.rc b/reactos/dll/win32/user32/Ja.rc
similarity index 100%
rename from reactos/dll/user32/Ja.rc
rename to reactos/dll/win32/user32/Ja.rc

diff --git a/reactos/dll/user32/Nl.rc b/reactos/dll/win32/user32/Nl.rc
similarity index 100%
rename from reactos/dll/user32/Nl.rc
rename to reactos/dll/win32/user32/Nl.rc

diff --git a/reactos/dll/user32/Pl.rc b/reactos/dll/win32/user32/Pl.rc
similarity index 100%
rename from reactos/dll/user32/Pl.rc
rename to reactos/dll/win32/user32/Pl.rc

diff --git a/reactos/dll/user32/Sv.rc b/reactos/dll/win32/user32/Sv.rc
similarity index 100%
rename from reactos/dll/user32/Sv.rc
rename to reactos/dll/win32/user32/Sv.rc

diff --git a/reactos/dll/user32/controls/button.c b/reactos/dll/win32/user32/controls/button.c
similarity index 100%
rename from reactos/dll/user32/controls/button.c
rename to reactos/dll/win32/user32/controls/button.c

diff --git a/reactos/dll/user32/controls/combo.c b/reactos/dll/win32/user32/controls/combo.c
similarity index 100%
rename from reactos/dll/user32/controls/combo.c
rename to reactos/dll/win32/user32/controls/combo.c

diff --git a/reactos/dll/user32/controls/edit.c b/reactos/dll/win32/user32/controls/edit.c
similarity index 100%
rename from reactos/dll/user32/controls/edit.c
rename to reactos/dll/win32/user32/controls/edit.c

diff --git a/reactos/dll/user32/controls/icontitle.c b/reactos/dll/win32/user32/controls/icontitle.c
similarity index 100%
rename from reactos/dll/user32/controls/icontitle.c
rename to reactos/dll/win32/user32/controls/icontitle.c

diff --git a/reactos/dll/user32/controls/listbox.c b/reactos/dll/win32/user32/controls/listbox.c
similarity index 100%
rename from reactos/dll/user32/controls/listbox.c
rename to reactos/dll/win32/user32/controls/listbox.c

diff --git a/reactos/dll/user32/controls/regcontrol.c b/reactos/dll/win32/user32/controls/regcontrol.c
similarity index 100%
rename from reactos/dll/user32/controls/regcontrol.c
rename to reactos/dll/win32/user32/controls/regcontrol.c

diff --git a/reactos/dll/user32/controls/scrollbar.c b/reactos/dll/win32/user32/controls/scrollbar.c
similarity index 100%
rename from reactos/dll/user32/controls/scrollbar.c
rename to reactos/dll/win32/user32/controls/scrollbar.c

diff --git a/reactos/dll/user32/controls/static.c b/reactos/dll/win32/user32/controls/static.c
similarity index 100%
rename from reactos/dll/user32/controls/static.c
rename to reactos/dll/win32/user32/controls/static.c

diff --git a/reactos/dll/user32/include/accel.h b/reactos/dll/win32/user32/include/accel.h
similarity index 100%
rename from reactos/dll/user32/include/accel.h
rename to reactos/dll/win32/user32/include/accel.h

diff --git a/reactos/dll/user32/include/controls.h b/reactos/dll/win32/user32/include/controls.h
similarity index 100%
rename from reactos/dll/user32/include/controls.h
rename to reactos/dll/win32/user32/include/controls.h

diff --git a/reactos/dll/user32/include/cursor.h b/reactos/dll/win32/user32/include/cursor.h
similarity index 100%
rename from reactos/dll/user32/include/cursor.h
rename to reactos/dll/win32/user32/include/cursor.h

diff --git a/reactos/dll/user32/include/dde_private.h b/reactos/dll/win32/user32/include/dde_private.h
similarity index 100%
rename from reactos/dll/user32/include/dde_private.h
rename to reactos/dll/win32/user32/include/dde_private.h

diff --git a/reactos/dll/user32/include/draw.h b/reactos/dll/win32/user32/include/draw.h
similarity index 100%
rename from reactos/dll/user32/include/draw.h
rename to reactos/dll/win32/user32/include/draw.h

diff --git a/reactos/dll/user32/include/menu.h b/reactos/dll/win32/user32/include/menu.h
similarity index 100%
rename from reactos/dll/user32/include/menu.h
rename to reactos/dll/win32/user32/include/menu.h

diff --git a/reactos/dll/user32/include/message.h b/reactos/dll/win32/user32/include/message.h
similarity index 100%
rename from reactos/dll/user32/include/message.h
rename to reactos/dll/win32/user32/include/message.h

diff --git a/reactos/dll/user32/include/regcontrol.h b/reactos/dll/win32/user32/include/regcontrol.h
similarity index 100%
rename from reactos/dll/user32/include/regcontrol.h
rename to reactos/dll/win32/user32/include/regcontrol.h

diff --git a/reactos/dll/user32/include/resource.h b/reactos/dll/win32/user32/include/resource.h
similarity index 100%
rename from reactos/dll/user32/include/resource.h
rename to reactos/dll/win32/user32/include/resource.h

diff --git a/reactos/dll/user32/include/scroll.h b/reactos/dll/win32/user32/include/scroll.h
similarity index 100%
rename from reactos/dll/user32/include/scroll.h
rename to reactos/dll/win32/user32/include/scroll.h

diff --git a/reactos/dll/user32/include/strpool.h b/reactos/dll/win32/user32/include/strpool.h
similarity index 100%
rename from reactos/dll/user32/include/strpool.h
rename to reactos/dll/win32/user32/include/strpool.h

diff --git a/reactos/dll/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h
similarity index 100%
rename from reactos/dll/user32/include/user32.h
rename to reactos/dll/win32/user32/include/user32.h

diff --git a/reactos/dll/user32/include/user32p.h b/reactos/dll/win32/user32/include/user32p.h
similarity index 100%
rename from reactos/dll/user32/include/user32p.h
rename to reactos/dll/win32/user32/include/user32p.h

diff --git a/reactos/dll/user32/include/window.h b/reactos/dll/win32/user32/include/window.h
similarity index 100%
rename from reactos/dll/user32/include/window.h
rename to reactos/dll/win32/user32/include/window.h

diff --git a/reactos/dll/user32/include/winpos.h b/reactos/dll/win32/user32/include/winpos.h
similarity index 100%
rename from reactos/dll/user32/include/winpos.h
rename to reactos/dll/win32/user32/include/winpos.h

diff --git a/reactos/dll/user32/include/winsta.h b/reactos/dll/win32/user32/include/winsta.h
similarity index 100%
rename from reactos/dll/user32/include/winsta.h
rename to reactos/dll/win32/user32/include/winsta.h

diff --git a/reactos/dll/user32/misc/dde.c b/reactos/dll/win32/user32/misc/dde.c
similarity index 100%
rename from reactos/dll/user32/misc/dde.c
rename to reactos/dll/win32/user32/misc/dde.c

diff --git a/reactos/dll/user32/misc/ddeclient.c b/reactos/dll/win32/user32/misc/ddeclient.c
similarity index 100%
rename from reactos/dll/user32/misc/ddeclient.c
rename to reactos/dll/win32/user32/misc/ddeclient.c

diff --git a/reactos/dll/user32/misc/ddeserver.c b/reactos/dll/win32/user32/misc/ddeserver.c
similarity index 100%
rename from reactos/dll/user32/misc/ddeserver.c
rename to reactos/dll/win32/user32/misc/ddeserver.c

diff --git a/reactos/dll/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c
similarity index 100%
rename from reactos/dll/user32/misc/desktop.c
rename to reactos/dll/win32/user32/misc/desktop.c

diff --git a/reactos/dll/user32/misc/display.c b/reactos/dll/win32/user32/misc/display.c
similarity index 100%
rename from reactos/dll/user32/misc/display.c
rename to reactos/dll/win32/user32/misc/display.c

diff --git a/reactos/dll/user32/misc/dllmain.c b/reactos/dll/win32/user32/misc/dllmain.c
similarity index 100%
rename from reactos/dll/user32/misc/dllmain.c
rename to reactos/dll/win32/user32/misc/dllmain.c

diff --git a/reactos/dll/user32/misc/exit.c b/reactos/dll/win32/user32/misc/exit.c
similarity index 100%
rename from reactos/dll/user32/misc/exit.c
rename to reactos/dll/win32/user32/misc/exit.c

diff --git a/reactos/dll/user32/misc/exticon.c b/reactos/dll/win32/user32/misc/exticon.c
similarity index 100%
rename from reactos/dll/user32/misc/exticon.c
rename to reactos/dll/win32/user32/misc/exticon.c

diff --git a/reactos/dll/user32/misc/misc.c b/reactos/dll/win32/user32/misc/misc.c
similarity index 100%
rename from reactos/dll/user32/misc/misc.c
rename to reactos/dll/win32/user32/misc/misc.c

diff --git a/reactos/dll/user32/misc/object.c b/reactos/dll/win32/user32/misc/object.c
similarity index 100%
rename from reactos/dll/user32/misc/object.c
rename to reactos/dll/win32/user32/misc/object.c

diff --git a/reactos/dll/user32/misc/resources.c b/reactos/dll/win32/user32/misc/resources.c
similarity index 100%
rename from reactos/dll/user32/misc/resources.c
rename to reactos/dll/win32/user32/misc/resources.c

diff --git a/reactos/dll/user32/misc/strpool.c b/reactos/dll/win32/user32/misc/strpool.c
similarity index 100%
rename from reactos/dll/user32/misc/strpool.c
rename to reactos/dll/win32/user32/misc/strpool.c

diff --git a/reactos/dll/user32/misc/stubs.c b/reactos/dll/win32/user32/misc/stubs.c
similarity index 100%
rename from reactos/dll/user32/misc/stubs.c
rename to reactos/dll/win32/user32/misc/stubs.c

diff --git a/reactos/dll/user32/misc/timer.c b/reactos/dll/win32/user32/misc/timer.c
similarity index 100%
rename from reactos/dll/user32/misc/timer.c
rename to reactos/dll/win32/user32/misc/timer.c

diff --git a/reactos/dll/user32/misc/winhelp.c b/reactos/dll/win32/user32/misc/winhelp.c
similarity index 100%
rename from reactos/dll/user32/misc/winhelp.c
rename to reactos/dll/win32/user32/misc/winhelp.c

diff --git a/reactos/dll/user32/misc/winsta.c b/reactos/dll/win32/user32/misc/winsta.c
similarity index 100%
rename from reactos/dll/user32/misc/winsta.c
rename to reactos/dll/win32/user32/misc/winsta.c

diff --git a/reactos/dll/user32/misc/wsprintf.c b/reactos/dll/win32/user32/misc/wsprintf.c
similarity index 100%
rename from reactos/dll/user32/misc/wsprintf.c
rename to reactos/dll/win32/user32/misc/wsprintf.c

diff --git a/reactos/dll/user32/resources/obm_checkboxes.bmp b/reactos/dll/win32/user32/resources/obm_checkboxes.bmp
similarity index 100%
rename from reactos/dll/user32/resources/obm_checkboxes.bmp
rename to reactos/dll/win32/user32/resources/obm_checkboxes.bmp

diff --git a/reactos/dll/user32/resources/obm_close.bmp b/reactos/dll/win32/user32/resources/obm_close.bmp
similarity index 100%
rename from reactos/dll/user32/resources/obm_close.bmp
rename to reactos/dll/win32/user32/resources/obm_close.bmp

diff --git a/reactos/dll/user32/resources/obm_combo.bmp b/reactos/dll/win32/user32/resources/obm_combo.bmp
similarity index 100%
rename from reactos/dll/user32/resources/obm_combo.bmp
rename to reactos/dll/win32/user32/resources/obm_combo.bmp

diff --git a/reactos/dll/user32/resources/obm_mnarrow.bmp b/reactos/dll/win32/user32/resources/obm_mnarrow.bmp
similarity index 100%
rename from reactos/dll/user32/resources/obm_mnarrow.bmp
rename to reactos/dll/win32/user32/resources/obm_mnarrow.bmp

diff --git a/reactos/dll/user32/resources/ocr_appstarting.cur b/reactos/dll/win32/user32/resources/ocr_appstarting.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_appstarting.cur
rename to reactos/dll/win32/user32/resources/ocr_appstarting.cur

diff --git a/reactos/dll/user32/resources/ocr_cdautostart.cur b/reactos/dll/win32/user32/resources/ocr_cdautostart.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_cdautostart.cur
rename to reactos/dll/win32/user32/resources/ocr_cdautostart.cur

diff --git a/reactos/dll/user32/resources/ocr_cross.cur b/reactos/dll/win32/user32/resources/ocr_cross.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_cross.cur
rename to reactos/dll/win32/user32/resources/ocr_cross.cur

diff --git a/reactos/dll/user32/resources/ocr_dragobject.cur b/reactos/dll/win32/user32/resources/ocr_dragobject.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_dragobject.cur
rename to reactos/dll/win32/user32/resources/ocr_dragobject.cur

diff --git a/reactos/dll/user32/resources/ocr_hand.cur b/reactos/dll/win32/user32/resources/ocr_hand.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_hand.cur
rename to reactos/dll/win32/user32/resources/ocr_hand.cur

diff --git a/reactos/dll/user32/resources/ocr_help.cur b/reactos/dll/win32/user32/resources/ocr_help.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_help.cur
rename to reactos/dll/win32/user32/resources/ocr_help.cur

diff --git a/reactos/dll/user32/resources/ocr_ibeam.cur b/reactos/dll/win32/user32/resources/ocr_ibeam.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_ibeam.cur
rename to reactos/dll/win32/user32/resources/ocr_ibeam.cur

diff --git a/reactos/dll/user32/resources/ocr_icon.cur b/reactos/dll/win32/user32/resources/ocr_icon.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_icon.cur
rename to reactos/dll/win32/user32/resources/ocr_icon.cur

diff --git a/reactos/dll/user32/resources/ocr_no.cur b/reactos/dll/win32/user32/resources/ocr_no.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_no.cur
rename to reactos/dll/win32/user32/resources/ocr_no.cur

diff --git a/reactos/dll/user32/resources/ocr_normal.cur b/reactos/dll/win32/user32/resources/ocr_normal.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_normal.cur
rename to reactos/dll/win32/user32/resources/ocr_normal.cur

diff --git a/reactos/dll/user32/resources/ocr_pen.cur b/reactos/dll/win32/user32/resources/ocr_pen.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_pen.cur
rename to reactos/dll/win32/user32/resources/ocr_pen.cur

diff --git a/reactos/dll/user32/resources/ocr_size.cur b/reactos/dll/win32/user32/resources/ocr_size.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_size.cur
rename to reactos/dll/win32/user32/resources/ocr_size.cur

diff --git a/reactos/dll/user32/resources/ocr_sizeall.cur b/reactos/dll/win32/user32/resources/ocr_sizeall.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_sizeall.cur
rename to reactos/dll/win32/user32/resources/ocr_sizeall.cur

diff --git a/reactos/dll/user32/resources/ocr_sizenesw.cur b/reactos/dll/win32/user32/resources/ocr_sizenesw.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_sizenesw.cur
rename to reactos/dll/win32/user32/resources/ocr_sizenesw.cur

diff --git a/reactos/dll/user32/resources/ocr_sizens.cur b/reactos/dll/win32/user32/resources/ocr_sizens.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_sizens.cur
rename to reactos/dll/win32/user32/resources/ocr_sizens.cur

diff --git a/reactos/dll/user32/resources/ocr_sizenwse.cur b/reactos/dll/win32/user32/resources/ocr_sizenwse.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_sizenwse.cur
rename to reactos/dll/win32/user32/resources/ocr_sizenwse.cur

diff --git a/reactos/dll/user32/resources/ocr_sizewe.cur b/reactos/dll/win32/user32/resources/ocr_sizewe.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_sizewe.cur
rename to reactos/dll/win32/user32/resources/ocr_sizewe.cur

diff --git a/reactos/dll/user32/resources/ocr_up.cur b/reactos/dll/win32/user32/resources/ocr_up.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_up.cur
rename to reactos/dll/win32/user32/resources/ocr_up.cur

diff --git a/reactos/dll/user32/resources/ocr_wait.cur b/reactos/dll/win32/user32/resources/ocr_wait.cur
similarity index 100%
rename from reactos/dll/user32/resources/ocr_wait.cur
rename to reactos/dll/win32/user32/resources/ocr_wait.cur

diff --git a/reactos/dll/user32/resources/oic_bang.ico b/reactos/dll/win32/user32/resources/oic_bang.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_bang.ico
rename to reactos/dll/win32/user32/resources/oic_bang.ico

diff --git a/reactos/dll/user32/resources/oic_hand.ico b/reactos/dll/win32/user32/resources/oic_hand.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_hand.ico
rename to reactos/dll/win32/user32/resources/oic_hand.ico

diff --git a/reactos/dll/user32/resources/oic_note.ico b/reactos/dll/win32/user32/resources/oic_note.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_note.ico
rename to reactos/dll/win32/user32/resources/oic_note.ico

diff --git a/reactos/dll/user32/resources/oic_ques.ico b/reactos/dll/win32/user32/resources/oic_ques.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_ques.ico
rename to reactos/dll/win32/user32/resources/oic_ques.ico

diff --git a/reactos/dll/user32/resources/oic_reactos.ico b/reactos/dll/win32/user32/resources/oic_reactos.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_reactos.ico
rename to reactos/dll/win32/user32/resources/oic_reactos.ico

diff --git a/reactos/dll/user32/resources/oic_sample.ico b/reactos/dll/win32/user32/resources/oic_sample.ico
similarity index 100%
rename from reactos/dll/user32/resources/oic_sample.ico
rename to reactos/dll/win32/user32/resources/oic_sample.ico

diff --git a/reactos/dll/user32/user32.def b/reactos/dll/win32/user32/user32.def
similarity index 100%
rename from reactos/dll/user32/user32.def
rename to reactos/dll/win32/user32/user32.def

diff --git a/reactos/dll/user32/user32.rc b/reactos/dll/win32/user32/user32.rc
similarity index 100%
rename from reactos/dll/user32/user32.rc
rename to reactos/dll/win32/user32/user32.rc

diff --git a/reactos/dll/user32/user32.xml b/reactos/dll/win32/user32/user32.xml
similarity index 100%
rename from reactos/dll/user32/user32.xml
rename to reactos/dll/win32/user32/user32.xml

diff --git a/reactos/dll/user32/windows/accel.c b/reactos/dll/win32/user32/windows/accel.c
similarity index 100%
rename from reactos/dll/user32/windows/accel.c
rename to reactos/dll/win32/user32/windows/accel.c

diff --git a/reactos/dll/user32/windows/bitmap.c b/reactos/dll/win32/user32/windows/bitmap.c
similarity index 100%
rename from reactos/dll/user32/windows/bitmap.c
rename to reactos/dll/win32/user32/windows/bitmap.c

diff --git a/reactos/dll/user32/windows/caret.c b/reactos/dll/win32/user32/windows/caret.c
similarity index 100%
rename from reactos/dll/user32/windows/caret.c
rename to reactos/dll/win32/user32/windows/caret.c

diff --git a/reactos/dll/user32/windows/class.c b/reactos/dll/win32/user32/windows/class.c
similarity index 100%
rename from reactos/dll/user32/windows/class.c
rename to reactos/dll/win32/user32/windows/class.c

diff --git a/reactos/dll/user32/windows/clipboard.c b/reactos/dll/win32/user32/windows/clipboard.c
similarity index 100%
rename from reactos/dll/user32/windows/clipboard.c
rename to reactos/dll/win32/user32/windows/clipboard.c

diff --git a/reactos/dll/user32/windows/cursor.c b/reactos/dll/win32/user32/windows/cursor.c
similarity index 100%
rename from reactos/dll/user32/windows/cursor.c
rename to reactos/dll/win32/user32/windows/cursor.c

diff --git a/reactos/dll/user32/windows/dc.c b/reactos/dll/win32/user32/windows/dc.c
similarity index 100%
rename from reactos/dll/user32/windows/dc.c
rename to reactos/dll/win32/user32/windows/dc.c

diff --git a/reactos/dll/user32/windows/defwnd.c b/reactos/dll/win32/user32/windows/defwnd.c
similarity index 100%
rename from reactos/dll/user32/windows/defwnd.c
rename to reactos/dll/win32/user32/windows/defwnd.c

diff --git a/reactos/dll/user32/windows/dialog.c b/reactos/dll/win32/user32/windows/dialog.c
similarity index 100%
rename from reactos/dll/user32/windows/dialog.c
rename to reactos/dll/win32/user32/windows/dialog.c

diff --git a/reactos/dll/user32/windows/draw.c b/reactos/dll/win32/user32/windows/draw.c
similarity index 100%
rename from reactos/dll/user32/windows/draw.c
rename to reactos/dll/win32/user32/windows/draw.c

diff --git a/reactos/dll/user32/windows/font.c b/reactos/dll/win32/user32/windows/font.c
similarity index 100%
rename from reactos/dll/user32/windows/font.c
rename to reactos/dll/win32/user32/windows/font.c

diff --git a/reactos/dll/user32/windows/hook.c b/reactos/dll/win32/user32/windows/hook.c
similarity index 100%
rename from reactos/dll/user32/windows/hook.c
rename to reactos/dll/win32/user32/windows/hook.c

diff --git a/reactos/dll/user32/windows/icon.c b/reactos/dll/win32/user32/windows/icon.c
similarity index 100%
rename from reactos/dll/user32/windows/icon.c
rename to reactos/dll/win32/user32/windows/icon.c

diff --git a/reactos/dll/user32/windows/input.c b/reactos/dll/win32/user32/windows/input.c
similarity index 100%
rename from reactos/dll/user32/windows/input.c
rename to reactos/dll/win32/user32/windows/input.c

diff --git a/reactos/dll/user32/windows/mdi.c b/reactos/dll/win32/user32/windows/mdi.c
similarity index 100%
rename from reactos/dll/user32/windows/mdi.c
rename to reactos/dll/win32/user32/windows/mdi.c

diff --git a/reactos/dll/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c
similarity index 100%
rename from reactos/dll/user32/windows/menu.c
rename to reactos/dll/win32/user32/windows/menu.c

diff --git a/reactos/dll/user32/windows/message.c b/reactos/dll/win32/user32/windows/message.c
similarity index 100%
rename from reactos/dll/user32/windows/message.c
rename to reactos/dll/win32/user32/windows/message.c

diff --git a/reactos/dll/user32/windows/messagebox.c b/reactos/dll/win32/user32/windows/messagebox.c
similarity index 100%
rename from reactos/dll/user32/windows/messagebox.c
rename to reactos/dll/win32/user32/windows/messagebox.c

diff --git a/reactos/dll/user32/windows/nonclient.c b/reactos/dll/win32/user32/windows/nonclient.c
similarity index 100%
rename from reactos/dll/user32/windows/nonclient.c
rename to reactos/dll/win32/user32/windows/nonclient.c

diff --git a/reactos/dll/user32/windows/paint.c b/reactos/dll/win32/user32/windows/paint.c
similarity index 100%
rename from reactos/dll/user32/windows/paint.c
rename to reactos/dll/win32/user32/windows/paint.c

diff --git a/reactos/dll/user32/windows/prop.c b/reactos/dll/win32/user32/windows/prop.c
similarity index 100%
rename from reactos/dll/user32/windows/prop.c
rename to reactos/dll/win32/user32/windows/prop.c

diff --git a/reactos/dll/user32/windows/rect.c b/reactos/dll/win32/user32/windows/rect.c
similarity index 100%
rename from reactos/dll/user32/windows/rect.c
rename to reactos/dll/win32/user32/windows/rect.c

diff --git a/reactos/dll/user32/windows/text.c b/reactos/dll/win32/user32/windows/text.c
similarity index 100%
rename from reactos/dll/user32/windows/text.c
rename to reactos/dll/win32/user32/windows/text.c

diff --git a/reactos/dll/user32/windows/window.c b/reactos/dll/win32/user32/windows/window.c
similarity index 100%
rename from reactos/dll/user32/windows/window.c
rename to reactos/dll/win32/user32/windows/window.c

diff --git a/reactos/dll/user32/windows/winpos.c b/reactos/dll/win32/user32/windows/winpos.c
similarity index 100%
rename from reactos/dll/user32/windows/winpos.c
rename to reactos/dll/win32/user32/windows/winpos.c

diff --git a/reactos/dll/userenv/De.rc b/reactos/dll/win32/userenv/De.rc
similarity index 100%
rename from reactos/dll/userenv/De.rc
rename to reactos/dll/win32/userenv/De.rc

diff --git a/reactos/dll/userenv/En.rc b/reactos/dll/win32/userenv/En.rc
similarity index 100%
rename from reactos/dll/userenv/En.rc
rename to reactos/dll/win32/userenv/En.rc

diff --git a/reactos/dll/userenv/Es.rc b/reactos/dll/win32/userenv/Es.rc
similarity index 100%
rename from reactos/dll/userenv/Es.rc
rename to reactos/dll/win32/userenv/Es.rc

diff --git a/reactos/dll/userenv/Fi.rc b/reactos/dll/win32/userenv/Fi.rc
similarity index 100%
rename from reactos/dll/userenv/Fi.rc
rename to reactos/dll/win32/userenv/Fi.rc

diff --git a/reactos/dll/userenv/Fr.rc b/reactos/dll/win32/userenv/Fr.rc
similarity index 100%
rename from reactos/dll/userenv/Fr.rc
rename to reactos/dll/win32/userenv/Fr.rc

diff --git a/reactos/dll/userenv/Gr.rc b/reactos/dll/win32/userenv/Gr.rc
similarity index 100%
rename from reactos/dll/userenv/Gr.rc
rename to reactos/dll/win32/userenv/Gr.rc

diff --git a/reactos/dll/userenv/Hu.rc b/reactos/dll/win32/userenv/Hu.rc
similarity index 100%
rename from reactos/dll/userenv/Hu.rc
rename to reactos/dll/win32/userenv/Hu.rc

diff --git a/reactos/dll/userenv/Ja.rc b/reactos/dll/win32/userenv/Ja.rc
similarity index 100%
rename from reactos/dll/userenv/Ja.rc
rename to reactos/dll/win32/userenv/Ja.rc

diff --git a/reactos/dll/userenv/Nl.rc b/reactos/dll/win32/userenv/Nl.rc
similarity index 100%
rename from reactos/dll/userenv/Nl.rc
rename to reactos/dll/win32/userenv/Nl.rc

diff --git a/reactos/dll/userenv/Pl.rc b/reactos/dll/win32/userenv/Pl.rc
similarity index 100%
rename from reactos/dll/userenv/Pl.rc
rename to reactos/dll/win32/userenv/Pl.rc

diff --git a/reactos/dll/userenv/Ru.rc b/reactos/dll/win32/userenv/Ru.rc
similarity index 100%
rename from reactos/dll/userenv/Ru.rc
rename to reactos/dll/win32/userenv/Ru.rc

diff --git a/reactos/dll/userenv/Sv.rc b/reactos/dll/win32/userenv/Sv.rc
similarity index 100%
rename from reactos/dll/userenv/Sv.rc
rename to reactos/dll/win32/userenv/Sv.rc

diff --git a/reactos/dll/userenv/Uk.rc b/reactos/dll/win32/userenv/Uk.rc
similarity index 100%
rename from reactos/dll/userenv/Uk.rc
rename to reactos/dll/win32/userenv/Uk.rc

diff --git a/reactos/dll/userenv/desktop.c b/reactos/dll/win32/userenv/desktop.c
similarity index 100%
rename from reactos/dll/userenv/desktop.c
rename to reactos/dll/win32/userenv/desktop.c

diff --git a/reactos/dll/userenv/directory.c b/reactos/dll/win32/userenv/directory.c
similarity index 100%
rename from reactos/dll/userenv/directory.c
rename to reactos/dll/win32/userenv/directory.c

diff --git a/reactos/dll/userenv/environment.c b/reactos/dll/win32/userenv/environment.c
similarity index 100%
rename from reactos/dll/userenv/environment.c
rename to reactos/dll/win32/userenv/environment.c

diff --git a/reactos/dll/userenv/gpolicy.c b/reactos/dll/win32/userenv/gpolicy.c
similarity index 100%
rename from reactos/dll/userenv/gpolicy.c
rename to reactos/dll/win32/userenv/gpolicy.c

diff --git a/reactos/dll/userenv/internal.h b/reactos/dll/win32/userenv/internal.h
similarity index 100%
rename from reactos/dll/userenv/internal.h
rename to reactos/dll/win32/userenv/internal.h

diff --git a/reactos/dll/userenv/misc.c b/reactos/dll/win32/userenv/misc.c
similarity index 100%
rename from reactos/dll/userenv/misc.c
rename to reactos/dll/win32/userenv/misc.c

diff --git a/reactos/dll/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h
similarity index 100%
rename from reactos/dll/userenv/precomp.h
rename to reactos/dll/win32/userenv/precomp.h

diff --git a/reactos/dll/userenv/profile.c b/reactos/dll/win32/userenv/profile.c
similarity index 100%
rename from reactos/dll/userenv/profile.c
rename to reactos/dll/win32/userenv/profile.c

diff --git a/reactos/dll/userenv/registry.c b/reactos/dll/win32/userenv/registry.c
similarity index 100%
rename from reactos/dll/userenv/registry.c
rename to reactos/dll/win32/userenv/registry.c

diff --git a/reactos/dll/userenv/resources.h b/reactos/dll/win32/userenv/resources.h
similarity index 100%
rename from reactos/dll/userenv/resources.h
rename to reactos/dll/win32/userenv/resources.h

diff --git a/reactos/dll/userenv/setup.c b/reactos/dll/win32/userenv/setup.c
similarity index 100%
rename from reactos/dll/userenv/setup.c
rename to reactos/dll/win32/userenv/setup.c

diff --git a/reactos/dll/userenv/userenv.c b/reactos/dll/win32/userenv/userenv.c
similarity index 100%
rename from reactos/dll/userenv/userenv.c
rename to reactos/dll/win32/userenv/userenv.c

diff --git a/reactos/dll/userenv/userenv.def b/reactos/dll/win32/userenv/userenv.def
similarity index 100%
rename from reactos/dll/userenv/userenv.def
rename to reactos/dll/win32/userenv/userenv.def

diff --git a/reactos/dll/userenv/userenv.rc b/reactos/dll/win32/userenv/userenv.rc
similarity index 100%
rename from reactos/dll/userenv/userenv.rc
rename to reactos/dll/win32/userenv/userenv.rc

diff --git a/reactos/dll/userenv/userenv.xml b/reactos/dll/win32/userenv/userenv.xml
similarity index 100%
rename from reactos/dll/userenv/userenv.xml
rename to reactos/dll/win32/userenv/userenv.xml

diff --git a/reactos/dll/uxtheme/draw.c b/reactos/dll/win32/uxtheme/draw.c
similarity index 100%
rename from reactos/dll/uxtheme/draw.c
rename to reactos/dll/win32/uxtheme/draw.c

diff --git a/reactos/dll/uxtheme/main.c b/reactos/dll/win32/uxtheme/main.c
similarity index 100%
rename from reactos/dll/uxtheme/main.c
rename to reactos/dll/win32/uxtheme/main.c

diff --git a/reactos/dll/uxtheme/metric.c b/reactos/dll/win32/uxtheme/metric.c
similarity index 100%
rename from reactos/dll/uxtheme/metric.c
rename to reactos/dll/win32/uxtheme/metric.c

diff --git a/reactos/dll/uxtheme/msstyles.c b/reactos/dll/win32/uxtheme/msstyles.c
similarity index 100%
rename from reactos/dll/uxtheme/msstyles.c
rename to reactos/dll/win32/uxtheme/msstyles.c

diff --git a/reactos/dll/uxtheme/msstyles.h b/reactos/dll/win32/uxtheme/msstyles.h
similarity index 100%
rename from reactos/dll/uxtheme/msstyles.h
rename to reactos/dll/win32/uxtheme/msstyles.h

diff --git a/reactos/dll/uxtheme/property.c b/reactos/dll/win32/uxtheme/property.c
similarity index 100%
rename from reactos/dll/uxtheme/property.c
rename to reactos/dll/win32/uxtheme/property.c

diff --git a/reactos/dll/uxtheme/stylemap.c b/reactos/dll/win32/uxtheme/stylemap.c
similarity index 100%
rename from reactos/dll/uxtheme/stylemap.c
rename to reactos/dll/win32/uxtheme/stylemap.c

diff --git a/reactos/dll/uxtheme/system.c b/reactos/dll/win32/uxtheme/system.c
similarity index 100%
rename from reactos/dll/uxtheme/system.c
rename to reactos/dll/win32/uxtheme/system.c

diff --git a/reactos/dll/uxtheme/uxini.c b/reactos/dll/win32/uxtheme/uxini.c
similarity index 100%
rename from reactos/dll/uxtheme/uxini.c
rename to reactos/dll/win32/uxtheme/uxini.c

diff --git a/reactos/dll/uxtheme/uxtheme.spec b/reactos/dll/win32/uxtheme/uxtheme.spec
similarity index 100%
rename from reactos/dll/uxtheme/uxtheme.spec
rename to reactos/dll/win32/uxtheme/uxtheme.spec

diff --git a/reactos/dll/uxtheme/uxtheme.xml b/reactos/dll/win32/uxtheme/uxtheme.xml
similarity index 100%
rename from reactos/dll/uxtheme/uxtheme.xml
rename to reactos/dll/win32/uxtheme/uxtheme.xml

diff --git a/reactos/dll/uxtheme/uxthemedll.h b/reactos/dll/win32/uxtheme/uxthemedll.h
similarity index 100%
rename from reactos/dll/uxtheme/uxthemedll.h
rename to reactos/dll/win32/uxtheme/uxthemedll.h

diff --git a/reactos/dll/uxtheme/version.rc b/reactos/dll/win32/uxtheme/version.rc
similarity index 100%
rename from reactos/dll/uxtheme/version.rc
rename to reactos/dll/win32/uxtheme/version.rc

diff --git a/reactos/dll/version/info.c b/reactos/dll/win32/version/info.c
similarity index 100%
rename from reactos/dll/version/info.c
rename to reactos/dll/win32/version/info.c

diff --git a/reactos/dll/version/install.c b/reactos/dll/win32/version/install.c
similarity index 100%
rename from reactos/dll/version/install.c
rename to reactos/dll/win32/version/install.c

diff --git a/reactos/dll/version/misc/libmain.c b/reactos/dll/win32/version/misc/libmain.c
similarity index 100%
rename from reactos/dll/version/misc/libmain.c
rename to reactos/dll/win32/version/misc/libmain.c

diff --git a/reactos/dll/version/misc/stubs.c b/reactos/dll/win32/version/misc/stubs.c
similarity index 100%
rename from reactos/dll/version/misc/stubs.c
rename to reactos/dll/win32/version/misc/stubs.c

diff --git a/reactos/dll/version/resource.c b/reactos/dll/win32/version/resource.c
similarity index 100%
rename from reactos/dll/version/resource.c
rename to reactos/dll/win32/version/resource.c

diff --git a/reactos/dll/version/version.def b/reactos/dll/win32/version/version.def
similarity index 100%
rename from reactos/dll/version/version.def
rename to reactos/dll/win32/version/version.def

diff --git a/reactos/dll/version/version.rc b/reactos/dll/win32/version/version.rc
similarity index 100%
rename from reactos/dll/version/version.rc
rename to reactos/dll/win32/version/version.rc

diff --git a/reactos/dll/version/version.xml b/reactos/dll/win32/version/version.xml
similarity index 100%
rename from reactos/dll/version/version.xml
rename to reactos/dll/win32/version/version.xml

diff --git a/reactos/dll/version/version_specs b/reactos/dll/win32/version/version_specs
similarity index 100%
rename from reactos/dll/version/version_specs
rename to reactos/dll/win32/version/version_specs

diff --git a/reactos/dll/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c
similarity index 100%
rename from reactos/dll/wininet/cookie.c
rename to reactos/dll/win32/wininet/cookie.c

diff --git a/reactos/dll/wininet/dialogs.c b/reactos/dll/win32/wininet/dialogs.c
similarity index 100%
rename from reactos/dll/wininet/dialogs.c
rename to reactos/dll/win32/wininet/dialogs.c

diff --git a/reactos/dll/wininet/ftp.c b/reactos/dll/win32/wininet/ftp.c
similarity index 100%
rename from reactos/dll/wininet/ftp.c
rename to reactos/dll/win32/wininet/ftp.c

diff --git a/reactos/dll/wininet/gopher.c b/reactos/dll/win32/wininet/gopher.c
similarity index 100%
rename from reactos/dll/wininet/gopher.c
rename to reactos/dll/win32/wininet/gopher.c

diff --git a/reactos/dll/wininet/http.c b/reactos/dll/win32/wininet/http.c
similarity index 100%
rename from reactos/dll/wininet/http.c
rename to reactos/dll/win32/wininet/http.c

diff --git a/reactos/dll/wininet/internet.c b/reactos/dll/win32/wininet/internet.c
similarity index 100%
rename from reactos/dll/wininet/internet.c
rename to reactos/dll/win32/wininet/internet.c

diff --git a/reactos/dll/wininet/internet.h b/reactos/dll/win32/wininet/internet.h
similarity index 100%
rename from reactos/dll/wininet/internet.h
rename to reactos/dll/win32/wininet/internet.h

diff --git a/reactos/dll/wininet/netconnection.c b/reactos/dll/win32/wininet/netconnection.c
similarity index 100%
rename from reactos/dll/wininet/netconnection.c
rename to reactos/dll/win32/wininet/netconnection.c

diff --git a/reactos/dll/wininet/resource.h b/reactos/dll/win32/wininet/resource.h
similarity index 100%
rename from reactos/dll/wininet/resource.h
rename to reactos/dll/win32/wininet/resource.h

diff --git a/reactos/dll/wininet/rsrc.rc b/reactos/dll/win32/wininet/rsrc.rc
similarity index 100%
rename from reactos/dll/wininet/rsrc.rc
rename to reactos/dll/win32/wininet/rsrc.rc

diff --git a/reactos/dll/wininet/urlcache.c b/reactos/dll/win32/wininet/urlcache.c
similarity index 100%
rename from reactos/dll/wininet/urlcache.c
rename to reactos/dll/win32/wininet/urlcache.c

diff --git a/reactos/dll/wininet/utility.c b/reactos/dll/win32/wininet/utility.c
similarity index 100%
rename from reactos/dll/wininet/utility.c
rename to reactos/dll/win32/wininet/utility.c

diff --git a/reactos/dll/wininet/version.rc b/reactos/dll/win32/wininet/version.rc
similarity index 100%
rename from reactos/dll/wininet/version.rc
rename to reactos/dll/win32/wininet/version.rc

diff --git a/reactos/dll/wininet/wininet.spec b/reactos/dll/win32/wininet/wininet.spec
similarity index 100%
rename from reactos/dll/wininet/wininet.spec
rename to reactos/dll/win32/wininet/wininet.spec

diff --git a/reactos/dll/wininet/wininet.xml b/reactos/dll/win32/wininet/wininet.xml
similarity index 100%
rename from reactos/dll/wininet/wininet.xml
rename to reactos/dll/win32/wininet/wininet.xml

diff --git a/reactos/dll/wininet/wininet_Bg.rc b/reactos/dll/win32/wininet/wininet_Bg.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Bg.rc
rename to reactos/dll/win32/wininet/wininet_Bg.rc

diff --git a/reactos/dll/wininet/wininet_Cs.rc b/reactos/dll/win32/wininet/wininet_Cs.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Cs.rc
rename to reactos/dll/win32/wininet/wininet_Cs.rc

diff --git a/reactos/dll/wininet/wininet_De.rc b/reactos/dll/win32/wininet/wininet_De.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_De.rc
rename to reactos/dll/win32/wininet/wininet_De.rc

diff --git a/reactos/dll/wininet/wininet_En.rc b/reactos/dll/win32/wininet/wininet_En.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_En.rc
rename to reactos/dll/win32/wininet/wininet_En.rc

diff --git a/reactos/dll/wininet/wininet_Es.rc b/reactos/dll/win32/wininet/wininet_Es.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Es.rc
rename to reactos/dll/win32/wininet/wininet_Es.rc

diff --git a/reactos/dll/wininet/wininet_Fi.rc b/reactos/dll/win32/wininet/wininet_Fi.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Fi.rc
rename to reactos/dll/win32/wininet/wininet_Fi.rc

diff --git a/reactos/dll/wininet/wininet_Fr.rc b/reactos/dll/win32/wininet/wininet_Fr.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Fr.rc
rename to reactos/dll/win32/wininet/wininet_Fr.rc

diff --git a/reactos/dll/wininet/wininet_It.rc b/reactos/dll/win32/wininet/wininet_It.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_It.rc
rename to reactos/dll/win32/wininet/wininet_It.rc

diff --git a/reactos/dll/wininet/wininet_Ja.rc b/reactos/dll/win32/wininet/wininet_Ja.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Ja.rc
rename to reactos/dll/win32/wininet/wininet_Ja.rc

diff --git a/reactos/dll/wininet/wininet_Ko.rc b/reactos/dll/win32/wininet/wininet_Ko.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Ko.rc
rename to reactos/dll/win32/wininet/wininet_Ko.rc

diff --git a/reactos/dll/wininet/wininet_Nl.rc b/reactos/dll/win32/wininet/wininet_Nl.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Nl.rc
rename to reactos/dll/win32/wininet/wininet_Nl.rc

diff --git a/reactos/dll/wininet/wininet_No.rc b/reactos/dll/win32/wininet/wininet_No.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_No.rc
rename to reactos/dll/win32/wininet/wininet_No.rc

diff --git a/reactos/dll/wininet/wininet_Pt.rc b/reactos/dll/win32/wininet/wininet_Pt.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Pt.rc
rename to reactos/dll/win32/wininet/wininet_Pt.rc

diff --git a/reactos/dll/wininet/wininet_Ru.rc b/reactos/dll/win32/wininet/wininet_Ru.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Ru.rc
rename to reactos/dll/win32/wininet/wininet_Ru.rc

diff --git a/reactos/dll/wininet/wininet_Si.rc b/reactos/dll/win32/wininet/wininet_Si.rc
similarity index 100%
rename from reactos/dll/wininet/wininet_Si.rc
rename to reactos/dll/win32/wininet/wininet_Si.rc

diff --git a/reactos/dll/wininet/wininet_main.c b/reactos/dll/win32/wininet/wininet_main.c
similarity index 100%
rename from reactos/dll/wininet/wininet_main.c
rename to reactos/dll/win32/wininet/wininet_main.c

diff --git a/reactos/dll/winmm/directory.xml b/reactos/dll/win32/winmm/directory.xml
similarity index 100%
rename from reactos/dll/winmm/directory.xml
rename to reactos/dll/win32/winmm/directory.xml

diff --git a/reactos/dll/winmm/driver.c b/reactos/dll/win32/winmm/driver.c
similarity index 100%
rename from reactos/dll/winmm/driver.c
rename to reactos/dll/win32/winmm/driver.c

diff --git a/reactos/dll/winmm/joystick.c b/reactos/dll/win32/winmm/joystick.c
similarity index 100%
rename from reactos/dll/winmm/joystick.c
rename to reactos/dll/win32/winmm/joystick.c

diff --git a/reactos/dll/winmm/lolvldrv.c b/reactos/dll/win32/winmm/lolvldrv.c
similarity index 100%
rename from reactos/dll/winmm/lolvldrv.c
rename to reactos/dll/win32/winmm/lolvldrv.c

diff --git a/reactos/dll/winmm/mci.c b/reactos/dll/win32/winmm/mci.c
similarity index 100%
rename from reactos/dll/winmm/mci.c
rename to reactos/dll/win32/winmm/mci.c

diff --git a/reactos/dll/winmm/message16.c b/reactos/dll/win32/winmm/message16.c
similarity index 100%
rename from reactos/dll/winmm/message16.c
rename to reactos/dll/win32/winmm/message16.c

diff --git a/reactos/dll/winmm/midimap/midimap.c b/reactos/dll/win32/winmm/midimap/midimap.c
similarity index 100%
rename from reactos/dll/winmm/midimap/midimap.c
rename to reactos/dll/win32/winmm/midimap/midimap.c

diff --git a/reactos/dll/winmm/midimap/midimap.drv.spec b/reactos/dll/win32/winmm/midimap/midimap.drv.spec
similarity index 100%
rename from reactos/dll/winmm/midimap/midimap.drv.spec
rename to reactos/dll/win32/winmm/midimap/midimap.drv.spec

diff --git a/reactos/dll/winmm/midimap/midimap.rc b/reactos/dll/win32/winmm/midimap/midimap.rc
similarity index 100%
rename from reactos/dll/winmm/midimap/midimap.rc
rename to reactos/dll/win32/winmm/midimap/midimap.rc

diff --git a/reactos/dll/winmm/midimap/midimap.spec b/reactos/dll/win32/winmm/midimap/midimap.spec
similarity index 100%
rename from reactos/dll/winmm/midimap/midimap.spec
rename to reactos/dll/win32/winmm/midimap/midimap.spec

diff --git a/reactos/dll/winmm/midimap/midimap.xml b/reactos/dll/win32/winmm/midimap/midimap.xml
similarity index 100%
rename from reactos/dll/winmm/midimap/midimap.xml
rename to reactos/dll/win32/winmm/midimap/midimap.xml

diff --git a/reactos/dll/winmm/mmio.c b/reactos/dll/win32/winmm/mmio.c
similarity index 100%
rename from reactos/dll/winmm/mmio.c
rename to reactos/dll/win32/winmm/mmio.c

diff --git a/reactos/dll/winmm/mmsystem.c b/reactos/dll/win32/winmm/mmsystem.c
similarity index 100%
rename from reactos/dll/winmm/mmsystem.c
rename to reactos/dll/win32/winmm/mmsystem.c

diff --git a/reactos/dll/winmm/mmsystem.spec b/reactos/dll/win32/winmm/mmsystem.spec
similarity index 100%
rename from reactos/dll/winmm/mmsystem.spec
rename to reactos/dll/win32/winmm/mmsystem.spec

diff --git a/reactos/dll/winmm/playsound.c b/reactos/dll/win32/winmm/playsound.c
similarity index 100%
rename from reactos/dll/winmm/playsound.c
rename to reactos/dll/win32/winmm/playsound.c

diff --git a/reactos/dll/winmm/sound.spec b/reactos/dll/win32/winmm/sound.spec
similarity index 100%
rename from reactos/dll/winmm/sound.spec
rename to reactos/dll/win32/winmm/sound.spec

diff --git a/reactos/dll/winmm/sound16.c b/reactos/dll/win32/winmm/sound16.c
similarity index 100%
rename from reactos/dll/winmm/sound16.c
rename to reactos/dll/win32/winmm/sound16.c

diff --git a/reactos/dll/winmm/time.c b/reactos/dll/win32/winmm/time.c
similarity index 100%
rename from reactos/dll/winmm/time.c
rename to reactos/dll/win32/winmm/time.c

diff --git a/reactos/dll/winmm/wavemap/msacm.drv.spec b/reactos/dll/win32/winmm/wavemap/msacm.drv.spec
similarity index 100%
rename from reactos/dll/winmm/wavemap/msacm.drv.spec
rename to reactos/dll/win32/winmm/wavemap/msacm.drv.spec

diff --git a/reactos/dll/winmm/wavemap/msacm.spec b/reactos/dll/win32/winmm/wavemap/msacm.spec
similarity index 100%
rename from reactos/dll/winmm/wavemap/msacm.spec
rename to reactos/dll/win32/winmm/wavemap/msacm.spec

diff --git a/reactos/dll/winmm/wavemap/wavemap.c b/reactos/dll/win32/winmm/wavemap/wavemap.c
similarity index 100%
rename from reactos/dll/winmm/wavemap/wavemap.c
rename to reactos/dll/win32/winmm/wavemap/wavemap.c

diff --git a/reactos/dll/winmm/wavemap/wavemap.rc b/reactos/dll/win32/winmm/wavemap/wavemap.rc
similarity index 100%
rename from reactos/dll/winmm/wavemap/wavemap.rc
rename to reactos/dll/win32/winmm/wavemap/wavemap.rc

diff --git a/reactos/dll/winmm/wavemap/wavemap.xml b/reactos/dll/win32/winmm/wavemap/wavemap.xml
similarity index 100%
rename from reactos/dll/winmm/wavemap/wavemap.xml
rename to reactos/dll/win32/winmm/wavemap/wavemap.xml

diff --git a/reactos/dll/winmm/winemm.h b/reactos/dll/win32/winmm/winemm.h
similarity index 100%
rename from reactos/dll/winmm/winemm.h
rename to reactos/dll/win32/winmm/winemm.h

diff --git a/reactos/dll/winmm/winemm16.h b/reactos/dll/win32/winmm/winemm16.h
similarity index 100%
rename from reactos/dll/winmm/winemm16.h
rename to reactos/dll/win32/winmm/winemm16.h

diff --git a/reactos/dll/winmm/winmm.c b/reactos/dll/win32/winmm/winmm.c
similarity index 100%
rename from reactos/dll/winmm/winmm.c
rename to reactos/dll/win32/winmm/winmm.c

diff --git a/reactos/dll/winmm/winmm.spec b/reactos/dll/win32/winmm/winmm.spec
similarity index 100%
rename from reactos/dll/winmm/winmm.spec
rename to reactos/dll/win32/winmm/winmm.spec

diff --git a/reactos/dll/winmm/winmm.xml b/reactos/dll/win32/winmm/winmm.xml
similarity index 100%
rename from reactos/dll/winmm/winmm.xml
rename to reactos/dll/win32/winmm/winmm.xml

diff --git a/reactos/dll/winmm/winmm_Cs.rc b/reactos/dll/win32/winmm/winmm_Cs.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Cs.rc
rename to reactos/dll/win32/winmm/winmm_Cs.rc

diff --git a/reactos/dll/winmm/winmm_De.rc b/reactos/dll/win32/winmm/winmm_De.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_De.rc
rename to reactos/dll/win32/winmm/winmm_De.rc

diff --git a/reactos/dll/winmm/winmm_En.rc b/reactos/dll/win32/winmm/winmm_En.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_En.rc
rename to reactos/dll/win32/winmm/winmm_En.rc

diff --git a/reactos/dll/winmm/winmm_Es.rc b/reactos/dll/win32/winmm/winmm_Es.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Es.rc
rename to reactos/dll/win32/winmm/winmm_Es.rc

diff --git a/reactos/dll/winmm/winmm_Fr.rc b/reactos/dll/win32/winmm/winmm_Fr.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Fr.rc
rename to reactos/dll/win32/winmm/winmm_Fr.rc

diff --git a/reactos/dll/winmm/winmm_Hu.rc b/reactos/dll/win32/winmm/winmm_Hu.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Hu.rc
rename to reactos/dll/win32/winmm/winmm_Hu.rc

diff --git a/reactos/dll/winmm/winmm_It.rc b/reactos/dll/win32/winmm/winmm_It.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_It.rc
rename to reactos/dll/win32/winmm/winmm_It.rc

diff --git a/reactos/dll/winmm/winmm_Ja.rc b/reactos/dll/win32/winmm/winmm_Ja.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Ja.rc
rename to reactos/dll/win32/winmm/winmm_Ja.rc

diff --git a/reactos/dll/winmm/winmm_Nl.rc b/reactos/dll/win32/winmm/winmm_Nl.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Nl.rc
rename to reactos/dll/win32/winmm/winmm_Nl.rc

diff --git a/reactos/dll/winmm/winmm_Pl.rc b/reactos/dll/win32/winmm/winmm_Pl.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Pl.rc
rename to reactos/dll/win32/winmm/winmm_Pl.rc

diff --git a/reactos/dll/winmm/winmm_Pt.rc b/reactos/dll/win32/winmm/winmm_Pt.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Pt.rc
rename to reactos/dll/win32/winmm/winmm_Pt.rc

diff --git a/reactos/dll/winmm/winmm_Ru.rc b/reactos/dll/win32/winmm/winmm_Ru.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Ru.rc
rename to reactos/dll/win32/winmm/winmm_Ru.rc

diff --git a/reactos/dll/winmm/winmm_Si.rc b/reactos/dll/win32/winmm/winmm_Si.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Si.rc
rename to reactos/dll/win32/winmm/winmm_Si.rc

diff --git a/reactos/dll/winmm/winmm_Sk.rc b/reactos/dll/win32/winmm/winmm_Sk.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Sk.rc
rename to reactos/dll/win32/winmm/winmm_Sk.rc

diff --git a/reactos/dll/winmm/winmm_Uk.rc b/reactos/dll/win32/winmm/winmm_Uk.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_Uk.rc
rename to reactos/dll/win32/winmm/winmm_Uk.rc

diff --git a/reactos/dll/winmm/winmm_res.rc b/reactos/dll/win32/winmm/winmm_res.rc
similarity index 100%
rename from reactos/dll/winmm/winmm_res.rc
rename to reactos/dll/win32/winmm/winmm_res.rc

diff --git a/reactos/dll/winspool/info.c b/reactos/dll/win32/winspool/info.c
similarity index 100%
rename from reactos/dll/winspool/info.c
rename to reactos/dll/win32/winspool/info.c

diff --git a/reactos/dll/winspool/stubs.c b/reactos/dll/win32/winspool/stubs.c
similarity index 100%
rename from reactos/dll/winspool/stubs.c
rename to reactos/dll/win32/winspool/stubs.c

diff --git a/reactos/dll/winspool/winspool.def b/reactos/dll/win32/winspool/winspool.def
similarity index 100%
rename from reactos/dll/winspool/winspool.def
rename to reactos/dll/win32/winspool/winspool.def

diff --git a/reactos/dll/winspool/winspool.rc b/reactos/dll/win32/winspool/winspool.rc
similarity index 100%
rename from reactos/dll/winspool/winspool.rc
rename to reactos/dll/win32/winspool/winspool.rc

diff --git a/reactos/dll/winspool/winspool.xml b/reactos/dll/win32/winspool/winspool.xml
similarity index 100%
rename from reactos/dll/winspool/winspool.xml
rename to reactos/dll/win32/winspool/winspool.xml

diff --git a/reactos/dll/wintrust/Makefile.in b/reactos/dll/win32/wintrust/Makefile.in
similarity index 100%
rename from reactos/dll/wintrust/Makefile.in
rename to reactos/dll/win32/wintrust/Makefile.in

diff --git a/reactos/dll/wintrust/version.rc b/reactos/dll/win32/wintrust/version.rc
similarity index 100%
rename from reactos/dll/wintrust/version.rc
rename to reactos/dll/win32/wintrust/version.rc

diff --git a/reactos/dll/wintrust/wintrust.spec b/reactos/dll/win32/wintrust/wintrust.spec
similarity index 100%
rename from reactos/dll/wintrust/wintrust.spec
rename to reactos/dll/win32/wintrust/wintrust.spec

diff --git a/reactos/dll/wintrust/wintrust.xml b/reactos/dll/win32/wintrust/wintrust.xml
similarity index 100%
rename from reactos/dll/wintrust/wintrust.xml
rename to reactos/dll/win32/wintrust/wintrust.xml

diff --git a/reactos/dll/wintrust/wintrust_main.c b/reactos/dll/win32/wintrust/wintrust_main.c
similarity index 100%
rename from reactos/dll/wintrust/wintrust_main.c
rename to reactos/dll/win32/wintrust/wintrust_main.c

diff --git a/reactos/dll/ws2_32/include/catalog.h b/reactos/dll/win32/ws2_32/include/catalog.h
similarity index 100%
rename from reactos/dll/ws2_32/include/catalog.h
rename to reactos/dll/win32/ws2_32/include/catalog.h

diff --git a/reactos/dll/ws2_32/include/debug.h b/reactos/dll/win32/ws2_32/include/debug.h
similarity index 100%
rename from reactos/dll/ws2_32/include/debug.h
rename to reactos/dll/win32/ws2_32/include/debug.h

diff --git a/reactos/dll/ws2_32/include/handle.h b/reactos/dll/win32/ws2_32/include/handle.h
similarity index 100%
rename from reactos/dll/ws2_32/include/handle.h
rename to reactos/dll/win32/ws2_32/include/handle.h

diff --git a/reactos/dll/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h
similarity index 100%
rename from reactos/dll/ws2_32/include/upcall.h
rename to reactos/dll/win32/ws2_32/include/upcall.h

diff --git a/reactos/dll/ws2_32/include/ws2_32.h b/reactos/dll/win32/ws2_32/include/ws2_32.h
similarity index 100%
rename from reactos/dll/ws2_32/include/ws2_32.h
rename to reactos/dll/win32/ws2_32/include/ws2_32.h

diff --git a/reactos/dll/ws2_32/misc/bsd.c b/reactos/dll/win32/ws2_32/misc/bsd.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/bsd.c
rename to reactos/dll/win32/ws2_32/misc/bsd.c

diff --git a/reactos/dll/ws2_32/misc/catalog.c b/reactos/dll/win32/ws2_32/misc/catalog.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/catalog.c
rename to reactos/dll/win32/ws2_32/misc/catalog.c

diff --git a/reactos/dll/ws2_32/misc/dllmain.c b/reactos/dll/win32/ws2_32/misc/dllmain.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/dllmain.c
rename to reactos/dll/win32/ws2_32/misc/dllmain.c

diff --git a/reactos/dll/ws2_32/misc/event.c b/reactos/dll/win32/ws2_32/misc/event.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/event.c
rename to reactos/dll/win32/ws2_32/misc/event.c

diff --git a/reactos/dll/ws2_32/misc/handle.c b/reactos/dll/win32/ws2_32/misc/handle.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/handle.c
rename to reactos/dll/win32/ws2_32/misc/handle.c

diff --git a/reactos/dll/ws2_32/misc/ns.c b/reactos/dll/win32/ws2_32/misc/ns.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/ns.c
rename to reactos/dll/win32/ws2_32/misc/ns.c

diff --git a/reactos/dll/ws2_32/misc/sndrcv.c b/reactos/dll/win32/ws2_32/misc/sndrcv.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/sndrcv.c
rename to reactos/dll/win32/ws2_32/misc/sndrcv.c

diff --git a/reactos/dll/ws2_32/misc/stubs.c b/reactos/dll/win32/ws2_32/misc/stubs.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/stubs.c
rename to reactos/dll/win32/ws2_32/misc/stubs.c

diff --git a/reactos/dll/ws2_32/misc/upcall.c b/reactos/dll/win32/ws2_32/misc/upcall.c
similarity index 100%
rename from reactos/dll/ws2_32/misc/upcall.c
rename to reactos/dll/win32/ws2_32/misc/upcall.c

diff --git a/reactos/dll/ws2_32/tests/setup.c b/reactos/dll/win32/ws2_32/tests/setup.c
similarity index 100%
rename from reactos/dll/ws2_32/tests/setup.c
rename to reactos/dll/win32/ws2_32/tests/setup.c

diff --git a/reactos/dll/ws2_32/tests/stubs.tst b/reactos/dll/win32/ws2_32/tests/stubs.tst
similarity index 100%
rename from reactos/dll/ws2_32/tests/stubs.tst
rename to reactos/dll/win32/ws2_32/tests/stubs.tst

diff --git a/reactos/dll/ws2_32/tests/tests/WinsockEvent.c b/reactos/dll/win32/ws2_32/tests/tests/WinsockEvent.c
similarity index 100%
rename from reactos/dll/ws2_32/tests/tests/WinsockEvent.c
rename to reactos/dll/win32/ws2_32/tests/tests/WinsockEvent.c

diff --git a/reactos/dll/ws2_32/ws2_32.def b/reactos/dll/win32/ws2_32/ws2_32.def
similarity index 100%
rename from reactos/dll/ws2_32/ws2_32.def
rename to reactos/dll/win32/ws2_32/ws2_32.def

diff --git a/reactos/dll/ws2_32/ws2_32.rc b/reactos/dll/win32/ws2_32/ws2_32.rc
similarity index 100%
rename from reactos/dll/ws2_32/ws2_32.rc
rename to reactos/dll/win32/ws2_32/ws2_32.rc

diff --git a/reactos/dll/ws2_32/ws2_32.xml b/reactos/dll/win32/ws2_32/ws2_32.xml
similarity index 100%
rename from reactos/dll/ws2_32/ws2_32.xml
rename to reactos/dll/win32/ws2_32/ws2_32.xml

diff --git a/reactos/dll/ws2_32/ws2_32_specs b/reactos/dll/win32/ws2_32/ws2_32_specs
similarity index 100%
rename from reactos/dll/ws2_32/ws2_32_specs
rename to reactos/dll/win32/ws2_32/ws2_32_specs

diff --git a/reactos/dll/ws2help/debug.h b/reactos/dll/win32/ws2help/debug.h
similarity index 100%
rename from reactos/dll/ws2help/debug.h
rename to reactos/dll/win32/ws2help/debug.h

diff --git a/reactos/dll/ws2help/ws2help.c b/reactos/dll/win32/ws2help/ws2help.c
similarity index 100%
rename from reactos/dll/ws2help/ws2help.c
rename to reactos/dll/win32/ws2help/ws2help.c

diff --git a/reactos/dll/ws2help/ws2help.def b/reactos/dll/win32/ws2help/ws2help.def
similarity index 100%
rename from reactos/dll/ws2help/ws2help.def
rename to reactos/dll/win32/ws2help/ws2help.def

diff --git a/reactos/dll/ws2help/ws2help.h b/reactos/dll/win32/ws2help/ws2help.h
similarity index 100%
rename from reactos/dll/ws2help/ws2help.h
rename to reactos/dll/win32/ws2help/ws2help.h

diff --git a/reactos/dll/ws2help/ws2help.rc b/reactos/dll/win32/ws2help/ws2help.rc
similarity index 100%
rename from reactos/dll/ws2help/ws2help.rc
rename to reactos/dll/win32/ws2help/ws2help.rc

diff --git a/reactos/dll/ws2help/ws2help.xml b/reactos/dll/win32/ws2help/ws2help.xml
similarity index 100%
rename from reactos/dll/ws2help/ws2help.xml
rename to reactos/dll/win32/ws2help/ws2help.xml

diff --git a/reactos/dll/wshirda/debug.h b/reactos/dll/win32/wshirda/debug.h
similarity index 100%
rename from reactos/dll/wshirda/debug.h
rename to reactos/dll/win32/wshirda/debug.h

diff --git a/reactos/dll/wshirda/wshirda.c b/reactos/dll/win32/wshirda/wshirda.c
similarity index 100%
rename from reactos/dll/wshirda/wshirda.c
rename to reactos/dll/win32/wshirda/wshirda.c

diff --git a/reactos/dll/wshirda/wshirda.def b/reactos/dll/win32/wshirda/wshirda.def
similarity index 100%
rename from reactos/dll/wshirda/wshirda.def
rename to reactos/dll/win32/wshirda/wshirda.def

diff --git a/reactos/dll/wshirda/wshirda.h b/reactos/dll/win32/wshirda/wshirda.h
similarity index 100%
rename from reactos/dll/wshirda/wshirda.h
rename to reactos/dll/win32/wshirda/wshirda.h

diff --git a/reactos/dll/wshirda/wshirda.rc b/reactos/dll/win32/wshirda/wshirda.rc
similarity index 100%
rename from reactos/dll/wshirda/wshirda.rc
rename to reactos/dll/win32/wshirda/wshirda.rc

diff --git a/reactos/dll/wshirda/wshirda.xml b/reactos/dll/win32/wshirda/wshirda.xml
similarity index 100%
rename from reactos/dll/wshirda/wshirda.xml
rename to reactos/dll/win32/wshirda/wshirda.xml

diff --git a/reactos/dll/wsock32/stubs.c b/reactos/dll/win32/wsock32/stubs.c
similarity index 100%
rename from reactos/dll/wsock32/stubs.c
rename to reactos/dll/win32/wsock32/stubs.c

diff --git a/reactos/dll/wsock32/wsock32.def b/reactos/dll/win32/wsock32/wsock32.def
similarity index 100%
rename from reactos/dll/wsock32/wsock32.def
rename to reactos/dll/win32/wsock32/wsock32.def

diff --git a/reactos/dll/wsock32/wsock32.rc b/reactos/dll/win32/wsock32/wsock32.rc
similarity index 100%
rename from reactos/dll/wsock32/wsock32.rc
rename to reactos/dll/win32/wsock32/wsock32.rc

diff --git a/reactos/dll/wsock32/wsock32.xml b/reactos/dll/win32/wsock32/wsock32.xml
similarity index 100%
rename from reactos/dll/wsock32/wsock32.xml
rename to reactos/dll/win32/wsock32/wsock32.xml

diff --git a/reactos/dll/zlib/ChangeLog b/reactos/dll/win32/zlib/ChangeLog
similarity index 100%
rename from reactos/dll/zlib/ChangeLog
rename to reactos/dll/win32/zlib/ChangeLog

diff --git a/reactos/dll/zlib/FAQ b/reactos/dll/win32/zlib/FAQ
similarity index 100%
rename from reactos/dll/zlib/FAQ
rename to reactos/dll/win32/zlib/FAQ

diff --git a/reactos/dll/zlib/INDEX b/reactos/dll/win32/zlib/INDEX
similarity index 100%
rename from reactos/dll/zlib/INDEX
rename to reactos/dll/win32/zlib/INDEX

diff --git a/reactos/dll/zlib/Make_vms.com b/reactos/dll/win32/zlib/Make_vms.com
similarity index 100%
rename from reactos/dll/zlib/Make_vms.com
rename to reactos/dll/win32/zlib/Make_vms.com

diff --git a/reactos/dll/zlib/Makefile.host b/reactos/dll/win32/zlib/Makefile.host
similarity index 100%
rename from reactos/dll/zlib/Makefile.host
rename to reactos/dll/win32/zlib/Makefile.host

diff --git a/reactos/dll/zlib/Makefile.in b/reactos/dll/win32/zlib/Makefile.in
similarity index 100%
rename from reactos/dll/zlib/Makefile.in
rename to reactos/dll/win32/zlib/Makefile.in

diff --git a/reactos/dll/zlib/Makefile.riscos b/reactos/dll/win32/zlib/Makefile.riscos
similarity index 100%
rename from reactos/dll/zlib/Makefile.riscos
rename to reactos/dll/win32/zlib/Makefile.riscos

diff --git a/reactos/dll/zlib/README b/reactos/dll/win32/zlib/README
similarity index 100%
rename from reactos/dll/zlib/README
rename to reactos/dll/win32/zlib/README

diff --git a/reactos/dll/zlib/adler32.c b/reactos/dll/win32/zlib/adler32.c
similarity index 100%
rename from reactos/dll/zlib/adler32.c
rename to reactos/dll/win32/zlib/adler32.c

diff --git a/reactos/dll/zlib/algorithm.txt b/reactos/dll/win32/zlib/algorithm.txt
similarity index 100%
rename from reactos/dll/zlib/algorithm.txt
rename to reactos/dll/win32/zlib/algorithm.txt

diff --git a/reactos/dll/zlib/amiga/Makefile.pup b/reactos/dll/win32/zlib/amiga/Makefile.pup
similarity index 100%
rename from reactos/dll/zlib/amiga/Makefile.pup
rename to reactos/dll/win32/zlib/amiga/Makefile.pup

diff --git a/reactos/dll/zlib/amiga/Makefile.sas b/reactos/dll/win32/zlib/amiga/Makefile.sas
similarity index 100%
rename from reactos/dll/zlib/amiga/Makefile.sas
rename to reactos/dll/win32/zlib/amiga/Makefile.sas

diff --git a/reactos/dll/zlib/compress.c b/reactos/dll/win32/zlib/compress.c
similarity index 100%
rename from reactos/dll/zlib/compress.c
rename to reactos/dll/win32/zlib/compress.c

diff --git a/reactos/dll/zlib/configure b/reactos/dll/win32/zlib/configure
similarity index 100%
rename from reactos/dll/zlib/configure
rename to reactos/dll/win32/zlib/configure

diff --git a/reactos/dll/zlib/contrib/README.contrib b/reactos/dll/win32/zlib/contrib/README.contrib
similarity index 100%
rename from reactos/dll/zlib/contrib/README.contrib
rename to reactos/dll/win32/zlib/contrib/README.contrib

diff --git a/reactos/dll/zlib/contrib/asm386/gvmat32.asm b/reactos/dll/win32/zlib/contrib/asm386/gvmat32.asm
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/gvmat32.asm
rename to reactos/dll/win32/zlib/contrib/asm386/gvmat32.asm

diff --git a/reactos/dll/zlib/contrib/asm386/gvmat32c.c b/reactos/dll/win32/zlib/contrib/asm386/gvmat32c.c
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/gvmat32c.c
rename to reactos/dll/win32/zlib/contrib/asm386/gvmat32c.c

diff --git a/reactos/dll/zlib/contrib/asm386/mkgvmt32.bat b/reactos/dll/win32/zlib/contrib/asm386/mkgvmt32.bat
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/mkgvmt32.bat
rename to reactos/dll/win32/zlib/contrib/asm386/mkgvmt32.bat

diff --git a/reactos/dll/zlib/contrib/asm386/zlibvc.def b/reactos/dll/win32/zlib/contrib/asm386/zlibvc.def
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/zlibvc.def
rename to reactos/dll/win32/zlib/contrib/asm386/zlibvc.def

diff --git a/reactos/dll/zlib/contrib/asm386/zlibvc.dsp b/reactos/dll/win32/zlib/contrib/asm386/zlibvc.dsp
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/zlibvc.dsp
rename to reactos/dll/win32/zlib/contrib/asm386/zlibvc.dsp

diff --git a/reactos/dll/zlib/contrib/asm386/zlibvc.dsw b/reactos/dll/win32/zlib/contrib/asm386/zlibvc.dsw
similarity index 100%
rename from reactos/dll/zlib/contrib/asm386/zlibvc.dsw
rename to reactos/dll/win32/zlib/contrib/asm386/zlibvc.dsw

diff --git a/reactos/dll/zlib/contrib/asm586/README.586 b/reactos/dll/win32/zlib/contrib/asm586/README.586
similarity index 100%
rename from reactos/dll/zlib/contrib/asm586/README.586
rename to reactos/dll/win32/zlib/contrib/asm586/README.586

diff --git a/reactos/dll/zlib/contrib/asm586/match.S b/reactos/dll/win32/zlib/contrib/asm586/match.S
similarity index 100%
rename from reactos/dll/zlib/contrib/asm586/match.S
rename to reactos/dll/win32/zlib/contrib/asm586/match.S

diff --git a/reactos/dll/zlib/contrib/asm686/README.686 b/reactos/dll/win32/zlib/contrib/asm686/README.686
similarity index 100%
rename from reactos/dll/zlib/contrib/asm686/README.686
rename to reactos/dll/win32/zlib/contrib/asm686/README.686

diff --git a/reactos/dll/zlib/contrib/asm686/match.S b/reactos/dll/win32/zlib/contrib/asm686/match.S
similarity index 100%
rename from reactos/dll/zlib/contrib/asm686/match.S
rename to reactos/dll/win32/zlib/contrib/asm686/match.S

diff --git a/reactos/dll/zlib/contrib/delphi/zlib.mak b/reactos/dll/win32/zlib/contrib/delphi/zlib.mak
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi/zlib.mak
rename to reactos/dll/win32/zlib/contrib/delphi/zlib.mak

diff --git a/reactos/dll/zlib/contrib/delphi/zlibdef.pas b/reactos/dll/win32/zlib/contrib/delphi/zlibdef.pas
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi/zlibdef.pas
rename to reactos/dll/win32/zlib/contrib/delphi/zlibdef.pas

diff --git a/reactos/dll/zlib/contrib/delphi2/d_zlib.bpr b/reactos/dll/win32/zlib/contrib/delphi2/d_zlib.bpr
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/d_zlib.bpr
rename to reactos/dll/win32/zlib/contrib/delphi2/d_zlib.bpr

diff --git a/reactos/dll/zlib/contrib/delphi2/d_zlib.cpp b/reactos/dll/win32/zlib/contrib/delphi2/d_zlib.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/d_zlib.cpp
rename to reactos/dll/win32/zlib/contrib/delphi2/d_zlib.cpp

diff --git a/reactos/dll/zlib/contrib/delphi2/readme.txt b/reactos/dll/win32/zlib/contrib/delphi2/readme.txt
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/readme.txt
rename to reactos/dll/win32/zlib/contrib/delphi2/readme.txt

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib.bpg b/reactos/dll/win32/zlib/contrib/delphi2/zlib.bpg
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib.bpg
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib.bpg

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib.bpr b/reactos/dll/win32/zlib/contrib/delphi2/zlib.bpr
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib.bpr
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib.bpr

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib.cpp b/reactos/dll/win32/zlib/contrib/delphi2/zlib.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib.cpp
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib.cpp

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib.pas b/reactos/dll/win32/zlib/contrib/delphi2/zlib.pas
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib.pas
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib.pas

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib32.bpr b/reactos/dll/win32/zlib/contrib/delphi2/zlib32.bpr
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib32.bpr
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib32.bpr

diff --git a/reactos/dll/zlib/contrib/delphi2/zlib32.cpp b/reactos/dll/win32/zlib/contrib/delphi2/zlib32.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/delphi2/zlib32.cpp
rename to reactos/dll/win32/zlib/contrib/delphi2/zlib32.cpp

diff --git a/reactos/dll/zlib/contrib/iostream/test.cpp b/reactos/dll/win32/zlib/contrib/iostream/test.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/iostream/test.cpp
rename to reactos/dll/win32/zlib/contrib/iostream/test.cpp

diff --git a/reactos/dll/zlib/contrib/iostream/zfstream.cpp b/reactos/dll/win32/zlib/contrib/iostream/zfstream.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/iostream/zfstream.cpp
rename to reactos/dll/win32/zlib/contrib/iostream/zfstream.cpp

diff --git a/reactos/dll/zlib/contrib/iostream/zfstream.h b/reactos/dll/win32/zlib/contrib/iostream/zfstream.h
similarity index 100%
rename from reactos/dll/zlib/contrib/iostream/zfstream.h
rename to reactos/dll/win32/zlib/contrib/iostream/zfstream.h

diff --git a/reactos/dll/zlib/contrib/iostream2/zstream.h b/reactos/dll/win32/zlib/contrib/iostream2/zstream.h
similarity index 100%
rename from reactos/dll/zlib/contrib/iostream2/zstream.h
rename to reactos/dll/win32/zlib/contrib/iostream2/zstream.h

diff --git a/reactos/dll/zlib/contrib/iostream2/zstream_test.cpp b/reactos/dll/win32/zlib/contrib/iostream2/zstream_test.cpp
similarity index 100%
rename from reactos/dll/zlib/contrib/iostream2/zstream_test.cpp
rename to reactos/dll/win32/zlib/contrib/iostream2/zstream_test.cpp

diff --git a/reactos/dll/zlib/contrib/minizip/ChangeLogUnzip b/reactos/dll/win32/zlib/contrib/minizip/ChangeLogUnzip
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/ChangeLogUnzip
rename to reactos/dll/win32/zlib/contrib/minizip/ChangeLogUnzip

diff --git a/reactos/dll/zlib/contrib/minizip/miniunz.c b/reactos/dll/win32/zlib/contrib/minizip/miniunz.c
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/miniunz.c
rename to reactos/dll/win32/zlib/contrib/minizip/miniunz.c

diff --git a/reactos/dll/zlib/contrib/minizip/minizip.c b/reactos/dll/win32/zlib/contrib/minizip/minizip.c
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/minizip.c
rename to reactos/dll/win32/zlib/contrib/minizip/minizip.c

diff --git a/reactos/dll/zlib/contrib/minizip/readme.txt b/reactos/dll/win32/zlib/contrib/minizip/readme.txt
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/readme.txt
rename to reactos/dll/win32/zlib/contrib/minizip/readme.txt

diff --git a/reactos/dll/zlib/contrib/minizip/unzip.c b/reactos/dll/win32/zlib/contrib/minizip/unzip.c
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/unzip.c
rename to reactos/dll/win32/zlib/contrib/minizip/unzip.c

diff --git a/reactos/dll/zlib/contrib/minizip/unzip.def b/reactos/dll/win32/zlib/contrib/minizip/unzip.def
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/unzip.def
rename to reactos/dll/win32/zlib/contrib/minizip/unzip.def

diff --git a/reactos/dll/zlib/contrib/minizip/unzip.h b/reactos/dll/win32/zlib/contrib/minizip/unzip.h
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/unzip.h
rename to reactos/dll/win32/zlib/contrib/minizip/unzip.h

diff --git a/reactos/dll/zlib/contrib/minizip/zip.c b/reactos/dll/win32/zlib/contrib/minizip/zip.c
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zip.c
rename to reactos/dll/win32/zlib/contrib/minizip/zip.c

diff --git a/reactos/dll/zlib/contrib/minizip/zip.def b/reactos/dll/win32/zlib/contrib/minizip/zip.def
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zip.def
rename to reactos/dll/win32/zlib/contrib/minizip/zip.def

diff --git a/reactos/dll/zlib/contrib/minizip/zip.h b/reactos/dll/win32/zlib/contrib/minizip/zip.h
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zip.h
rename to reactos/dll/win32/zlib/contrib/minizip/zip.h

diff --git a/reactos/dll/zlib/contrib/minizip/zlibvc.def b/reactos/dll/win32/zlib/contrib/minizip/zlibvc.def
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zlibvc.def
rename to reactos/dll/win32/zlib/contrib/minizip/zlibvc.def

diff --git a/reactos/dll/zlib/contrib/minizip/zlibvc.dsp b/reactos/dll/win32/zlib/contrib/minizip/zlibvc.dsp
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zlibvc.dsp
rename to reactos/dll/win32/zlib/contrib/minizip/zlibvc.dsp

diff --git a/reactos/dll/zlib/contrib/minizip/zlibvc.dsw b/reactos/dll/win32/zlib/contrib/minizip/zlibvc.dsw
similarity index 100%
rename from reactos/dll/zlib/contrib/minizip/zlibvc.dsw
rename to reactos/dll/win32/zlib/contrib/minizip/zlibvc.dsw

diff --git a/reactos/dll/zlib/contrib/untgz/makefile.w32 b/reactos/dll/win32/zlib/contrib/untgz/makefile.w32
similarity index 100%
rename from reactos/dll/zlib/contrib/untgz/makefile.w32
rename to reactos/dll/win32/zlib/contrib/untgz/makefile.w32

diff --git a/reactos/dll/zlib/contrib/untgz/untgz.c b/reactos/dll/win32/zlib/contrib/untgz/untgz.c
similarity index 100%
rename from reactos/dll/zlib/contrib/untgz/untgz.c
rename to reactos/dll/win32/zlib/contrib/untgz/untgz.c

diff --git a/reactos/dll/zlib/contrib/visual-basic.txt b/reactos/dll/win32/zlib/contrib/visual-basic.txt
similarity index 100%
rename from reactos/dll/zlib/contrib/visual-basic.txt
rename to reactos/dll/win32/zlib/contrib/visual-basic.txt

diff --git a/reactos/dll/zlib/crc32.c b/reactos/dll/win32/zlib/crc32.c
similarity index 100%
rename from reactos/dll/zlib/crc32.c
rename to reactos/dll/win32/zlib/crc32.c

diff --git a/reactos/dll/zlib/deflate.c b/reactos/dll/win32/zlib/deflate.c
similarity index 100%
rename from reactos/dll/zlib/deflate.c
rename to reactos/dll/win32/zlib/deflate.c

diff --git a/reactos/dll/zlib/deflate.h b/reactos/dll/win32/zlib/deflate.h
similarity index 100%
rename from reactos/dll/zlib/deflate.h
rename to reactos/dll/win32/zlib/deflate.h

diff --git a/reactos/dll/zlib/descrip.mms b/reactos/dll/win32/zlib/descrip.mms
similarity index 100%
rename from reactos/dll/zlib/descrip.mms
rename to reactos/dll/win32/zlib/descrip.mms

diff --git a/reactos/dll/zlib/example.c b/reactos/dll/win32/zlib/example.c
similarity index 100%
rename from reactos/dll/zlib/example.c
rename to reactos/dll/win32/zlib/example.c

diff --git a/reactos/dll/zlib/gzio.c b/reactos/dll/win32/zlib/gzio.c
similarity index 100%
rename from reactos/dll/zlib/gzio.c
rename to reactos/dll/win32/zlib/gzio.c

diff --git a/reactos/dll/zlib/infblock.c b/reactos/dll/win32/zlib/infblock.c
similarity index 100%
rename from reactos/dll/zlib/infblock.c
rename to reactos/dll/win32/zlib/infblock.c

diff --git a/reactos/dll/zlib/infblock.h b/reactos/dll/win32/zlib/infblock.h
similarity index 100%
rename from reactos/dll/zlib/infblock.h
rename to reactos/dll/win32/zlib/infblock.h

diff --git a/reactos/dll/zlib/infcodes.c b/reactos/dll/win32/zlib/infcodes.c
similarity index 100%
rename from reactos/dll/zlib/infcodes.c
rename to reactos/dll/win32/zlib/infcodes.c

diff --git a/reactos/dll/zlib/infcodes.h b/reactos/dll/win32/zlib/infcodes.h
similarity index 100%
rename from reactos/dll/zlib/infcodes.h
rename to reactos/dll/win32/zlib/infcodes.h

diff --git a/reactos/dll/zlib/inffast.c b/reactos/dll/win32/zlib/inffast.c
similarity index 100%
rename from reactos/dll/zlib/inffast.c
rename to reactos/dll/win32/zlib/inffast.c

diff --git a/reactos/dll/zlib/inffast.h b/reactos/dll/win32/zlib/inffast.h
similarity index 100%
rename from reactos/dll/zlib/inffast.h
rename to reactos/dll/win32/zlib/inffast.h

diff --git a/reactos/dll/zlib/inffixed.h b/reactos/dll/win32/zlib/inffixed.h
similarity index 100%
rename from reactos/dll/zlib/inffixed.h
rename to reactos/dll/win32/zlib/inffixed.h

diff --git a/reactos/dll/zlib/inflate.c b/reactos/dll/win32/zlib/inflate.c
similarity index 100%
rename from reactos/dll/zlib/inflate.c
rename to reactos/dll/win32/zlib/inflate.c

diff --git a/reactos/dll/zlib/inftrees.c b/reactos/dll/win32/zlib/inftrees.c
similarity index 100%
rename from reactos/dll/zlib/inftrees.c
rename to reactos/dll/win32/zlib/inftrees.c

diff --git a/reactos/dll/zlib/inftrees.h b/reactos/dll/win32/zlib/inftrees.h
similarity index 100%
rename from reactos/dll/zlib/inftrees.h
rename to reactos/dll/win32/zlib/inftrees.h

diff --git a/reactos/dll/zlib/infutil.c b/reactos/dll/win32/zlib/infutil.c
similarity index 100%
rename from reactos/dll/zlib/infutil.c
rename to reactos/dll/win32/zlib/infutil.c

diff --git a/reactos/dll/zlib/infutil.h b/reactos/dll/win32/zlib/infutil.h
similarity index 100%
rename from reactos/dll/zlib/infutil.h
rename to reactos/dll/win32/zlib/infutil.h

diff --git a/reactos/dll/zlib/maketree.c b/reactos/dll/win32/zlib/maketree.c
similarity index 100%
rename from reactos/dll/zlib/maketree.c
rename to reactos/dll/win32/zlib/maketree.c

diff --git a/reactos/dll/zlib/minigzip.c b/reactos/dll/win32/zlib/minigzip.c
similarity index 100%
rename from reactos/dll/zlib/minigzip.c
rename to reactos/dll/win32/zlib/minigzip.c

diff --git a/reactos/dll/zlib/msdos/Makefile.b32 b/reactos/dll/win32/zlib/msdos/Makefile.b32
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.b32
rename to reactos/dll/win32/zlib/msdos/Makefile.b32

diff --git a/reactos/dll/zlib/msdos/Makefile.bor b/reactos/dll/win32/zlib/msdos/Makefile.bor
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.bor
rename to reactos/dll/win32/zlib/msdos/Makefile.bor

diff --git a/reactos/dll/zlib/msdos/Makefile.dj2 b/reactos/dll/win32/zlib/msdos/Makefile.dj2
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.dj2
rename to reactos/dll/win32/zlib/msdos/Makefile.dj2

diff --git a/reactos/dll/zlib/msdos/Makefile.emx b/reactos/dll/win32/zlib/msdos/Makefile.emx
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.emx
rename to reactos/dll/win32/zlib/msdos/Makefile.emx

diff --git a/reactos/dll/zlib/msdos/Makefile.msc b/reactos/dll/win32/zlib/msdos/Makefile.msc
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.msc
rename to reactos/dll/win32/zlib/msdos/Makefile.msc

diff --git a/reactos/dll/zlib/msdos/Makefile.tc b/reactos/dll/win32/zlib/msdos/Makefile.tc
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.tc
rename to reactos/dll/win32/zlib/msdos/Makefile.tc

diff --git a/reactos/dll/zlib/msdos/Makefile.w32 b/reactos/dll/win32/zlib/msdos/Makefile.w32
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.w32
rename to reactos/dll/win32/zlib/msdos/Makefile.w32

diff --git a/reactos/dll/zlib/msdos/Makefile.wat b/reactos/dll/win32/zlib/msdos/Makefile.wat
similarity index 100%
rename from reactos/dll/zlib/msdos/Makefile.wat
rename to reactos/dll/win32/zlib/msdos/Makefile.wat

diff --git a/reactos/dll/zlib/msdos/zlib.def b/reactos/dll/win32/zlib/msdos/zlib.def
similarity index 100%
rename from reactos/dll/zlib/msdos/zlib.def
rename to reactos/dll/win32/zlib/msdos/zlib.def

diff --git a/reactos/dll/zlib/msdos/zlib.rc b/reactos/dll/win32/zlib/msdos/zlib.rc
similarity index 100%
rename from reactos/dll/zlib/msdos/zlib.rc
rename to reactos/dll/win32/zlib/msdos/zlib.rc

diff --git a/reactos/dll/zlib/nt/Makefile.emx b/reactos/dll/win32/zlib/nt/Makefile.emx
similarity index 100%
rename from reactos/dll/zlib/nt/Makefile.emx
rename to reactos/dll/win32/zlib/nt/Makefile.emx

diff --git a/reactos/dll/zlib/nt/Makefile.gcc b/reactos/dll/win32/zlib/nt/Makefile.gcc
similarity index 100%
rename from reactos/dll/zlib/nt/Makefile.gcc
rename to reactos/dll/win32/zlib/nt/Makefile.gcc

diff --git a/reactos/dll/zlib/nt/Makefile.nt b/reactos/dll/win32/zlib/nt/Makefile.nt
similarity index 100%
rename from reactos/dll/zlib/nt/Makefile.nt
rename to reactos/dll/win32/zlib/nt/Makefile.nt

diff --git a/reactos/dll/zlib/nt/zlib.dnt b/reactos/dll/win32/zlib/nt/zlib.dnt
similarity index 100%
rename from reactos/dll/zlib/nt/zlib.dnt
rename to reactos/dll/win32/zlib/nt/zlib.dnt

diff --git a/reactos/dll/zlib/os2/Makefile.os2 b/reactos/dll/win32/zlib/os2/Makefile.os2
similarity index 100%
rename from reactos/dll/zlib/os2/Makefile.os2
rename to reactos/dll/win32/zlib/os2/Makefile.os2

diff --git a/reactos/dll/zlib/os2/zlib.def b/reactos/dll/win32/zlib/os2/zlib.def
similarity index 100%
rename from reactos/dll/zlib/os2/zlib.def
rename to reactos/dll/win32/zlib/os2/zlib.def

diff --git a/reactos/dll/zlib/trees.c b/reactos/dll/win32/zlib/trees.c
similarity index 100%
rename from reactos/dll/zlib/trees.c
rename to reactos/dll/win32/zlib/trees.c

diff --git a/reactos/dll/zlib/trees.h b/reactos/dll/win32/zlib/trees.h
similarity index 100%
rename from reactos/dll/zlib/trees.h
rename to reactos/dll/win32/zlib/trees.h

diff --git a/reactos/dll/zlib/uncompr.c b/reactos/dll/win32/zlib/uncompr.c
similarity index 100%
rename from reactos/dll/zlib/uncompr.c
rename to reactos/dll/win32/zlib/uncompr.c

diff --git a/reactos/dll/zlib/zconf.h b/reactos/dll/win32/zlib/zconf.h
similarity index 100%
rename from reactos/dll/zlib/zconf.h
rename to reactos/dll/win32/zlib/zconf.h

diff --git a/reactos/dll/zlib/zlib.3 b/reactos/dll/win32/zlib/zlib.3
similarity index 100%
rename from reactos/dll/zlib/zlib.3
rename to reactos/dll/win32/zlib/zlib.3

diff --git a/reactos/dll/zlib/zlib.h b/reactos/dll/win32/zlib/zlib.h
similarity index 100%
rename from reactos/dll/zlib/zlib.h
rename to reactos/dll/win32/zlib/zlib.h

diff --git a/reactos/dll/zlib/zlib.html b/reactos/dll/win32/zlib/zlib.html
similarity index 100%
rename from reactos/dll/zlib/zlib.html
rename to reactos/dll/win32/zlib/zlib.html

diff --git a/reactos/dll/zlib/zlib.mak b/reactos/dll/win32/zlib/zlib.mak
similarity index 100%
rename from reactos/dll/zlib/zlib.mak
rename to reactos/dll/win32/zlib/zlib.mak

diff --git a/reactos/dll/zlib/zlib.xml b/reactos/dll/win32/zlib/zlib.xml
similarity index 100%
rename from reactos/dll/zlib/zlib.xml
rename to reactos/dll/win32/zlib/zlib.xml

diff --git a/reactos/dll/zlib/zlib_common.xml b/reactos/dll/win32/zlib/zlib_common.xml
similarity index 100%
rename from reactos/dll/zlib/zlib_common.xml
rename to reactos/dll/win32/zlib/zlib_common.xml

diff --git a/reactos/dll/zlib/zutil.c b/reactos/dll/win32/zlib/zutil.c
similarity index 100%
rename from reactos/dll/zlib/zutil.c
rename to reactos/dll/win32/zlib/zutil.c

diff --git a/reactos/dll/zlib/zutil.h b/reactos/dll/win32/zlib/zutil.h
similarity index 100%
rename from reactos/dll/zlib/zutil.h
rename to reactos/dll/win32/zlib/zutil.h