diff --git a/reactos/dll/objsel/factory.c b/reactos/dll/win32/objsel/factory.c similarity index 100% rename from reactos/dll/objsel/factory.c rename to reactos/dll/win32/objsel/factory.c diff --git a/reactos/dll/objsel/objsel.c b/reactos/dll/win32/objsel/objsel.c similarity index 100% rename from reactos/dll/objsel/objsel.c rename to reactos/dll/win32/objsel/objsel.c diff --git a/reactos/dll/objsel/objsel.rc b/reactos/dll/win32/objsel/objsel.rc similarity index 100% rename from reactos/dll/objsel/objsel.rc rename to reactos/dll/win32/objsel/objsel.rc diff --git a/reactos/dll/objsel/objsel.spec b/reactos/dll/win32/objsel/objsel.spec similarity index 100% rename from reactos/dll/objsel/objsel.spec rename to reactos/dll/win32/objsel/objsel.spec diff --git a/reactos/dll/objsel/objsel.xml b/reactos/dll/win32/objsel/objsel.xml similarity index 100% rename from reactos/dll/objsel/objsel.xml rename to reactos/dll/win32/objsel/objsel.xml diff --git a/reactos/dll/objsel/objsel_private.h b/reactos/dll/win32/objsel/objsel_private.h similarity index 100% rename from reactos/dll/objsel/objsel_private.h rename to reactos/dll/win32/objsel/objsel_private.h diff --git a/reactos/dll/objsel/regsvr.c b/reactos/dll/win32/objsel/regsvr.c similarity index 100% rename from reactos/dll/objsel/regsvr.c rename to reactos/dll/win32/objsel/regsvr.c diff --git a/reactos/dll/ole32/antimoniker.c b/reactos/dll/win32/ole32/antimoniker.c similarity index 100% rename from reactos/dll/ole32/antimoniker.c rename to reactos/dll/win32/ole32/antimoniker.c diff --git a/reactos/dll/ole32/bindctx.c b/reactos/dll/win32/ole32/bindctx.c similarity index 100% rename from reactos/dll/ole32/bindctx.c rename to reactos/dll/win32/ole32/bindctx.c diff --git a/reactos/dll/ole32/clipboard.c b/reactos/dll/win32/ole32/clipboard.c similarity index 100% rename from reactos/dll/ole32/clipboard.c rename to reactos/dll/win32/ole32/clipboard.c diff --git a/reactos/dll/ole32/compobj.c b/reactos/dll/win32/ole32/compobj.c similarity index 100% rename from reactos/dll/ole32/compobj.c rename to reactos/dll/win32/ole32/compobj.c diff --git a/reactos/dll/ole32/compobj.spec b/reactos/dll/win32/ole32/compobj.spec similarity index 100% rename from reactos/dll/ole32/compobj.spec rename to reactos/dll/win32/ole32/compobj.spec diff --git a/reactos/dll/ole32/compobj_private.h b/reactos/dll/win32/ole32/compobj_private.h similarity index 100% rename from reactos/dll/ole32/compobj_private.h rename to reactos/dll/win32/ole32/compobj_private.h diff --git a/reactos/dll/ole32/compositemoniker.c b/reactos/dll/win32/ole32/compositemoniker.c similarity index 100% rename from reactos/dll/ole32/compositemoniker.c rename to reactos/dll/win32/ole32/compositemoniker.c diff --git a/reactos/dll/ole32/datacache.c b/reactos/dll/win32/ole32/datacache.c similarity index 100% rename from reactos/dll/ole32/datacache.c rename to reactos/dll/win32/ole32/datacache.c diff --git a/reactos/dll/ole32/dcom.h b/reactos/dll/win32/ole32/dcom.h similarity index 100% rename from reactos/dll/ole32/dcom.h rename to reactos/dll/win32/ole32/dcom.h diff --git a/reactos/dll/ole32/dcom.idl b/reactos/dll/win32/ole32/dcom.idl similarity index 100% rename from reactos/dll/ole32/dcom.idl rename to reactos/dll/win32/ole32/dcom.idl diff --git a/reactos/dll/ole32/defaulthandler.c b/reactos/dll/win32/ole32/defaulthandler.c similarity index 100% rename from reactos/dll/ole32/defaulthandler.c rename to reactos/dll/win32/ole32/defaulthandler.c diff --git a/reactos/dll/ole32/dictionary.c b/reactos/dll/win32/ole32/dictionary.c similarity index 100% rename from reactos/dll/ole32/dictionary.c rename to reactos/dll/win32/ole32/dictionary.c diff --git a/reactos/dll/ole32/dictionary.h b/reactos/dll/win32/ole32/dictionary.h similarity index 100% rename from reactos/dll/ole32/dictionary.h rename to reactos/dll/win32/ole32/dictionary.h diff --git a/reactos/dll/ole32/errorinfo.c b/reactos/dll/win32/ole32/errorinfo.c similarity index 100% rename from reactos/dll/ole32/errorinfo.c rename to reactos/dll/win32/ole32/errorinfo.c diff --git a/reactos/dll/ole32/filemoniker.c b/reactos/dll/win32/ole32/filemoniker.c similarity index 100% rename from reactos/dll/ole32/filemoniker.c rename to reactos/dll/win32/ole32/filemoniker.c diff --git a/reactos/dll/ole32/ftmarshal.c b/reactos/dll/win32/ole32/ftmarshal.c similarity index 100% rename from reactos/dll/ole32/ftmarshal.c rename to reactos/dll/win32/ole32/ftmarshal.c diff --git a/reactos/dll/ole32/git.c b/reactos/dll/win32/ole32/git.c similarity index 100% rename from reactos/dll/ole32/git.c rename to reactos/dll/win32/ole32/git.c diff --git a/reactos/dll/ole32/hglobalstream.c b/reactos/dll/win32/ole32/hglobalstream.c similarity index 100% rename from reactos/dll/ole32/hglobalstream.c rename to reactos/dll/win32/ole32/hglobalstream.c diff --git a/reactos/dll/ole32/ifs.c b/reactos/dll/win32/ole32/ifs.c similarity index 100% rename from reactos/dll/ole32/ifs.c rename to reactos/dll/win32/ole32/ifs.c diff --git a/reactos/dll/ole32/ifs.h b/reactos/dll/win32/ole32/ifs.h similarity index 100% rename from reactos/dll/ole32/ifs.h rename to reactos/dll/win32/ole32/ifs.h diff --git a/reactos/dll/ole32/itemmoniker.c b/reactos/dll/win32/ole32/itemmoniker.c similarity index 100% rename from reactos/dll/ole32/itemmoniker.c rename to reactos/dll/win32/ole32/itemmoniker.c diff --git a/reactos/dll/ole32/marshal.c b/reactos/dll/win32/ole32/marshal.c similarity index 100% rename from reactos/dll/ole32/marshal.c rename to reactos/dll/win32/ole32/marshal.c diff --git a/reactos/dll/ole32/memlockbytes.c b/reactos/dll/win32/ole32/memlockbytes.c similarity index 100% rename from reactos/dll/ole32/memlockbytes.c rename to reactos/dll/win32/ole32/memlockbytes.c diff --git a/reactos/dll/ole32/memlockbytes16.c b/reactos/dll/win32/ole32/memlockbytes16.c similarity index 100% rename from reactos/dll/ole32/memlockbytes16.c rename to reactos/dll/win32/ole32/memlockbytes16.c diff --git a/reactos/dll/ole32/moniker.c b/reactos/dll/win32/ole32/moniker.c similarity index 100% rename from reactos/dll/ole32/moniker.c rename to reactos/dll/win32/ole32/moniker.c diff --git a/reactos/dll/ole32/moniker.h b/reactos/dll/win32/ole32/moniker.h similarity index 100% rename from reactos/dll/ole32/moniker.h rename to reactos/dll/win32/ole32/moniker.h diff --git a/reactos/dll/ole32/ole16.c b/reactos/dll/win32/ole32/ole16.c similarity index 100% rename from reactos/dll/ole32/ole16.c rename to reactos/dll/win32/ole32/ole16.c diff --git a/reactos/dll/ole32/ole2.c b/reactos/dll/win32/ole32/ole2.c similarity index 100% rename from reactos/dll/ole32/ole2.c rename to reactos/dll/win32/ole32/ole2.c diff --git a/reactos/dll/ole32/ole2.spec b/reactos/dll/win32/ole32/ole2.spec similarity index 100% rename from reactos/dll/ole32/ole2.spec rename to reactos/dll/win32/ole32/ole2.spec diff --git a/reactos/dll/ole32/ole2_16.c b/reactos/dll/win32/ole32/ole2_16.c similarity index 100% rename from reactos/dll/ole32/ole2_16.c rename to reactos/dll/win32/ole32/ole2_16.c diff --git a/reactos/dll/ole32/ole2conv.spec b/reactos/dll/win32/ole32/ole2conv.spec similarity index 100% rename from reactos/dll/ole32/ole2conv.spec rename to reactos/dll/win32/ole32/ole2conv.spec diff --git a/reactos/dll/ole32/ole2impl.c b/reactos/dll/win32/ole32/ole2impl.c similarity index 100% rename from reactos/dll/ole32/ole2impl.c rename to reactos/dll/win32/ole32/ole2impl.c diff --git a/reactos/dll/ole32/ole2nls.c b/reactos/dll/win32/ole32/ole2nls.c similarity index 100% rename from reactos/dll/ole32/ole2nls.c rename to reactos/dll/win32/ole32/ole2nls.c diff --git a/reactos/dll/ole32/ole2nls.spec b/reactos/dll/win32/ole32/ole2nls.spec similarity index 100% rename from reactos/dll/ole32/ole2nls.spec rename to reactos/dll/win32/ole32/ole2nls.spec diff --git a/reactos/dll/ole32/ole2prox.spec b/reactos/dll/win32/ole32/ole2prox.spec similarity index 100% rename from reactos/dll/ole32/ole2prox.spec rename to reactos/dll/win32/ole32/ole2prox.spec diff --git a/reactos/dll/ole32/ole2stubs.c b/reactos/dll/win32/ole32/ole2stubs.c similarity index 100% rename from reactos/dll/ole32/ole2stubs.c rename to reactos/dll/win32/ole32/ole2stubs.c diff --git a/reactos/dll/ole32/ole2thk.spec b/reactos/dll/win32/ole32/ole2thk.spec similarity index 100% rename from reactos/dll/ole32/ole2thk.spec rename to reactos/dll/win32/ole32/ole2thk.spec diff --git a/reactos/dll/ole32/ole32.spec b/reactos/dll/win32/ole32/ole32.spec similarity index 100% rename from reactos/dll/ole32/ole32.spec rename to reactos/dll/win32/ole32/ole32.spec diff --git a/reactos/dll/ole32/ole32.xml b/reactos/dll/win32/ole32/ole32.xml similarity index 100% rename from reactos/dll/ole32/ole32.xml rename to reactos/dll/win32/ole32/ole32.xml diff --git a/reactos/dll/ole32/ole32_main.c b/reactos/dll/win32/ole32/ole32_main.c similarity index 100% rename from reactos/dll/ole32/ole32_main.c rename to reactos/dll/win32/ole32/ole32_main.c diff --git a/reactos/dll/ole32/ole32res.rc b/reactos/dll/win32/ole32/ole32res.rc similarity index 100% rename from reactos/dll/ole32/ole32res.rc rename to reactos/dll/win32/ole32/ole32res.rc diff --git a/reactos/dll/ole32/oleobj.c b/reactos/dll/win32/ole32/oleobj.c similarity index 100% rename from reactos/dll/ole32/oleobj.c rename to reactos/dll/win32/ole32/oleobj.c diff --git a/reactos/dll/ole32/oleproxy.c b/reactos/dll/win32/ole32/oleproxy.c similarity index 100% rename from reactos/dll/ole32/oleproxy.c rename to reactos/dll/win32/ole32/oleproxy.c diff --git a/reactos/dll/ole32/olestd.h b/reactos/dll/win32/ole32/olestd.h similarity index 100% rename from reactos/dll/ole32/olestd.h rename to reactos/dll/win32/ole32/olestd.h diff --git a/reactos/dll/ole32/regsvr.c b/reactos/dll/win32/ole32/regsvr.c similarity index 100% rename from reactos/dll/ole32/regsvr.c rename to reactos/dll/win32/ole32/regsvr.c diff --git a/reactos/dll/ole32/rpc.c b/reactos/dll/win32/ole32/rpc.c similarity index 100% rename from reactos/dll/ole32/rpc.c rename to reactos/dll/win32/ole32/rpc.c diff --git a/reactos/dll/ole32/stg_bigblockfile.c b/reactos/dll/win32/ole32/stg_bigblockfile.c similarity index 100% rename from reactos/dll/ole32/stg_bigblockfile.c rename to reactos/dll/win32/ole32/stg_bigblockfile.c diff --git a/reactos/dll/ole32/stg_prop.c b/reactos/dll/win32/ole32/stg_prop.c similarity index 100% rename from reactos/dll/ole32/stg_prop.c rename to reactos/dll/win32/ole32/stg_prop.c diff --git a/reactos/dll/ole32/stg_stream.c b/reactos/dll/win32/ole32/stg_stream.c similarity index 100% rename from reactos/dll/ole32/stg_stream.c rename to reactos/dll/win32/ole32/stg_stream.c diff --git a/reactos/dll/ole32/storage.c b/reactos/dll/win32/ole32/storage.c similarity index 100% rename from reactos/dll/ole32/storage.c rename to reactos/dll/win32/ole32/storage.c diff --git a/reactos/dll/ole32/storage.spec b/reactos/dll/win32/ole32/storage.spec similarity index 100% rename from reactos/dll/ole32/storage.spec rename to reactos/dll/win32/ole32/storage.spec diff --git a/reactos/dll/ole32/storage32.c b/reactos/dll/win32/ole32/storage32.c similarity index 100% rename from reactos/dll/ole32/storage32.c rename to reactos/dll/win32/ole32/storage32.c diff --git a/reactos/dll/ole32/storage32.h b/reactos/dll/win32/ole32/storage32.h similarity index 100% rename from reactos/dll/ole32/storage32.h rename to reactos/dll/win32/ole32/storage32.h diff --git a/reactos/dll/ole32/stubmanager.c b/reactos/dll/win32/ole32/stubmanager.c similarity index 100% rename from reactos/dll/ole32/stubmanager.c rename to reactos/dll/win32/ole32/stubmanager.c diff --git a/reactos/dll/ole32/usrmarshal.c b/reactos/dll/win32/ole32/usrmarshal.c similarity index 100% rename from reactos/dll/ole32/usrmarshal.c rename to reactos/dll/win32/ole32/usrmarshal.c diff --git a/reactos/dll/ole32/version.rc b/reactos/dll/win32/ole32/version.rc similarity index 100% rename from reactos/dll/ole32/version.rc rename to reactos/dll/win32/ole32/version.rc diff --git a/reactos/dll/oleacc/main.c b/reactos/dll/win32/oleacc/main.c similarity index 100% rename from reactos/dll/oleacc/main.c rename to reactos/dll/win32/oleacc/main.c diff --git a/reactos/dll/oleacc/oleacc.spec b/reactos/dll/win32/oleacc/oleacc.spec similarity index 100% rename from reactos/dll/oleacc/oleacc.spec rename to reactos/dll/win32/oleacc/oleacc.spec diff --git a/reactos/dll/oleacc/oleacc.xml b/reactos/dll/win32/oleacc/oleacc.xml similarity index 100% rename from reactos/dll/oleacc/oleacc.xml rename to reactos/dll/win32/oleacc/oleacc.xml diff --git a/reactos/dll/security/security.def b/reactos/dll/win32/security/security.def similarity index 100% rename from reactos/dll/security/security.def rename to reactos/dll/win32/security/security.def diff --git a/reactos/dll/security/security.rc b/reactos/dll/win32/security/security.rc similarity index 100% rename from reactos/dll/security/security.rc rename to reactos/dll/win32/security/security.rc diff --git a/reactos/dll/security/security.xml b/reactos/dll/win32/security/security.xml similarity index 100% rename from reactos/dll/security/security.xml rename to reactos/dll/win32/security/security.xml diff --git a/reactos/dll/serialui/resource.h b/reactos/dll/win32/serialui/resource.h similarity index 100% rename from reactos/dll/serialui/resource.h rename to reactos/dll/win32/serialui/resource.h diff --git a/reactos/dll/serialui/serialui.c b/reactos/dll/win32/serialui/serialui.c similarity index 100% rename from reactos/dll/serialui/serialui.c rename to reactos/dll/win32/serialui/serialui.c diff --git a/reactos/dll/serialui/serialui.def b/reactos/dll/win32/serialui/serialui.def similarity index 100% rename from reactos/dll/serialui/serialui.def rename to reactos/dll/win32/serialui/serialui.def diff --git a/reactos/dll/serialui/serialui.h b/reactos/dll/win32/serialui/serialui.h similarity index 100% rename from reactos/dll/serialui/serialui.h rename to reactos/dll/win32/serialui/serialui.h diff --git a/reactos/dll/serialui/serialui.rc b/reactos/dll/win32/serialui/serialui.rc similarity index 100% rename from reactos/dll/serialui/serialui.rc rename to reactos/dll/win32/serialui/serialui.rc diff --git a/reactos/dll/serialui/serialui.xml b/reactos/dll/win32/serialui/serialui.xml similarity index 100% rename from reactos/dll/serialui/serialui.xml rename to reactos/dll/win32/serialui/serialui.xml diff --git a/reactos/dll/shdocvw/Bg.rc b/reactos/dll/win32/shdocvw/Bg.rc similarity index 100% rename from reactos/dll/shdocvw/Bg.rc rename to reactos/dll/win32/shdocvw/Bg.rc diff --git a/reactos/dll/shdocvw/De.rc b/reactos/dll/win32/shdocvw/De.rc similarity index 100% rename from reactos/dll/shdocvw/De.rc rename to reactos/dll/win32/shdocvw/De.rc diff --git a/reactos/dll/shdocvw/En.rc b/reactos/dll/win32/shdocvw/En.rc similarity index 100% rename from reactos/dll/shdocvw/En.rc rename to reactos/dll/win32/shdocvw/En.rc diff --git a/reactos/dll/shdocvw/Es.rc b/reactos/dll/win32/shdocvw/Es.rc similarity index 100% rename from reactos/dll/shdocvw/Es.rc rename to reactos/dll/win32/shdocvw/Es.rc diff --git a/reactos/dll/shdocvw/Fi.rc b/reactos/dll/win32/shdocvw/Fi.rc similarity index 100% rename from reactos/dll/shdocvw/Fi.rc rename to reactos/dll/win32/shdocvw/Fi.rc diff --git a/reactos/dll/shdocvw/Fr.rc b/reactos/dll/win32/shdocvw/Fr.rc similarity index 100% rename from reactos/dll/shdocvw/Fr.rc rename to reactos/dll/win32/shdocvw/Fr.rc diff --git a/reactos/dll/shdocvw/Hu.rc b/reactos/dll/win32/shdocvw/Hu.rc similarity index 100% rename from reactos/dll/shdocvw/Hu.rc rename to reactos/dll/win32/shdocvw/Hu.rc diff --git a/reactos/dll/shdocvw/Ja.rc b/reactos/dll/win32/shdocvw/Ja.rc similarity index 100% rename from reactos/dll/shdocvw/Ja.rc rename to reactos/dll/win32/shdocvw/Ja.rc diff --git a/reactos/dll/shdocvw/Ko.rc b/reactos/dll/win32/shdocvw/Ko.rc similarity index 100% rename from reactos/dll/shdocvw/Ko.rc rename to reactos/dll/win32/shdocvw/Ko.rc diff --git a/reactos/dll/shdocvw/Nl.rc b/reactos/dll/win32/shdocvw/Nl.rc similarity index 100% rename from reactos/dll/shdocvw/Nl.rc rename to reactos/dll/win32/shdocvw/Nl.rc diff --git a/reactos/dll/shdocvw/No.rc b/reactos/dll/win32/shdocvw/No.rc similarity index 100% rename from reactos/dll/shdocvw/No.rc rename to reactos/dll/win32/shdocvw/No.rc diff --git a/reactos/dll/shdocvw/Pl.rc b/reactos/dll/win32/shdocvw/Pl.rc similarity index 100% rename from reactos/dll/shdocvw/Pl.rc rename to reactos/dll/win32/shdocvw/Pl.rc diff --git a/reactos/dll/shdocvw/Pt.rc b/reactos/dll/win32/shdocvw/Pt.rc similarity index 100% rename from reactos/dll/shdocvw/Pt.rc rename to reactos/dll/win32/shdocvw/Pt.rc diff --git a/reactos/dll/shdocvw/Ru.rc b/reactos/dll/win32/shdocvw/Ru.rc similarity index 100% rename from reactos/dll/shdocvw/Ru.rc rename to reactos/dll/win32/shdocvw/Ru.rc diff --git a/reactos/dll/shdocvw/Sv.rc b/reactos/dll/win32/shdocvw/Sv.rc similarity index 100% rename from reactos/dll/shdocvw/Sv.rc rename to reactos/dll/win32/shdocvw/Sv.rc diff --git a/reactos/dll/shdocvw/classinfo.c b/reactos/dll/win32/shdocvw/classinfo.c similarity index 100% rename from reactos/dll/shdocvw/classinfo.c rename to reactos/dll/win32/shdocvw/classinfo.c diff --git a/reactos/dll/shdocvw/client.c b/reactos/dll/win32/shdocvw/client.c similarity index 100% rename from reactos/dll/shdocvw/client.c rename to reactos/dll/win32/shdocvw/client.c diff --git a/reactos/dll/shdocvw/dochost.c b/reactos/dll/win32/shdocvw/dochost.c similarity index 100% rename from reactos/dll/shdocvw/dochost.c rename to reactos/dll/win32/shdocvw/dochost.c diff --git a/reactos/dll/shdocvw/events.c b/reactos/dll/win32/shdocvw/events.c similarity index 100% rename from reactos/dll/shdocvw/events.c rename to reactos/dll/win32/shdocvw/events.c diff --git a/reactos/dll/shdocvw/factory.c b/reactos/dll/win32/shdocvw/factory.c similarity index 100% rename from reactos/dll/shdocvw/factory.c rename to reactos/dll/win32/shdocvw/factory.c diff --git a/reactos/dll/shdocvw/frame.c b/reactos/dll/win32/shdocvw/frame.c similarity index 100% rename from reactos/dll/shdocvw/frame.c rename to reactos/dll/win32/shdocvw/frame.c diff --git a/reactos/dll/shdocvw/misc.c b/reactos/dll/win32/shdocvw/misc.c similarity index 100% rename from reactos/dll/shdocvw/misc.c rename to reactos/dll/win32/shdocvw/misc.c diff --git a/reactos/dll/shdocvw/oleobject.c b/reactos/dll/win32/shdocvw/oleobject.c similarity index 100% rename from reactos/dll/shdocvw/oleobject.c rename to reactos/dll/win32/shdocvw/oleobject.c diff --git a/reactos/dll/shdocvw/persist.c b/reactos/dll/win32/shdocvw/persist.c similarity index 100% rename from reactos/dll/shdocvw/persist.c rename to reactos/dll/win32/shdocvw/persist.c diff --git a/reactos/dll/shdocvw/regsvr.c b/reactos/dll/win32/shdocvw/regsvr.c similarity index 100% rename from reactos/dll/shdocvw/regsvr.c rename to reactos/dll/win32/shdocvw/regsvr.c diff --git a/reactos/dll/shdocvw/shdocvw.h b/reactos/dll/win32/shdocvw/shdocvw.h similarity index 100% rename from reactos/dll/shdocvw/shdocvw.h rename to reactos/dll/win32/shdocvw/shdocvw.h diff --git a/reactos/dll/shdocvw/shdocvw.rc b/reactos/dll/win32/shdocvw/shdocvw.rc similarity index 100% rename from reactos/dll/shdocvw/shdocvw.rc rename to reactos/dll/win32/shdocvw/shdocvw.rc diff --git a/reactos/dll/shdocvw/shdocvw.spec b/reactos/dll/win32/shdocvw/shdocvw.spec similarity index 100% rename from reactos/dll/shdocvw/shdocvw.spec rename to reactos/dll/win32/shdocvw/shdocvw.spec diff --git a/reactos/dll/shdocvw/shdocvw.xml b/reactos/dll/win32/shdocvw/shdocvw.xml similarity index 100% rename from reactos/dll/shdocvw/shdocvw.xml rename to reactos/dll/win32/shdocvw/shdocvw.xml diff --git a/reactos/dll/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c similarity index 100% rename from reactos/dll/shdocvw/shdocvw_main.c rename to reactos/dll/win32/shdocvw/shdocvw_main.c diff --git a/reactos/dll/shdocvw/shlinstobj.c b/reactos/dll/win32/shdocvw/shlinstobj.c similarity index 100% rename from reactos/dll/shdocvw/shlinstobj.c rename to reactos/dll/win32/shdocvw/shlinstobj.c diff --git a/reactos/dll/shdocvw/version.rc b/reactos/dll/win32/shdocvw/version.rc similarity index 100% rename from reactos/dll/shdocvw/version.rc rename to reactos/dll/win32/shdocvw/version.rc diff --git a/reactos/dll/shdocvw/view.c b/reactos/dll/win32/shdocvw/view.c similarity index 100% rename from reactos/dll/shdocvw/view.c rename to reactos/dll/win32/shdocvw/view.c diff --git a/reactos/dll/shdocvw/webbrowser.c b/reactos/dll/win32/shdocvw/webbrowser.c similarity index 100% rename from reactos/dll/shdocvw/webbrowser.c rename to reactos/dll/win32/shdocvw/webbrowser.c diff --git a/reactos/dll/shellext/directory.xml b/reactos/dll/win32/shellext/directory.xml similarity index 100% rename from reactos/dll/shellext/directory.xml rename to reactos/dll/win32/shellext/directory.xml diff --git a/reactos/dll/shellext/slayer/De.rc b/reactos/dll/win32/shellext/slayer/De.rc similarity index 100% rename from reactos/dll/shellext/slayer/De.rc rename to reactos/dll/win32/shellext/slayer/De.rc diff --git a/reactos/dll/shellext/slayer/En.rc b/reactos/dll/win32/shellext/slayer/En.rc similarity index 100% rename from reactos/dll/shellext/slayer/En.rc rename to reactos/dll/win32/shellext/slayer/En.rc diff --git a/reactos/dll/shellext/slayer/Es.rc b/reactos/dll/win32/shellext/slayer/Es.rc similarity index 100% rename from reactos/dll/shellext/slayer/Es.rc rename to reactos/dll/win32/shellext/slayer/Es.rc diff --git a/reactos/dll/shellext/slayer/Hu.rc b/reactos/dll/win32/shellext/slayer/Hu.rc similarity index 100% rename from reactos/dll/shellext/slayer/Hu.rc rename to reactos/dll/win32/shellext/slayer/Hu.rc diff --git a/reactos/dll/shellext/slayer/Nl.rc b/reactos/dll/win32/shellext/slayer/Nl.rc similarity index 100% rename from reactos/dll/shellext/slayer/Nl.rc rename to reactos/dll/win32/shellext/slayer/Nl.rc diff --git a/reactos/dll/shellext/slayer/Pl.rc b/reactos/dll/win32/shellext/slayer/Pl.rc similarity index 100% rename from reactos/dll/shellext/slayer/Pl.rc rename to reactos/dll/win32/shellext/slayer/Pl.rc diff --git a/reactos/dll/shellext/slayer/Ru.rc b/reactos/dll/win32/shellext/slayer/Ru.rc similarity index 100% rename from reactos/dll/shellext/slayer/Ru.rc rename to reactos/dll/win32/shellext/slayer/Ru.rc diff --git a/reactos/dll/shellext/slayer/Sv.rc b/reactos/dll/win32/shellext/slayer/Sv.rc similarity index 100% rename from reactos/dll/shellext/slayer/Sv.rc rename to reactos/dll/win32/shellext/slayer/Sv.rc diff --git a/reactos/dll/shellext/slayer/precomp.h b/reactos/dll/win32/shellext/slayer/precomp.h similarity index 100% rename from reactos/dll/shellext/slayer/precomp.h rename to reactos/dll/win32/shellext/slayer/precomp.h diff --git a/reactos/dll/shellext/slayer/resource.h b/reactos/dll/win32/shellext/slayer/resource.h similarity index 100% rename from reactos/dll/shellext/slayer/resource.h rename to reactos/dll/win32/shellext/slayer/resource.h diff --git a/reactos/dll/shellext/slayer/slayer.c b/reactos/dll/win32/shellext/slayer/slayer.c similarity index 100% rename from reactos/dll/shellext/slayer/slayer.c rename to reactos/dll/win32/shellext/slayer/slayer.c diff --git a/reactos/dll/shellext/slayer/slayer.def b/reactos/dll/win32/shellext/slayer/slayer.def similarity index 100% rename from reactos/dll/shellext/slayer/slayer.def rename to reactos/dll/win32/shellext/slayer/slayer.def diff --git a/reactos/dll/shellext/slayer/slayer.h b/reactos/dll/win32/shellext/slayer/slayer.h similarity index 100% rename from reactos/dll/shellext/slayer/slayer.h rename to reactos/dll/win32/shellext/slayer/slayer.h diff --git a/reactos/dll/shellext/slayer/slayer.rc b/reactos/dll/win32/shellext/slayer/slayer.rc similarity index 100% rename from reactos/dll/shellext/slayer/slayer.rc rename to reactos/dll/win32/shellext/slayer/slayer.rc diff --git a/reactos/dll/shellext/slayer/slayer.xml b/reactos/dll/win32/shellext/slayer/slayer.xml similarity index 100% rename from reactos/dll/shellext/slayer/slayer.xml rename to reactos/dll/win32/shellext/slayer/slayer.xml diff --git a/reactos/dll/shfolder/shfolder.spec b/reactos/dll/win32/shfolder/shfolder.spec similarity index 100% rename from reactos/dll/shfolder/shfolder.spec rename to reactos/dll/win32/shfolder/shfolder.spec diff --git a/reactos/dll/shfolder/shfolder.xml b/reactos/dll/win32/shfolder/shfolder.xml similarity index 100% rename from reactos/dll/shfolder/shfolder.xml rename to reactos/dll/win32/shfolder/shfolder.xml diff --git a/reactos/dll/shfolder/shfolder_main.c b/reactos/dll/win32/shfolder/shfolder_main.c similarity index 100% rename from reactos/dll/shfolder/shfolder_main.c rename to reactos/dll/win32/shfolder/shfolder_main.c diff --git a/reactos/dll/smdll/dllmain.c b/reactos/dll/win32/smdll/dllmain.c similarity index 100% rename from reactos/dll/smdll/dllmain.c rename to reactos/dll/win32/smdll/dllmain.c diff --git a/reactos/dll/smdll/query.c b/reactos/dll/win32/smdll/query.c similarity index 100% rename from reactos/dll/smdll/query.c rename to reactos/dll/win32/smdll/query.c diff --git a/reactos/dll/smdll/readme.txt b/reactos/dll/win32/smdll/readme.txt similarity index 100% rename from reactos/dll/smdll/readme.txt rename to reactos/dll/win32/smdll/readme.txt diff --git a/reactos/dll/smdll/smdll.def b/reactos/dll/win32/smdll/smdll.def similarity index 100% rename from reactos/dll/smdll/smdll.def rename to reactos/dll/win32/smdll/smdll.def diff --git a/reactos/dll/smdll/smdll.rc b/reactos/dll/win32/smdll/smdll.rc similarity index 100% rename from reactos/dll/smdll/smdll.rc rename to reactos/dll/win32/smdll/smdll.rc diff --git a/reactos/dll/smdll/smdll.xml b/reactos/dll/win32/smdll/smdll.xml similarity index 100% rename from reactos/dll/smdll/smdll.xml rename to reactos/dll/win32/smdll/smdll.xml diff --git a/reactos/dll/vdmdbg/vdmdbg.c b/reactos/dll/win32/vdmdbg/vdmdbg.c similarity index 100% rename from reactos/dll/vdmdbg/vdmdbg.c rename to reactos/dll/win32/vdmdbg/vdmdbg.c diff --git a/reactos/dll/vdmdbg/vdmdbg.def b/reactos/dll/win32/vdmdbg/vdmdbg.def similarity index 100% rename from reactos/dll/vdmdbg/vdmdbg.def rename to reactos/dll/win32/vdmdbg/vdmdbg.def diff --git a/reactos/dll/vdmdbg/vdmdbg.h b/reactos/dll/win32/vdmdbg/vdmdbg.h similarity index 100% rename from reactos/dll/vdmdbg/vdmdbg.h rename to reactos/dll/win32/vdmdbg/vdmdbg.h diff --git a/reactos/dll/vdmdbg/vdmdbg.xml b/reactos/dll/win32/vdmdbg/vdmdbg.xml similarity index 100% rename from reactos/dll/vdmdbg/vdmdbg.xml rename to reactos/dll/win32/vdmdbg/vdmdbg.xml diff --git a/reactos/dll/wdmaud/README.TXT b/reactos/dll/win32/wdmaud/README.TXT similarity index 100% rename from reactos/dll/wdmaud/README.TXT rename to reactos/dll/win32/wdmaud/README.TXT diff --git a/reactos/dll/wdmaud/TODO b/reactos/dll/win32/wdmaud/TODO similarity index 100% rename from reactos/dll/wdmaud/TODO rename to reactos/dll/win32/wdmaud/TODO diff --git a/reactos/dll/wdmaud/callbacks.c b/reactos/dll/win32/wdmaud/callbacks.c similarity index 100% rename from reactos/dll/wdmaud/callbacks.c rename to reactos/dll/win32/wdmaud/callbacks.c diff --git a/reactos/dll/wdmaud/control.c b/reactos/dll/win32/wdmaud/control.c similarity index 100% rename from reactos/dll/wdmaud/control.c rename to reactos/dll/win32/wdmaud/control.c diff --git a/reactos/dll/wdmaud/devices.c b/reactos/dll/win32/wdmaud/devices.c similarity index 100% rename from reactos/dll/wdmaud/devices.c rename to reactos/dll/win32/wdmaud/devices.c diff --git a/reactos/dll/wdmaud/helper.c b/reactos/dll/win32/wdmaud/helper.c similarity index 100% rename from reactos/dll/wdmaud/helper.c rename to reactos/dll/win32/wdmaud/helper.c diff --git a/reactos/dll/wdmaud/kernel.c b/reactos/dll/win32/wdmaud/kernel.c similarity index 100% rename from reactos/dll/wdmaud/kernel.c rename to reactos/dll/win32/wdmaud/kernel.c diff --git a/reactos/dll/wdmaud/memtrack.c b/reactos/dll/win32/wdmaud/memtrack.c similarity index 100% rename from reactos/dll/wdmaud/memtrack.c rename to reactos/dll/win32/wdmaud/memtrack.c diff --git a/reactos/dll/wdmaud/midi.c b/reactos/dll/win32/wdmaud/midi.c similarity index 100% rename from reactos/dll/wdmaud/midi.c rename to reactos/dll/win32/wdmaud/midi.c diff --git a/reactos/dll/wdmaud/threads.c b/reactos/dll/win32/wdmaud/threads.c similarity index 100% rename from reactos/dll/wdmaud/threads.c rename to reactos/dll/win32/wdmaud/threads.c diff --git a/reactos/dll/wdmaud/user.c b/reactos/dll/win32/wdmaud/user.c similarity index 100% rename from reactos/dll/wdmaud/user.c rename to reactos/dll/win32/wdmaud/user.c diff --git a/reactos/dll/wdmaud/wave.c b/reactos/dll/win32/wdmaud/wave.c similarity index 100% rename from reactos/dll/wdmaud/wave.c rename to reactos/dll/win32/wdmaud/wave.c diff --git a/reactos/dll/wdmaud/wdmaud.def b/reactos/dll/win32/wdmaud/wdmaud.def similarity index 100% rename from reactos/dll/wdmaud/wdmaud.def rename to reactos/dll/win32/wdmaud/wdmaud.def diff --git a/reactos/dll/wdmaud/wdmaud.h b/reactos/dll/win32/wdmaud/wdmaud.h similarity index 100% rename from reactos/dll/wdmaud/wdmaud.h rename to reactos/dll/win32/wdmaud/wdmaud.h diff --git a/reactos/dll/wdmaud/wdmaud.rc b/reactos/dll/win32/wdmaud/wdmaud.rc similarity index 100% rename from reactos/dll/wdmaud/wdmaud.rc rename to reactos/dll/win32/wdmaud/wdmaud.rc diff --git a/reactos/dll/wdmaud/wdmaud.xml b/reactos/dll/win32/wdmaud/wdmaud.xml similarity index 100% rename from reactos/dll/wdmaud/wdmaud.xml rename to reactos/dll/win32/wdmaud/wdmaud.xml diff --git a/reactos/dll/winfax/precomp.h b/reactos/dll/win32/winfax/precomp.h similarity index 100% rename from reactos/dll/winfax/precomp.h rename to reactos/dll/win32/winfax/precomp.h diff --git a/reactos/dll/winfax/winfax.c b/reactos/dll/win32/winfax/winfax.c similarity index 100% rename from reactos/dll/winfax/winfax.c rename to reactos/dll/win32/winfax/winfax.c diff --git a/reactos/dll/winfax/winfax.def b/reactos/dll/win32/winfax/winfax.def similarity index 100% rename from reactos/dll/winfax/winfax.def rename to reactos/dll/win32/winfax/winfax.def diff --git a/reactos/dll/winfax/winfax.rc b/reactos/dll/win32/winfax/winfax.rc similarity index 100% rename from reactos/dll/winfax/winfax.rc rename to reactos/dll/win32/winfax/winfax.rc diff --git a/reactos/dll/winscard/precomp.h b/reactos/dll/win32/winscard/precomp.h similarity index 100% rename from reactos/dll/winscard/precomp.h rename to reactos/dll/win32/winscard/precomp.h diff --git a/reactos/dll/winscard/winscard.c b/reactos/dll/win32/winscard/winscard.c similarity index 100% rename from reactos/dll/winscard/winscard.c rename to reactos/dll/win32/winscard/winscard.c diff --git a/reactos/dll/winscard/winscard.def b/reactos/dll/win32/winscard/winscard.def similarity index 100% rename from reactos/dll/winscard/winscard.def rename to reactos/dll/win32/winscard/winscard.def diff --git a/reactos/dll/winscard/winscard.rc b/reactos/dll/win32/winscard/winscard.rc similarity index 100% rename from reactos/dll/winscard/winscard.rc rename to reactos/dll/win32/winscard/winscard.rc diff --git a/reactos/dll/winsta/main.c b/reactos/dll/win32/winsta/main.c similarity index 100% rename from reactos/dll/winsta/main.c rename to reactos/dll/win32/winsta/main.c diff --git a/reactos/dll/winsta/misc.c b/reactos/dll/win32/winsta/misc.c similarity index 100% rename from reactos/dll/winsta/misc.c rename to reactos/dll/win32/winsta/misc.c diff --git a/reactos/dll/winsta/server.c b/reactos/dll/win32/winsta/server.c similarity index 100% rename from reactos/dll/winsta/server.c rename to reactos/dll/win32/winsta/server.c diff --git a/reactos/dll/winsta/winsta.def b/reactos/dll/win32/winsta/winsta.def similarity index 100% rename from reactos/dll/winsta/winsta.def rename to reactos/dll/win32/winsta/winsta.def diff --git a/reactos/dll/winsta/winsta.h b/reactos/dll/win32/winsta/winsta.h similarity index 100% rename from reactos/dll/winsta/winsta.h rename to reactos/dll/win32/winsta/winsta.h diff --git a/reactos/dll/winsta/winsta.rc b/reactos/dll/win32/winsta/winsta.rc similarity index 100% rename from reactos/dll/winsta/winsta.rc rename to reactos/dll/win32/winsta/winsta.rc diff --git a/reactos/dll/winsta/ws.c b/reactos/dll/win32/winsta/ws.c similarity index 100% rename from reactos/dll/winsta/ws.c rename to reactos/dll/win32/winsta/ws.c